2181 files changed, 82965 insertions, 83243 deletions

diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/META-INF/MANIFEST.MF b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/META-INF/MANIFEST.MF
index 31a079c285f..3babf3a02ab 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/META-INF/MANIFEST.MF
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.adl4eclipse.org

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.osgi.profile;bundle-version="1.0.1"

+ org.eclipse.papyrus.osgi.profile;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-localization: plugin

 Bundle-Name: %pluginName

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

diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/META-INF/MANIFEST.MF b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/META-INF/MANIFEST.MF
index a02c42b3c6a..bd085bb7f68 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/META-INF/MANIFEST.MF
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/META-INF/MANIFEST.MF
@@ -6,15 +6,15 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.ecore,

  org.eclipse.emf.transaction,

  org.eclipse.gmf.runtime.diagram.ui,

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

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

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

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

  org.eclipse.uml2.uml,

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

- org.eclipse.papyrus.adl4eclipsetool;bundle-version="1.0.1",

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

+ org.eclipse.papyrus.adl4eclipsetool;bundle-version="1.1.0",

  org.eclipse.pde.core,

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

+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.adltool.assistant.Activator

diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/META-INF/MANIFEST.MF b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/META-INF/MANIFEST.MF
index 067771b23b9..d34aacba110 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/META-INF/MANIFEST.MF
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/META-INF/MANIFEST.MF
@@ -4,10 +4,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.transaction,

  org.eclipse.uml2.uml,

  org.eclipse.pde.core,

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

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

- org.eclipse.papyrus.adl4eclipse.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.osgi.profile;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.adl4eclipse.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.osgi.profile;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.adltool,

  org.eclipse.papyrus.adltool.command,

  org.eclipse.papyrus.adltool.designer,

@@ -15,7 +15,7 @@ Export-Package: org.eclipse.papyrus.adltool,
  org.eclipse.papyrus.adltool.designer.wizard

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

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

diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/META-INF/MANIFEST.MF b/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/META-INF/MANIFEST.MF
index 3d608ad8bff..eb0ecc926d7 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/META-INF/MANIFEST.MF
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.osgi.profile

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

  org.eclipse.emf

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

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

diff --git a/extraplugins/alf/org.eclipse.papyrus.alf.sdk-feature/feature.xml b/extraplugins/alf/org.eclipse.papyrus.alf.sdk-feature/feature.xml
index 318a0a7d609..d2f41e56466 100644
--- a/extraplugins/alf/org.eclipse.papyrus.alf.sdk-feature/feature.xml
+++ b/extraplugins/alf/org.eclipse.papyrus.alf.sdk-feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.alf.sdk" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.alf.sdk" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <description>

       This feature includes:

diff --git a/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui/META-INF/MANIFEST.MF b/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui/META-INF/MANIFEST.MF
index ee5171673f6..d13a2284533 100644
--- a/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Export-Package: org.eclipse.papyrus.operation.editor.xtext.ui.contentassist.antlr,

  org.eclipse.papyrus.operation.editor.xtext.ui.internal

-Require-Bundle: org.eclipse.papyrus.operation.editor.xtext;bundle-version="1.0.1";visibility:=reexport,

+Require-Bundle: org.eclipse.papyrus.operation.editor.xtext;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.xtext.ui,

  org.eclipse.ui.editors;bundle-version="3.5.0",

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

@@ -11,18 +11,18 @@ Require-Bundle: org.eclipse.papyrus.operation.editor.xtext;bundle-version="1.0.1
  org.antlr.runtime,

  org.eclipse.uml2.uml;bundle-version="3.2.0",

  org.eclipse.core.expressions;bundle-version="3.4.200",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

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

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

- org.eclipse.papyrus.properties.runtime;bundle-version="1.0.1",

+ org.eclipse.papyrus.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.properties.runtime;bundle-version="1.1.0",

  org.eclipse.xtext.gmf.glue;bundle-version="0.8.0",

- org.eclipse.papyrus.alf;bundle-version="1.0.1",

- org.eclipse.papyrus.alf.ui;bundle-version="1.0.1",

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

- org.eclipse.papyrus.profile;bundle-version="1.0.1"

+ org.eclipse.papyrus.alf;bundle-version="1.1.0",

+ org.eclipse.papyrus.alf.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.profile;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: org.eclipse.papyrus.operation.editor.xtext.ui

 Bundle-Activator: org.eclipse.papyrus.operation.editor.xtext.ui.intern

  al.OperationActivator

diff --git a/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext/META-INF/MANIFEST.MF b/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext/META-INF/MANIFEST.MF
index 1afb07dcbac..d3046080ba4 100644
--- a/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext/META-INF/MANIFEST.MF
+++ b/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext/META-INF/MANIFEST.MF
@@ -24,10 +24,10 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.uml2.uml;bundle-version="3.2.0",

  org.eclipse.uml2.codegen.ecore;bundle-version="1.7.0",

  org.eclipse.xtext.gmf.glue;bundle-version="0.8.0",

- org.eclipse.papyrus.alf;bundle-version="1.0.1"

+ org.eclipse.papyrus.alf;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: org.eclipse.papyrus.operation.editor.xtext

 Bundle-ManifestVersion: 2

 Import-Package: org.apache.commons.logging,

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
index 0ab333c7460..32742da246e 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,

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

  org.eclipse.emf.cdo;bundle-version="[4.3.0,5.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1";visibility:=reexport,

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

- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.0.1";visibility:=reexport,

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

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.1.0";visibility:=reexport,

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

+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.workspace;bundle-version="[1.5.1,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)",

  org.eclipse.emf.cdo.dawn.gmf;bundle-version="[2.1.0,3.0.0)",

  org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)";visibility:=reexport,

@@ -17,10 +17,10 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.equinox.security;bundle-version="[1.1.100,2.0.0)",

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

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

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

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

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

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

- org.eclipse.papyrus.infra.services.localizer;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.localizer;bundle-version="1.1.0",

  org.eclipse.net4j;bundle-version="[4.3.0,5.0.0)",

  org.eclipse.emf.cdo.admin;bundle-version="[4.1.200,5.0.0)"

 Export-Package: org.eclipse.papyrus.cdo.core,

@@ -53,7 +53,7 @@ Export-Package: org.eclipse.papyrus.cdo.core,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.cdo.internal.core.Activator

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/pom.xml b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/pom.xml
index d7cca1f68c0..3cba7ef82cc 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/pom.xml
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.cdo.core</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/RepositoryManagerEventAdapter.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/RepositoryManagerEventAdapter.java
index db2bc4e345c..8f83e66a5d7 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/RepositoryManagerEventAdapter.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/RepositoryManagerEventAdapter.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
+ * 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
@@ -8,6 +8,8 @@
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus (CEA) - bug 443828
+ *   
  *****************************************************************************/
 package org.eclipse.papyrus.cdo.core;
 
@@ -20,7 +22,6 @@ import org.eclipse.net4j.util.container.IContainerDelta;
 import org.eclipse.net4j.util.container.IContainerDelta.Kind;
 import org.eclipse.net4j.util.container.IContainerEvent;
 import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
 import org.eclipse.net4j.util.lifecycle.ILifecycle;
 import org.eclipse.net4j.util.lifecycle.LifecycleEventAdapter;
 import org.eclipse.papyrus.cdo.internal.core.Activator;
@@ -53,7 +54,7 @@ public class RepositoryManagerEventAdapter {
 
 	private final RepositoryListener repositoryListener;
 
-	private final IListener viewInvalidationListener;
+	private final InvalidationListener viewInvalidationListener;
 
 	public RepositoryManagerEventAdapter() {
 		this(null);
@@ -128,11 +129,12 @@ public class RepositoryManagerEventAdapter {
 
 	void handleConnection(IInternalPapyrusRepository repository) {
 		if (viewInvalidationListener != null) {
+			final ResourceSet resourceSet = viewInvalidationListener.resourceSet;
 			repository.getCDOSession().addListener(viewInvalidationListener);
 
-			// look for existing view
+			// look for existing views
 			for (CDOView next : repository.getCDOSession().getViews()) {
-				if (next.getResourceSet() == target) {
+				if (next.getResourceSet() == resourceSet) {
 					next.addListener(viewInvalidationListener);
 				}
 			}
@@ -162,7 +164,7 @@ public class RepositoryManagerEventAdapter {
 	}
 
 	protected void onInvalidation(IPapyrusRepository repository, CDOView view, CDOViewInvalidationEvent event) {
-
+		// pass
 	}
 
 
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
index bc302310f9a..0f8aa60196e 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
@@ -5,18 +5,18 @@ Export-Package: org.eclipse.papyrus.cdo.internal.ui.customization.properties;x-i
  org.eclipse.papyrus.cdo.internal.ui.customization.properties.storage.action;x-internal:=true

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

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

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1",

- org.eclipse.papyrus.customization.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.cdo.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.customization.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.core;bundle-version="1.1.0",

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

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

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

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

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

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

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.cdo.internal.ui.customization.pr

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/pom.xml b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/pom.xml
index f1c25040ed7..58f58851e38 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/pom.xml
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.cdo.ui.customization.properties</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOContextStorageProvider.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOContextStorageProvider.java
index d8b6b841acc..5028bcb67c7 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOContextStorageProvider.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOContextStorageProvider.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
+ * 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
@@ -8,6 +8,8 @@
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus (CEA) - bug 443830
+ *   
  *****************************************************************************/
 package org.eclipse.papyrus.cdo.internal.ui.customization.properties.storage;
 
@@ -96,7 +98,7 @@ public class CDOContextStorageProvider extends AbstractContextStorageProvider {
 	@Override
 	public boolean providesFor(Context context) {
 		URI uri = EcoreUtil.getURI(context);
-		return (uri != null) && CDOUtils.isCDOURI(uri) || CDOTextURIHandler.SCHEME.equals(uri.scheme());
+		return (uri != null) && (CDOUtils.isCDOURI(uri) || CDOTextURIHandler.SCHEME.equals(uri.scheme()));
 	}
 
 	@Override
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextStorageActionProvider.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextStorageActionProvider.java
index af2e7ccf2f1..d332414952d 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextStorageActionProvider.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextStorageActionProvider.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
+ * 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
@@ -8,6 +8,8 @@
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus (CEA) - bug 443830
+ *   
  *****************************************************************************/
 package org.eclipse.papyrus.cdo.internal.ui.customization.properties.storage.action;
 
@@ -34,7 +36,7 @@ public class CDOContextStorageActionProvider extends AbstractContextStorageActio
 	@Override
 	public boolean providesFor(Context context) {
 		URI uri = EcoreUtil.getURI(context);
-		return (uri != null) && CDOUtils.isCDOURI(uri) || CDOTextURIHandler.SCHEME.equals(uri.scheme());
+		return (uri != null) && (CDOUtils.isCDOURI(uri) || CDOTextURIHandler.SCHEME.equals(uri.scheme()));
 	}
 
 	@Override
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF
index 6436869c14e..5ecea2b568d 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF
@@ -3,23 +3,23 @@ Export-Package: org.eclipse.papyrus.cdo.internal.ui.hyperlink;x-intern
  al:=true

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

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

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

- org.eclipse.papyrus.infra.hyperlink;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.hyperlink;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

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

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

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

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

- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

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

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

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

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

+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

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

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

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.7.0,2.0.0)",

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

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

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

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/pom.xml b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/pom.xml
index 195b76e81ba..23a37e0caf8 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/pom.xml
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.cdo.ui.hyperlink</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
index 7124173d211..42897bb5b61 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
@@ -24,31 +24,31 @@ Export-Package: org.eclipse.papyrus.cdo.internal.ui;x-friends:="org.eclipse.papy
  org.eclipse.papyrus.cdo.internal.ui.wizards;x-friends:="org.eclipse.papyrus.cdo.ui.tests,org.eclipse.papyrus.cdo.uml.diagram.ui,org.eclipse.papyrus.cdo.ui.customization.properties"

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

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

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

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

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

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.ui.workbench,

- org.eclipse.papyrus.cdo.core;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.cdo.core;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.cdo.ui;bundle-version="[4.3.0,5.0.0)";visibility:=reexport,

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

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

  org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)",

  org.eclipse.emf.cdo.dawn.gmf;bundle-version="[2.1.0,3.0.0)",

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

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

- org.eclipse.papyrus.infra.onefile;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.0.1",

- org.eclipse.papyrus.cdo.validation.problems;bundle-version="1.0.1",

- org.eclipse.papyrus.cdo.validation.problems.edit;bundle-version="1.0.1",

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

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

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

+ org.eclipse.papyrus.infra.onefile;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.validation.problems;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.validation.problems.edit;bundle-version="1.1.0",

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

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

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

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

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

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

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

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

  org.eclipse.emf.cdo.ui.admin;bundle-version="[4.1.200,5.0.0)",

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.cdo.internal.ui.Activator

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/pom.xml b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/pom.xml
index 04db037da05..80a8cd8b6cc 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/pom.xml
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.cdo.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/ItemProviderFilterRegistry.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/ItemProviderFilterRegistry.java
index 83434f3b438..5f346962147 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/ItemProviderFilterRegistry.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/ItemProviderFilterRegistry.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2013, 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,8 @@
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus (CEA) - bug 443830
+ *   
  *****************************************************************************/
 package org.eclipse.papyrus.cdo.internal.ui.views;
 
@@ -153,7 +155,7 @@ class ItemProviderFilterRegistry {
 
 		private final Supplier<? extends IElementFilter> filter;
 
-		private boolean enabled;
+		private boolean enabled = true;
 
 		ElementFilterFilter(String id, Supplier<? extends IElementFilter> filter) {
 			super(id);
@@ -177,7 +179,7 @@ class ItemProviderFilterRegistry {
 
 		private final Supplier<? extends Predicate<Object>> predicate;
 
-		private boolean enabled;
+		private boolean enabled = true;
 
 		PredicateFilter(String id, Supplier<? extends Predicate<Object>> predicate) {
 			super(id);
@@ -283,7 +285,7 @@ class ItemProviderFilterRegistry {
 				result = createLabelPatternFilter(config);
 			} else if (E_ELEMENT_FILTER.equals(name)) {
 				result = createElementFilterFilter(config);
-			} else if (E_PREDICATE.equals(config)) {
+			} else if (E_PREDICATE.equals(name)) {
 				result = createPredicateFilter(config);
 			}
 
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelReferencesPage.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelReferencesPage.java
index 88902c160ee..513da34d912 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelReferencesPage.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelReferencesPage.java
@@ -9,6 +9,7 @@
  * Contributors:
  *   CEA LIST - Initial API and implementation
  *   Christian W. Damus (CEA) - bug 429242
+ *   Christian W. Damus (CEA) - bug 433830
  *
  *****************************************************************************/
 package org.eclipse.papyrus.cdo.internal.ui.wizards;
@@ -305,16 +306,16 @@ public class ModelReferencesPage extends ModelImportWizardPage {
 			Object[] result = elements;
 
 			if ((inputElement != config) || (result == null)) {
-				IModelTransferConfiguration config = (IModelTransferConfiguration) inputElement;
-				List<TreeNode> nodes = Lists.newArrayListWithCapacity(config.getModelsToTransfer().size());
+				IModelTransferConfiguration inputConfig = (IModelTransferConfiguration) inputElement;
+				List<TreeNode> nodes = Lists.newArrayListWithCapacity(inputConfig.getModelsToTransfer().size());
 
-				for (IModelTransferNode next : config.getModelsToTransfer()) {
+				for (IModelTransferNode next : inputConfig.getModelsToTransfer()) {
 					nodes.add(new TreeNode(next));
 				}
 
 				result = nodes.toArray();
 
-				if (inputElement == config) {
+				if (inputConfig == config) {
 					// cache the result
 					elements = result;
 				}
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
index e028621ae89..1e4864ae9fb 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
@@ -5,14 +5,14 @@ Export-Package: org.eclipse.papyrus.cdo.uml.diagram.internal.ui;x-internal:=true
  org.eclipse.papyrus.cdo.uml.diagram.internal.ui.wizards;x-internal:=true

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

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

- org.eclipse.papyrus.cdo.core;bundle-version="1.0.1",

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

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

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.core;bundle-version="1.1.0",

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

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

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

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.cdo.uml.diagram.internal.ui.Acti

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/pom.xml b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/pom.xml
index 502341610b0..84a59f7e7e3 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/pom.xml
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.cdo.uml.diagram.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF
index 401a681b138..4837064bdb4 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF
@@ -4,22 +4,22 @@ Export-Package: org.eclipse.papyrus.cdo.uml.search.internal.ui;x-internal:=true,
  org.eclipse.papyrus.cdo.uml.search.internal.ui.query;x-friends:="org.eclipse.papyrus.cdo.uml.search.ui.tests",

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

 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",

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

- org.eclipse.papyrus.cdo.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.core;bundle-version="1.1.0",

  org.eclipse.emf.cdo.common;bundle-version="[4.3.0,5.0.0)",

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

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.uml.search.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.views.search;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.search.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.search;bundle-version="1.1.0",

  org.eclipse.search;bundle-version="3.9.0",

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

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

- org.eclipse.papyrus.infra.services.openelement;bundle-version="1.0.1",

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

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

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

+ org.eclipse.papyrus.infra.services.openelement;bundle-version="1.1.0",

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

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

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/pom.xml b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/pom.xml
index 584abe3fd26..ff4389ca76c 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/pom.xml
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.cdo.uml.search.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
index 7578b4c66d0..95d89522e0e 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
@@ -4,14 +4,14 @@ Export-Package: org.eclipse.papyrus.cdo.uml.internal.ui;x-friends:="org.eclipse.
  org.eclipse.papyrus.cdo.uml.internal.ui.l10n;x-internal:=true

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

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

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

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

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

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

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

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

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

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.cdo.uml.internal.ui.Activator

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/pom.xml b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/pom.xml
index 5e5f81e8e89..3c565f4f1d8 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/pom.xml
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.cdo.uml.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF
index 24a31e7a6cd..bb1518d4815 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0

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

- org.eclipse.papyrus.cdo.validation.problems;bundle-version="1.0.1",

+ org.eclipse.papyrus.cdo.validation.problems;bundle-version="1.1.0",

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

 Export-Package: org.eclipse.papyrus.cdo.validation.problems.edit,

  org.eclipse.papyrus.cdo.validation.problems.provider

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.cdo.validation.problems.provider

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/pom.xml b/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/pom.xml
index 1cd4d74e858..288c1c903c9 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/pom.xml
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.cdo.validation.problems.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF
index aebf86e72db..5b54772096a 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Export-Package: org.eclipse.papyrus.cdo.validation.problems,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.cdo.validation.problems.internal

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems/pom.xml b/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems/pom.xml
index 7c576b689fc..afaf800c5bd 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems/pom.xml
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.cdo.validation.problems</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF
index 768a2052268..9e13d8fba42 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF
@@ -3,14 +3,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

  org.eclipse.uml2.uml;bundle-version="4.0.0",

  org.eclipse.acceleo.engine;bundle-version="3.2.2",

- org.eclipse.papyrus.fcm.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.acceleo;bundle-version="1.0.1",

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

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

- org.eclipse.papyrus.acceleo.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.fcm.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.acceleo;bundle-version="1.1.0",

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

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

+ org.eclipse.papyrus.acceleo.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

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

diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/pom.xml b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/pom.xml
index d5b13b8c861..0f0fdacb505 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/pom.xml
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.acceleo.debug</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/META-INF/MANIFEST.MF
index 93ac0509403..c83fb302a41 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

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

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

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.acceleo.ui.handlers

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Acceleo UI (Incubation)

 Bundle-ManifestVersion: 2

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

diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/pom.xml b/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/pom.xml
index 89eddd4e51f..45f43aa45f7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/pom.xml
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.acceleo.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF
index e5cc4583cbc..e0ab5ae697d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

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

diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/pom.xml b/extraplugins/codegen/org.eclipse.papyrus.acceleo/pom.xml
index ff9c4231669..7f119811a35 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/pom.xml
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.acceleo</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/META-INF/MANIFEST.MF
index e48f5995358..5a3483a5a51 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui,
 Export-Package: org.eclipse.papyrus.codegen.extensionpoints

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/pom.xml b/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/pom.xml
index 1c9a5c48ac8..47c990138d4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/pom.xml
+++ b/extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.codegen.extensionpoints</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/META-INF/MANIFEST.MF
index affad72fbee..8961afe2e26 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/META-INF/MANIFEST.MF
@@ -9,14 +9,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.resources,

  org.eclipse.cdt.managedbuilder.core;bundle-version="8.0.0",

  org.eclipse.cdt.core;bundle-version="5.4.0",

- org.eclipse.papyrus.acceleo;bundle-version="1.0.1",

- org.eclipse.papyrus.cpp.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.codegen.extensionpoints;bundle-version="1.0.1",

- org.eclipse.papyrus.cpp.codegen;bundle-version="1.0.1",

+ org.eclipse.papyrus.acceleo;bundle-version="1.1.0",

+ org.eclipse.papyrus.cpp.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.codegen.extensionpoints;bundle-version="1.1.0",

+ org.eclipse.papyrus.cpp.codegen;bundle-version="1.1.0",

  org.eclipse.cdt.managedbuilder.ui;bundle-version="8.0.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

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

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/pom.xml b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/pom.xml
index ad1df978497..91db46f6755 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/pom.xml
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.cpp.cdtproject</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/C_CppLanguageSupport.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/C_CppLanguageSupport.java
index f06d6e97da7..57d8c42c4dc 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/C_CppLanguageSupport.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/C_CppLanguageSupport.java
@@ -26,8 +26,8 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.UniqueEList;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.papyrus.C_Cpp.ExternLibrary;
+import org.eclipse.papyrus.acceleo.ModelElementsCreator;
 import org.eclipse.papyrus.codegen.extensionpoints.ILangSupport;
-import org.eclipse.papyrus.cpp.codegen.transformation.CppModelElementsCreator;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
@@ -260,7 +260,7 @@ public class C_CppLanguageSupport implements ILangSupport {
 
 	static EList<String> macros;
 
-	CppModelElementsCreator creator;
+	ModelElementsCreator creator;
 
 	static IProject m_project;
 }
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF
index ba5649502ba..afe0894195f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF
@@ -3,20 +3,20 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

  org.eclipse.emf.common;bundle-version="2.8.0",

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

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

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

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.cpp.codegen;bundle-version="1.0.1",

+ org.eclipse.papyrus.cpp.codegen;bundle-version="1.1.0",

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

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

- org.eclipse.papyrus.acceleo;bundle-version="1.0.1",

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

+ org.eclipse.papyrus.acceleo;bundle-version="1.1.0",

  org.eclipse.cdt.core;bundle-version="5.5.0",

- org.eclipse.papyrus.acceleo.ui;bundle-version="1.0.1",

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

+ org.eclipse.papyrus.acceleo.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.core.resources,

- org.eclipse.papyrus.codegen.extensionpoints;bundle-version="1.0.1"

+ org.eclipse.papyrus.codegen.extensionpoints;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

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

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/pom.xml b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/pom.xml
index c531c6200a2..abc235103fd 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/pom.xml
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.cpp.codegen.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.classpath b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.classpath
index ad32c83a788..358df1bc1d1 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.classpath
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" path="xtend-gen"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.jetproperties b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.jetproperties
deleted file mode 100644
index 3c3ea9ef3ae..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.jetproperties
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<jet-settings>
-	<template-container>templates</template-container>	<source-container>jetsrc</source-container>
-</jet-settings>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.project b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.project
index 86c39129087..1b4a71a36b8 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.project
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.project
@@ -6,6 +6,11 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
@@ -42,5 +47,6 @@
 		<nature>org.eclipse.acceleo.ide.ui.acceleoNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
 </projectDescription>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/META-INF/MANIFEST.MF
index 797544a4bac..8d2811f854e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/META-INF/MANIFEST.MF
@@ -4,14 +4,18 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface.text,

  org.eclipse.uml2.uml;bundle-version="4.1.0",

  org.eclipse.core.resources,

- org.eclipse.papyrus.cpp.profile;bundle-version="1.0.1",

+ org.eclipse.papyrus.cpp.profile;bundle-version="1.1.0",

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

  org.eclipse.core.filesystem;bundle-version="1.3.200",

- org.eclipse.papyrus.acceleo;bundle-version="1.0.1",

+ org.eclipse.papyrus.acceleo;bundle-version="1.1.0",

  org.eclipse.cdt.core;resolution:=optional,

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

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

- org.eclipse.papyrus.codegen.extensionpoints;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.codegen.extensionpoints;bundle-version="1.1.0",

+ org.eclipse.xtend.lib,

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

+ org.eclipse.xtext.xbase.lib,

+ org.eclipse.uml2.uml.profile.standard;bundle-version="1.0.0"

 Export-Package: org.eclipse.papyrus.cpp.codegen;uses:="org.eclipse.ui.plugin,org.osgi.framework,org.eclipse.uml2.uml",

  org.eclipse.papyrus.cpp.codegen.preferences;uses:="org.eclipse.jface.preference,org.eclipse.core.runtime.preferences",

  org.eclipse.papyrus.cpp.codegen.transformation;

@@ -19,11 +23,12 @@ Export-Package: org.eclipse.papyrus.cpp.codegen;uses:="org.eclipse.ui.plugin,org
    org.eclipse.papyrus.acceleo,

    org.eclipse.core.resources,

    org.eclipse.uml2.uml",

- org.eclipse.papyrus.cpp.codegen.utils;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util,org.eclipse.uml2.uml"

+ org.eclipse.papyrus.cpp.codegen.utils;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util,org.eclipse.uml2.uml",

+ org.eclipse.papyrus.cpp.codegen.xtend

 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

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

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.properties b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.properties
index 4054b530c9f..143d4e25c7d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.properties
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.properties
@@ -9,5 +9,5 @@ bin.includes = META-INF/,\
                src/org/eclipse/papyrus/cpp/codegen/utils/messages.properties
 output..=bin/
 src.includes=about.html
-source..=src/
+source..=src/,xtend-gen/
 customBuildCallbacks=build.acceleo
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/pom.xml b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/pom.xml
index 75a39d2edb8..30b7855832f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/pom.xml
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.cpp.codegen</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/Constants.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/Constants.emtl
deleted file mode 100644
index 5512989050b..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/Constants.emtl
+++ /dev/null
@@ -1,576 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="Constants" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::Constants" startHeaderPosition="29" endHeaderPosition="-1">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <ownedModuleElement xsi:type="mtl:Template" name="constIncludeHFile" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="// include associated header file"/>
-      <parameter name="dummy">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="constIncludeHeaderStart" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="// Include from Include stereotype (header)"/>
-      <parameter name="dummy">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="constIncludePreBodyStart" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="// Include from Include stereotype (pre-body)"/>
-      <parameter name="dummy">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="constIncludePreBodyEnd" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="// End of Include stereotype (pre-body)"/>
-      <parameter name="dummy">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="constIncludeBodyStart" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="// Include from Include declaration (body)"/>
-      <parameter name="dummy">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="constIncludeHeaderEnd" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="// End of Include stereotype (header)"/>
-      <parameter name="dummy">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="constIncludeBodyEnd" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="// End of Include stereotype (body)"/>
-      <parameter name="dummy">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="constDerivedIncludes" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="// Derived includes directives"/>
-      <parameter name="dummy">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="forwardDecl" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="// forward declarations"/>
-      <parameter name="dummy">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="constStaticAttributes" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="// static attributes (if any)"/>
-      <parameter name="dummy">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="packageTypes" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="// Types defined within the package"/>
-      <parameter name="dummy">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="undefinedType" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="undefined"/>
-      <parameter name="dummy">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="constIncludeHFile">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/constIncludeHFile"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="constIncludeHeaderStart">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/constIncludeHeaderStart"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="constIncludePreBodyStart">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/constIncludePreBodyStart"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="constIncludePreBodyEnd">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/constIncludePreBodyEnd"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="constIncludeBodyStart">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/constIncludeBodyStart"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="constIncludeHeaderEnd">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/constIncludeHeaderEnd"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="constIncludeBodyEnd">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/constIncludeBodyEnd"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="constDerivedIncludes">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/constDerivedIncludes"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="forwardDecl">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/forwardDecl"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="constStaticAttributes">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/constStaticAttributes"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="packageTypes">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/packageTypes"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="undefinedType">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/undefinedType"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/constIncludeHFile">
-      <details key="start" value="91"/>
-      <details key="end" value="189"/>
-      <details key="line" value="5"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/constIncludeHFile/%">
-      <details key="start" value="144"/>
-      <details key="end" value="177"/>
-      <details key="line" value="6"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/constIncludeHFile/dummy">
-      <details key="start" value="126"/>
-      <details key="end" value="141"/>
-      <details key="line" value="5"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/constIncludeHeaderStart">
-      <details key="start" value="191"/>
-      <details key="end" value="305"/>
-      <details key="line" value="9"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/constIncludeHeaderStart/%">
-      <details key="start" value="250"/>
-      <details key="end" value="293"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/constIncludeHeaderStart/dummy">
-      <details key="start" value="232"/>
-      <details key="end" value="247"/>
-      <details key="line" value="9"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/constIncludePreBodyStart">
-      <details key="start" value="307"/>
-      <details key="end" value="424"/>
-      <details key="line" value="13"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/constIncludePreBodyStart/%">
-      <details key="start" value="367"/>
-      <details key="end" value="412"/>
-      <details key="line" value="14"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/constIncludePreBodyStart/dummy">
-      <details key="start" value="349"/>
-      <details key="end" value="364"/>
-      <details key="line" value="13"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/constIncludePreBodyEnd">
-      <details key="start" value="426"/>
-      <details key="end" value="535"/>
-      <details key="line" value="17"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/constIncludePreBodyEnd/%">
-      <details key="start" value="484"/>
-      <details key="end" value="523"/>
-      <details key="line" value="18"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/constIncludePreBodyEnd/dummy">
-      <details key="start" value="466"/>
-      <details key="end" value="481"/>
-      <details key="line" value="17"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/constIncludeBodyStart">
-      <details key="start" value="537"/>
-      <details key="end" value="648"/>
-      <details key="line" value="21"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/constIncludeBodyStart/%">
-      <details key="start" value="594"/>
-      <details key="end" value="636"/>
-      <details key="line" value="22"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/constIncludeBodyStart/dummy">
-      <details key="start" value="576"/>
-      <details key="end" value="591"/>
-      <details key="line" value="21"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/constIncludeHeaderEnd">
-      <details key="start" value="650"/>
-      <details key="end" value="756"/>
-      <details key="line" value="25"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/constIncludeHeaderEnd/%">
-      <details key="start" value="707"/>
-      <details key="end" value="744"/>
-      <details key="line" value="26"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/constIncludeHeaderEnd/dummy">
-      <details key="start" value="689"/>
-      <details key="end" value="704"/>
-      <details key="line" value="25"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/constIncludeBodyEnd">
-      <details key="start" value="758"/>
-      <details key="end" value="860"/>
-      <details key="line" value="29"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/constIncludeBodyEnd/%">
-      <details key="start" value="813"/>
-      <details key="end" value="848"/>
-      <details key="line" value="30"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/constIncludeBodyEnd/dummy">
-      <details key="start" value="795"/>
-      <details key="end" value="810"/>
-      <details key="line" value="29"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/constDerivedIncludes">
-      <details key="start" value="862"/>
-      <details key="end" value="960"/>
-      <details key="line" value="33"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/constDerivedIncludes/%">
-      <details key="start" value="918"/>
-      <details key="end" value="948"/>
-      <details key="line" value="34"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/constDerivedIncludes/dummy">
-      <details key="start" value="900"/>
-      <details key="end" value="915"/>
-      <details key="line" value="33"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/forwardDecl">
-      <details key="start" value="962"/>
-      <details key="end" value="1044"/>
-      <details key="line" value="37"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/forwardDecl/%">
-      <details key="start" value="1009"/>
-      <details key="end" value="1032"/>
-      <details key="line" value="38"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/forwardDecl/dummy">
-      <details key="start" value="991"/>
-      <details key="end" value="1006"/>
-      <details key="line" value="37"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/constStaticAttributes">
-      <details key="start" value="1046"/>
-      <details key="end" value="1144"/>
-      <details key="line" value="41"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/constStaticAttributes/%">
-      <details key="start" value="1103"/>
-      <details key="end" value="1132"/>
-      <details key="line" value="42"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/constStaticAttributes/dummy">
-      <details key="start" value="1085"/>
-      <details key="end" value="1100"/>
-      <details key="line" value="41"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/packageTypes">
-      <details key="start" value="1146"/>
-      <details key="end" value="1241"/>
-      <details key="line" value="45"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/packageTypes/%">
-      <details key="start" value="1194"/>
-      <details key="end" value="1229"/>
-      <details key="line" value="46"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/packageTypes/dummy">
-      <details key="start" value="1176"/>
-      <details key="end" value="1191"/>
-      <details key="line" value="45"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/undefinedType">
-      <details key="start" value="1244"/>
-      <details key="end" value="1314"/>
-      <details key="line" value="50"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/undefinedType/%">
-      <details key="start" value="1293"/>
-      <details key="end" value="1302"/>
-      <details key="line" value="51"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/undefinedType/dummy">
-      <details key="start" value="1275"/>
-      <details key="end" value="1290"/>
-      <details key="line" value="50"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/Constants.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/Constants.mtl
deleted file mode 100644
index 94614d3fedc..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/Constants.mtl
+++ /dev/null
@@ -1,52 +0,0 @@
-[comment encoding = UTF-8 /]
-[module Constants('http://www.eclipse.org/uml2/5.0.0/UML')]
-
-
-[template public constIncludeHFile(dummy : Element)]
-// include associated header file
-[/template]
-
-[template public constIncludeHeaderStart(dummy : Element)]
-// Include from Include stereotype (header)
-[/template]
-
-[template public constIncludePreBodyStart(dummy : Element)]
-// Include from Include stereotype (pre-body)
-[/template]
-
-[template public constIncludePreBodyEnd(dummy : Element)]
-// End of Include stereotype (pre-body)
-[/template]
-
-[template public constIncludeBodyStart(dummy : Element)]
-// Include from Include declaration (body)
-[/template]
-
-[template public constIncludeHeaderEnd(dummy : Element)]
-// End of Include stereotype (header)
-[/template]
-
-[template public constIncludeBodyEnd(dummy : Element)]
-// End of Include stereotype (body)
-[/template]
-
-[template public constDerivedIncludes(dummy : Element)]
-// Derived includes directives
-[/template]
-
-[template public forwardDecl(dummy : Element)]
-// forward declarations
-[/template]
-
-[template public constStaticAttributes(dummy : Element)]
-// static attributes (if any)
-[/template]
-
-[template public packageTypes(dummy : Element)]
-// Types defined within the package
-[/template]
-
-
-[template public undefinedType(dummy : Element)]
-undefined
-[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindBody.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindBody.emtl
deleted file mode 100644
index 86c8b390bd2..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindBody.emtl
+++ /dev/null
@@ -1,1010 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppBindBody" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::CppBindBody" endHeaderPosition="60">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="../utils/CppGenUtils.emtl#/0"/>
-    <imports href="../utils/ClassUtils.emtl#/0"/>
-    <imports href="CppIncludeUtils.emtl#/0"/>
-    <imports href="../preferences/CppCodeGenUtils.emtl#/0"/>
-    <imports href="Constants.emtl#/0"/>
-    <imports href="util/CppTemplates.emtl#/0"/>
-    <imports href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppBindBody" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="#define "/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="_BODY&#xA;&#xA;/************************************************************&#xA;              "/>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/CppBindBody/class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" template binding body&#xA; ************************************************************/&#xA;&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="CppIncludeUtils.emtl#/0/CppIncludePreBody"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/8">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="Constants.emtl#/0/constIncludeHFile"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/9">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="CppIncludeUtils.emtl#/0/IncludeDirective"/>
-        <argument xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                <source xsi:type="mtl:QueryInvocation">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                  <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullPath"/>
-                  <argument xsi:type="ocl.ecore:PropertyCallExp">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-                    <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/10">
-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-                    </source>
-                    <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type/package"/>
-                  </argument>
-                </source>
-                <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="/">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                </argument>
-              </source>
-              <argument xsi:type="ocl.ecore:PropertyCallExp">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                <source xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/CppBindBody/class">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-                </source>
-                <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-              </argument>
-            </source>
-            <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            </argument>
-          </source>
-          <argument xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="../preferences/CppCodeGenUtils.emtl#/0/getHeaderSuffix"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/10">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-            </argument>
-          </argument>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="CppIncludeUtils.emtl#/0/CppIncludeBody"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/11">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;"/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../utils/CppGenUtils.emtl#/0/openNS"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/12">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="Constants.emtl#/0/constDerivedIncludes"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/13">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;"/>
-      <body xsi:type="mtl:ForBlock">
-        <body xsi:type="mtl:TemplateInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="CppIncludeUtils.emtl#/0/IncludeDirective"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="path" referredVariable="/0/CppBindBody/%.17/path">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          </argument>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-        <loopVariable name="path">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </loopVariable>
-        <iterSet xsi:type="ocl.ecore:OperationCallExp" eType="/14/OrderedSet(String)">
-          <source xsi:type="ocl.ecore:OperationCallExp" eType="/14/Sequence(String)">
-            <source xsi:type="mtl:QueryInvocation" eType="/14/Sequence(String)">
-              <definition href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0/CppClassAllIncludes"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/15">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-              </argument>
-            </source>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)_Class/flatten"/>
-          </source>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)_Class/asOrderedSet"/>
-        </iterSet>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;/************************************************************/&#xA;"/>
-      <body xsi:type="mtl:LetBlock">
-        <body xsi:type="mtl:LetBlock">
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="template class "/>
-          <body xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <source xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-              <source xsi:type="ocl.ecore:PropertyCallExp">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-                <source xsi:type="ocl.ecore:VariableExp" name="templateElement" referredVariable="/0/CppBindBody/%.19/%/templateElement">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-                </source>
-                <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>
-              </source>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/22/NamedElement">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-              </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-            </source>
-            <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;"/>
-          <body xsi:type="mtl:ForBlock">
-            <body xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="util/CppTemplates.emtl#/0/CppTemplateBindingParameter"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/26">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-              </argument>
-            </body>
-            <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/14/Set(TemplateParameterSubstitution)">
-              <source xsi:type="ocl.ecore:VariableExp" name="tb" referredVariable="/0/CppBindBody/%.19/tb">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateBinding"/>
-              </source>
-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateBinding/parameterSubstitution"/>
-            </iterSet>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=">;&#xA;"/>
-          <letVariable name="templateElement">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            <initExpression xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-              <source xsi:type="ocl.ecore:OperationCallExp" eType="/14/Sequence(Element)">
-                <source xsi:type="ocl.ecore:PropertyCallExp" eType="/14/Set(Element)">
-                  <source xsi:type="ocl.ecore:VariableExp" name="tb" referredVariable="/0/CppBindBody/%.19/tb">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateBinding"/>
-                  </source>
-                  <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship/target"/>
-                </source>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Set(T)_Class/asSequence"/>
-              </source>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)_Class/first"/>
-            </initExpression>
-          </letVariable>
-        </body>
-        <letVariable name="tb">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateBinding"/>
-          <initExpression xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateBinding"/>
-            <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getTemplateBindings"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/20">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-            </argument>
-          </initExpression>
-        </letVariable>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../utils/CppGenUtils.emtl#/0/closeNS"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/29">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;/************************************************************&#xA;              End of "/>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/CppBindBody/class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" template binding body&#xA; ************************************************************/"/>
-      <parameter name="class">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-      <eOperations name="+">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="other">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="CppBindBody">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppBindBody"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getTemplateBindings">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getTemplateBindings"/>
-        </eAnnotations>
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateBinding"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getFullNameUC">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getFullPath">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullPath"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="openNS">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../utils/CppGenUtils.emtl#/0/openNS"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="closeNS">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../utils/CppGenUtils.emtl#/0/closeNS"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppIncludeBody">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="CppIncludeUtils.emtl#/0/CppIncludeBody"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="ne">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppIncludePreBody">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="CppIncludeUtils.emtl#/0/CppIncludePreBody"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="ne">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="IncludeDirective">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="CppIncludeUtils.emtl#/0/IncludeDirective"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="path">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getHeaderSuffix">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../preferences/CppCodeGenUtils.emtl#/0/getHeaderSuffix"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eOperations>
-      <eOperations name="constIncludeHFile">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="Constants.emtl#/0/constIncludeHFile"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="constDerivedIncludes">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="Constants.emtl#/0/constDerivedIncludes"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppTemplateBindingParameter">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/CppTemplates.emtl#/0/CppTemplateBindingParameter"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="tps">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassAllIncludes">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0/CppClassAllIncludes"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:SequenceType" href="util/clazz/CppClassIncludeClassDeclaration.emtl#/3/Sequence(String)"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="VisibilityKind_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameterSubstitution_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(String)" instanceClassName="java.util.List">
-      <elementType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(String)" instanceClassName="java.util.LinkedHashSet">
-      <elementType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(Element)" instanceClassName="java.util.Set">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Element)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(TemplateParameterSubstitution)" instanceClassName="java.util.Set">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="types">
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="NamedElement">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/CppBindBody">
-      <details key="start" value="637"/>
-      <details key="end" value="1743"/>
-      <details key="line" value="12"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/CppBindBody/%">
-      <details key="start" value="682"/>
-      <details key="end" value="690"/>
-      <details key="line" value="13"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/CppBindBody/%.1">
-      <details key="start" value="691"/>
-      <details key="end" value="706"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/CppBindBody/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/CppBindBody/%.2">
-      <details key="start" value="708"/>
-      <details key="end" value="791"/>
-      <details key="line" value="13"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/CppBindBody/%.3">
-      <details key="start" value="792"/>
-      <details key="end" value="802"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/CppBindBody/%.3/class">
-      <details key="start" value="792"/>
-      <details key="end" value="797"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/CppBindBody/%.4">
-      <details key="start" value="804"/>
-      <details key="end" value="891"/>
-      <details key="line" value="16"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/CppBindBody/%.5">
-      <details key="start" value="892"/>
-      <details key="end" value="911"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/CppBindBody/%.5/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/CppBindBody/%.6">
-      <details key="start" value="913"/>
-      <details key="end" value="915"/>
-      <details key="line" value="20"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/CppBindBody/%.7">
-      <details key="start" value="916"/>
-      <details key="end" value="935"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/CppBindBody/%.7/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/CppBindBody/%.8">
-      <details key="start" value="937"/>
-      <details key="end" value="938"/>
-      <details key="line" value="22"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/CppBindBody/%.9">
-      <details key="start" value="939"/>
-      <details key="end" value="1026"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/CppBindBody/%.9/%">
-      <details key="start" value="957"/>
-      <details key="end" value="1024"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/CppBindBody/%.9/%/%">
-      <details key="start" value="957"/>
-      <details key="end" value="1004"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/CppBindBody/%.9/%/%/%">
-      <details key="start" value="957"/>
-      <details key="end" value="998"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/CppBindBody/%.9/%/%/%/%">
-      <details key="start" value="957"/>
-      <details key="end" value="985"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/CppBindBody/%.9/%/%/%/%/%">
-      <details key="start" value="957"/>
-      <details key="end" value="979"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/CppBindBody/%.9/%/%/%/%/%/%">
-      <details key="start" value="957"/>
-      <details key="end" value="965"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/CppBindBody/%.9/%/%/%/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/CppBindBody/%.9/%/%/%/%/%.1">
-      <details key="start" value="982"/>
-      <details key="end" value="985"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/CppBindBody/%.9/%/%/%/%.1">
-      <details key="start" value="988"/>
-      <details key="end" value="998"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/CppBindBody/%.9/%/%/%/%.1/class">
-      <details key="start" value="988"/>
-      <details key="end" value="993"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/CppBindBody/%.9/%/%/%.1">
-      <details key="start" value="1001"/>
-      <details key="end" value="1004"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/CppBindBody/%.9/%/%.1">
-      <details key="start" value="1007"/>
-      <details key="end" value="1024"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/CppBindBody/%.9/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/CppBindBody/%.10">
-      <details key="start" value="1028"/>
-      <details key="end" value="1030"/>
-      <details key="line" value="23"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/CppBindBody/%.11">
-      <details key="start" value="1031"/>
-      <details key="end" value="1047"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/CppBindBody/%.11/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/CppBindBody/%.12">
-      <details key="start" value="1049"/>
-      <details key="end" value="1051"/>
-      <details key="line" value="25"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/CppBindBody/%.13">
-      <details key="start" value="1052"/>
-      <details key="end" value="1060"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/CppBindBody/%.13/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/CppBindBody/%.14">
-      <details key="start" value="1062"/>
-      <details key="end" value="1064"/>
-      <details key="line" value="27"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/CppBindBody/%.15">
-      <details key="start" value="1065"/>
-      <details key="end" value="1087"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/CppBindBody/%.15/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/CppBindBody/%.16">
-      <details key="start" value="1089"/>
-      <details key="end" value="1091"/>
-      <details key="line" value="29"/>
-    </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/CppBindBody/%.17">
-      <details key="start" value="1091"/>
-      <details key="end" value="1197"/>
-      <details key="line" value="30"/>
-    </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/CppBindBody/%.17/%">
-      <details key="start" value="1165"/>
-      <details key="end" value="1188"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/CppBindBody/%.17/%/path">
-      <details key="start" value="1165"/>
-      <details key="end" value="1169"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/CppBindBody/%.17/%.1">
-      <details key="start" value="1190"/>
-      <details key="end" value="1191"/>
-      <details key="line" value="32"/>
-    </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/CppBindBody/%.17/path">
-      <details key="start" value="1097"/>
-      <details key="end" value="1110"/>
-      <details key="line" value="30"/>
-    </eAnnotations>
-    <eAnnotations source="positions.43" references="/0/CppBindBody/%.17/%.2">
-      <details key="start" value="1113"/>
-      <details key="end" value="1161"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.44" references="/0/CppBindBody/%.17/%.2/%">
-      <details key="start" value="1113"/>
-      <details key="end" value="1145"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.45" references="/0/CppBindBody/%.17/%.2/%/%">
-      <details key="start" value="1113"/>
-      <details key="end" value="1134"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.46" references="/0/CppBindBody/%.17/%.2/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.47" references="/0/CppBindBody/%.18">
-      <details key="start" value="1198"/>
-      <details key="end" value="1262"/>
-      <details key="line" value="33"/>
-    </eAnnotations>
-    <eAnnotations source="positions.48" references="/0/CppBindBody/%.19">
-      <details key="start" value="1262"/>
-      <details key="end" value="1534"/>
-      <details key="line" value="35"/>
-    </eAnnotations>
-    <eAnnotations source="positions.49" references="/0/CppBindBody/%.19/%">
-      <details key="start" value="1313"/>
-      <details key="end" value="1528"/>
-      <details key="line" value="36"/>
-    </eAnnotations>
-    <eAnnotations source="positions.50" references="/0/CppBindBody/%.19/%/%">
-      <details key="start" value="1380"/>
-      <details key="end" value="1395"/>
-      <details key="line" value="37"/>
-    </eAnnotations>
-    <eAnnotations source="positions.51" references="/0/CppBindBody/%.19/%/%.1">
-      <details key="start" value="1396"/>
-      <details key="end" value="1446"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.52" references="/0/CppBindBody/%.19/%/%.1/%">
-      <details key="start" value="1396"/>
-      <details key="end" value="1441"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.53" references="/0/CppBindBody/%.19/%/%.1/%/%">
-      <details key="start" value="1396"/>
-      <details key="end" value="1417"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.54" references="/0/CppBindBody/%.19/%/%.1/%/%/templateElement">
-      <details key="start" value="1396"/>
-      <details key="end" value="1411"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.55" references="/0/CppBindBody/%.19/%/%.1/%/%.1">
-      <details key="start" value="1428"/>
-      <details key="end" value="1440"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.56" references="/0/CppBindBody/%.19/%/%.2">
-      <details key="start" value="1448"/>
-      <details key="end" value="1449"/>
-      <details key="line" value="37"/>
-    </eAnnotations>
-    <eAnnotations source="positions.57" references="/0/CppBindBody/%.19/%/%.3">
-      <details key="start" value="1449"/>
-      <details key="end" value="1519"/>
-      <details key="line" value="37"/>
-    </eAnnotations>
-    <eAnnotations source="positions.58" references="/0/CppBindBody/%.19/%/%.3/%">
-      <details key="start" value="1482"/>
-      <details key="end" value="1511"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.59" references="/0/CppBindBody/%.19/%/%.3/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.60" references="/0/CppBindBody/%.19/%/%.3/%.1">
-      <details key="start" value="1455"/>
-      <details key="end" value="1479"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.61" references="/0/CppBindBody/%.19/%/%.3/%.1/tb">
-      <details key="start" value="1455"/>
-      <details key="end" value="1457"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.62" references="/0/CppBindBody/%.19/%/%.4">
-      <details key="start" value="1519"/>
-      <details key="end" value="1522"/>
-      <details key="line" value="37"/>
-    </eAnnotations>
-    <eAnnotations source="positions.63" references="/0/CppBindBody/%.19/%/templateElement">
-      <details key="start" value="1318"/>
-      <details key="end" value="1378"/>
-      <details key="line" value="36"/>
-    </eAnnotations>
-    <eAnnotations source="positions.64" references="/0/CppBindBody/%.19/%/templateElement/%">
-      <details key="start" value="1347"/>
-      <details key="end" value="1379"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.65" references="/0/CppBindBody/%.19/%/templateElement/%/%">
-      <details key="start" value="1347"/>
-      <details key="end" value="1370"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.66" references="/0/CppBindBody/%.19/%/templateElement/%/%/%">
-      <details key="start" value="1347"/>
-      <details key="end" value="1356"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.67" references="/0/CppBindBody/%.19/%/templateElement/%/%/%/tb">
-      <details key="start" value="1347"/>
-      <details key="end" value="1349"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.68" references="/0/CppBindBody/%.19/tb">
-      <details key="start" value="1267"/>
-      <details key="end" value="1311"/>
-      <details key="line" value="35"/>
-    </eAnnotations>
-    <eAnnotations source="positions.69" references="/0/CppBindBody/%.19/tb/%">
-      <details key="start" value="1291"/>
-      <details key="end" value="1312"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.70" references="/0/CppBindBody/%.19/tb/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.71" references="/0/CppBindBody/%.20">
-      <details key="start" value="1535"/>
-      <details key="end" value="1536"/>
-      <details key="line" value="39"/>
-    </eAnnotations>
-    <eAnnotations source="positions.72" references="/0/CppBindBody/%.21">
-      <details key="start" value="1537"/>
-      <details key="end" value="1546"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.73" references="/0/CppBindBody/%.21/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.74" references="/0/CppBindBody/%.22">
-      <details key="start" value="1548"/>
-      <details key="end" value="1633"/>
-      <details key="line" value="41"/>
-    </eAnnotations>
-    <eAnnotations source="positions.75" references="/0/CppBindBody/%.23">
-      <details key="start" value="1634"/>
-      <details key="end" value="1644"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.76" references="/0/CppBindBody/%.23/class">
-      <details key="start" value="1634"/>
-      <details key="end" value="1639"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.77" references="/0/CppBindBody/%.24">
-      <details key="start" value="1646"/>
-      <details key="end" value="1731"/>
-      <details key="line" value="43"/>
-    </eAnnotations>
-    <eAnnotations source="positions.78" references="/0/CppBindBody/class">
-      <details key="start" value="666"/>
-      <details key="end" value="679"/>
-      <details key="line" value="12"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindBody.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindBody.mtl
deleted file mode 100644
index bb2cf852f40..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindBody.mtl
+++ /dev/null
@@ -1,45 +0,0 @@
-[module CppBindBody('http://www.eclipse.org/uml2/5.0.0/UML')/]
-[import org::eclipse::papyrus::acceleo::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::CppGenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::ClassUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::CppIncludeUtils/]
-[import org::eclipse::papyrus::cpp::codegen::preferences::CppCodeGenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::Constants/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppTemplates/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassIncludeClassDeclaration/]
-
-
-[template public CppBindBody(class : Class)]
-#define [getFullNameUC()/]_BODY
-
-/************************************************************
-              [class.name/] template binding body
- ************************************************************/
-
-[CppIncludePreBody()/]
-
-[constIncludeHFile()/]
-[IncludeDirective( _package.getFullPath() + '/' + class.name + '.' + getHeaderSuffix() )/]
-
-[CppIncludeBody()/]
-
-[openNS()/]
-
-[constDerivedIncludes()/]
-
-[for (path : String | CppClassAllIncludes()->flatten()->asOrderedSet())]
-[path.IncludeDirective()/]
-[/for]
-
-/************************************************************/
-[let tb : TemplateBinding = getTemplateBindings()]
-[let templateElement : Element = tb.target->asSequence()->first()]
-template class [templateElement.owner.oclAsType(NamedElement).name/]<[for (tb.parameterSubstitution)][CppTemplateBindingParameter()/][/for]>;
-[/let][/let]
-
-[closeNS()/]
-
-/************************************************************
-              End of [class.name/] template binding body
- ************************************************************/
-[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindHeader.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindHeader.emtl
deleted file mode 100644
index f372ad6c3eb..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindHeader.emtl
+++ /dev/null
@@ -1,1031 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppBindHeader" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::CppBindHeader" endHeaderPosition="62">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="../utils/CppGenUtils.emtl#/0"/>
-    <imports href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0"/>
-    <imports href="util/CppTemplates.emtl#/0"/>
-    <imports href="../preferences/CppCodeGenUtils.emtl#/0"/>
-    <imports href="CppIncludeUtils.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppBindHeader" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="#ifndef "/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="_H&#xA;#define "/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="_H&#xA;&#xA;/************************************************************&#xA;              "/>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/CppBindHeader/class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" template binding header&#xA; ************************************************************/&#xA;&#xA;"/>
-      <body xsi:type="mtl:ForBlock">
-        <body xsi:type="mtl:TemplateInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="CppIncludeUtils.emtl#/0/IncludeDirective"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="path" referredVariable="/0/CppBindHeader/%.7/path">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          </argument>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-        <loopVariable name="path">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </loopVariable>
-        <iterSet xsi:type="ocl.ecore:OperationCallExp" eType="/9/OrderedSet(String)">
-          <source xsi:type="ocl.ecore:OperationCallExp" eType="/9/Sequence(String)">
-            <source xsi:type="ocl.ecore:OperationCallExp" eType="/9/Sequence(String)" referredOperation="/1/Collection(T)_Class/addAll">
-              <source xsi:type="ocl.ecore:CollectionLiteralExp" eType="/9/Sequence(String)" kind="Sequence">
-                <part xsi:type="ocl.ecore:CollectionItem">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                  <item xsi:type="mtl:QueryInvocation">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                    <definition href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0/cppOwnerPackageIncludePath"/>
-                    <argument xsi:type="ocl.ecore:PropertyCallExp">
-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-                      <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/10">
-                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-                      </source>
-                      <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type/package"/>
-                    </argument>
-                  </item>
-                </part>
-              </source>
-              <argument xsi:type="mtl:QueryInvocation" eType="/9/Sequence(String)">
-                <definition href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0/CppClassAllIncludes"/>
-                <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/10">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-                </argument>
-              </argument>
-            </source>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)_Class/flatten"/>
-          </source>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)_Class/asOrderedSet"/>
-        </iterSet>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="CppIncludeUtils.emtl#/0/CppIncludeHeader"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/15">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;"/>
-      <body xsi:type="mtl:LetBlock">
-        <body xsi:type="mtl:LetBlock">
-          <body xsi:type="mtl:TemplateInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="CppIncludeUtils.emtl#/0/IncludeDirective"/>
-            <argument xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                  <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                    <source xsi:type="mtl:QueryInvocation">
-                      <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                      <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullPath"/>
-                      <argument xsi:type="ocl.ecore:PropertyCallExp">
-                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-                        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/19">
-                          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-                        </source>
-                        <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type/package"/>
-                      </argument>
-                    </source>
-                    <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="/">
-                      <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                    </argument>
-                  </source>
-                  <argument xsi:type="ocl.ecore:PropertyCallExp">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                    <source xsi:type="ocl.ecore:OperationCallExp">
-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-                      <source xsi:type="ocl.ecore:PropertyCallExp">
-                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-                        <source xsi:type="ocl.ecore:VariableExp" name="templateElement" referredVariable="/0/CppBindHeader/%.11/%/templateElement">
-                          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-                        </source>
-                        <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>
-                      </source>
-                      <argument xsi:type="ocl.ecore:TypeExp" eType="/18/NamedElement">
-                        <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-                      </argument>
-                      <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-                    </source>
-                    <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-                  </argument>
-                </source>
-                <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                </argument>
-              </source>
-              <argument xsi:type="mtl:QueryInvocation">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                <definition href="../preferences/CppCodeGenUtils.emtl#/0/getHeaderSuffix"/>
-                <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/19">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-                </argument>
-              </argument>
-            </argument>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;"/>
-          <body xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="../utils/CppGenUtils.emtl#/0/openNS"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/20">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-            </argument>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" &#xA;/************************************************************/&#xA;typedef "/>
-          <body xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <source xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-              <source xsi:type="ocl.ecore:PropertyCallExp">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-                <source xsi:type="ocl.ecore:VariableExp" name="templateElement" referredVariable="/0/CppBindHeader/%.11/%/templateElement">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-                </source>
-                <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>
-              </source>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/18/NamedElement">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-              </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-            </source>
-            <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;"/>
-          <body xsi:type="mtl:ForBlock">
-            <body xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="util/CppTemplates.emtl#/0/CppTemplateBindingParameter"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/24">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-              </argument>
-            </body>
-            <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/9/Set(TemplateParameterSubstitution)">
-              <source xsi:type="ocl.ecore:VariableExp" name="tb" referredVariable="/0/CppBindHeader/%.11/tb">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateBinding"/>
-              </source>
-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateBinding/parameterSubstitution"/>
-            </iterSet>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="> "/>
-          <body xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/CppBindHeader/class">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-            </source>
-            <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=";&#xA;&#xA;"/>
-          <body xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="../utils/CppGenUtils.emtl#/0/closeNS"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/28">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-            </argument>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-          <letVariable name="templateElement">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            <initExpression xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-              <source xsi:type="ocl.ecore:OperationCallExp" eType="/9/Sequence(Element)">
-                <source xsi:type="ocl.ecore:PropertyCallExp" eType="/9/Set(Element)">
-                  <source xsi:type="ocl.ecore:VariableExp" name="tb" referredVariable="/0/CppBindHeader/%.11/tb">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateBinding"/>
-                  </source>
-                  <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship/target"/>
-                </source>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Set(T)_Class/asSequence"/>
-              </source>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)_Class/first"/>
-            </initExpression>
-          </letVariable>
-        </body>
-        <letVariable name="tb">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateBinding"/>
-          <initExpression xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateBinding"/>
-            <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getTemplateBindings"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/16">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-            </argument>
-          </initExpression>
-        </letVariable>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;/************************************************************&#xA;              End of "/>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/CppBindHeader/class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" template binding header&#xA; ************************************************************/&#xA;&#xA;#endif"/>
-      <parameter name="class">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-      <eOperations name="+">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="other">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="CppBindHeader">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppBindHeader"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getTemplateBindings">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getTemplateBindings"/>
-        </eAnnotations>
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateBinding"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getFullNameUC">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getFullPath">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullPath"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="openNS">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../utils/CppGenUtils.emtl#/0/openNS"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="closeNS">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../utils/CppGenUtils.emtl#/0/closeNS"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="cppOwnerPackageIncludePath">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0/cppOwnerPackageIncludePath"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="pkg">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassAllIncludes">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0/CppClassAllIncludes"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:SequenceType" href="util/clazz/CppClassIncludeClassDeclaration.emtl#/3/Sequence(String)"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppTemplateBindingParameter">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/CppTemplates.emtl#/0/CppTemplateBindingParameter"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="tps">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getHeaderSuffix">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../preferences/CppCodeGenUtils.emtl#/0/getHeaderSuffix"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eOperations>
-      <eOperations name="CppIncludeHeader">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="CppIncludeUtils.emtl#/0/CppIncludeHeader"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="ne">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="IncludeDirective">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="CppIncludeUtils.emtl#/0/IncludeDirective"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="path">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-      <eOperations name="addAll">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:CollectionType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-        <eParameters name="otherCollection">
-          <eType xsi:type="ocl.ecore:CollectionType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="VisibilityKind_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameterSubstitution_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(String)" instanceClassName="java.util.List">
-      <elementType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:CollectionType" name="Collection(String)">
-      <elementType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(String)" instanceClassName="java.util.LinkedHashSet">
-      <elementType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(Element)" instanceClassName="java.util.Set">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Element)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(TemplateParameterSubstitution)" instanceClassName="java.util.Set">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="types">
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="NamedElement">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/CppBindHeader">
-      <details key="start" value="508"/>
-      <details key="end" value="1701"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/CppBindHeader/%">
-      <details key="start" value="556"/>
-      <details key="end" value="564"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/CppBindHeader/%.1">
-      <details key="start" value="565"/>
-      <details key="end" value="580"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/CppBindHeader/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/CppBindHeader/%.2">
-      <details key="start" value="582"/>
-      <details key="end" value="593"/>
-      <details key="line" value="11"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/CppBindHeader/%.3">
-      <details key="start" value="594"/>
-      <details key="end" value="609"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/CppBindHeader/%.3/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/CppBindHeader/%.4">
-      <details key="start" value="611"/>
-      <details key="end" value="691"/>
-      <details key="line" value="12"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/CppBindHeader/%.5">
-      <details key="start" value="692"/>
-      <details key="end" value="702"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/CppBindHeader/%.5/class">
-      <details key="start" value="692"/>
-      <details key="end" value="697"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/CppBindHeader/%.6">
-      <details key="start" value="704"/>
-      <details key="end" value="793"/>
-      <details key="line" value="15"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/CppBindHeader/%.7">
-      <details key="start" value="793"/>
-      <details key="end" value="970"/>
-      <details key="line" value="18"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/CppBindHeader/%.7/%">
-      <details key="start" value="938"/>
-      <details key="end" value="961"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/CppBindHeader/%.7/%/path">
-      <details key="start" value="938"/>
-      <details key="end" value="942"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/CppBindHeader/%.7/%.1">
-      <details key="start" value="963"/>
-      <details key="end" value="964"/>
-      <details key="line" value="24"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/CppBindHeader/%.7/path">
-      <details key="start" value="799"/>
-      <details key="end" value="812"/>
-      <details key="line" value="18"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/CppBindHeader/%.7/%.2">
-      <details key="start" value="816"/>
-      <details key="end" value="934"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/CppBindHeader/%.7/%.2/%">
-      <details key="start" value="816"/>
-      <details key="end" value="915"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/CppBindHeader/%.7/%.2/%/%">
-      <details key="start" value="816"/>
-      <details key="end" value="901"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/CppBindHeader/%.7/%.2/%/%/%">
-      <details key="start" value="816"/>
-      <details key="end" value="865"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/CppBindHeader/%.7/%.2/%/%/%/%/%">
-      <details key="start" value="826"/>
-      <details key="end" value="863"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/CppBindHeader/%.7/%.2/%/%/%/%/%/%">
-      <details key="start" value="826"/>
-      <details key="end" value="834"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/CppBindHeader/%.7/%.2/%/%/%/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/CppBindHeader/%.7/%.2/%/%/%.1">
-      <details key="start" value="878"/>
-      <details key="end" value="899"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/CppBindHeader/%.7/%.2/%/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/CppBindHeader/%.8">
-      <details key="start" value="971"/>
-      <details key="end" value="972"/>
-      <details key="line" value="25"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/CppBindHeader/%.9">
-      <details key="start" value="973"/>
-      <details key="end" value="991"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/CppBindHeader/%.9/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/CppBindHeader/%.10">
-      <details key="start" value="993"/>
-      <details key="end" value="995"/>
-      <details key="line" value="27"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/CppBindHeader/%.11">
-      <details key="start" value="995"/>
-      <details key="end" value="1496"/>
-      <details key="line" value="28"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/CppBindHeader/%.11/%">
-      <details key="start" value="1046"/>
-      <details key="end" value="1490"/>
-      <details key="line" value="29"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/CppBindHeader/%.11/%/%">
-      <details key="start" value="1114"/>
-      <details key="end" value="1241"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/CppBindHeader/%.11/%/%/%">
-      <details key="start" value="1132"/>
-      <details key="end" value="1239"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/CppBindHeader/%.11/%/%/%/%">
-      <details key="start" value="1132"/>
-      <details key="end" value="1219"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/CppBindHeader/%.11/%/%/%/%/%">
-      <details key="start" value="1132"/>
-      <details key="end" value="1213"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/CppBindHeader/%.11/%/%/%/%/%/%">
-      <details key="start" value="1132"/>
-      <details key="end" value="1160"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/CppBindHeader/%.11/%/%/%/%/%/%/%">
-      <details key="start" value="1132"/>
-      <details key="end" value="1154"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/CppBindHeader/%.11/%/%/%/%/%/%/%/%">
-      <details key="start" value="1132"/>
-      <details key="end" value="1140"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/CppBindHeader/%.11/%/%/%/%/%/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/CppBindHeader/%.11/%/%/%/%/%/%/%.1">
-      <details key="start" value="1157"/>
-      <details key="end" value="1160"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/CppBindHeader/%.11/%/%/%/%/%/%.1">
-      <details key="start" value="1163"/>
-      <details key="end" value="1213"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/CppBindHeader/%.11/%/%/%/%/%/%.1/%">
-      <details key="start" value="1163"/>
-      <details key="end" value="1208"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/CppBindHeader/%.11/%/%/%/%/%/%.1/%/%">
-      <details key="start" value="1163"/>
-      <details key="end" value="1184"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.43" references="/0/CppBindHeader/%.11/%/%/%/%/%/%.1/%/%/templateElement">
-      <details key="start" value="1163"/>
-      <details key="end" value="1178"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.44" references="/0/CppBindHeader/%.11/%/%/%/%/%/%.1/%/%.1">
-      <details key="start" value="1195"/>
-      <details key="end" value="1207"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.45" references="/0/CppBindHeader/%.11/%/%/%/%/%.1">
-      <details key="start" value="1216"/>
-      <details key="end" value="1219"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.46" references="/0/CppBindHeader/%.11/%/%/%/%.1">
-      <details key="start" value="1222"/>
-      <details key="end" value="1239"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.47" references="/0/CppBindHeader/%.11/%/%/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.48" references="/0/CppBindHeader/%.11/%/%.1">
-      <details key="start" value="1243"/>
-      <details key="end" value="1245"/>
-      <details key="line" value="31"/>
-    </eAnnotations>
-    <eAnnotations source="positions.49" references="/0/CppBindHeader/%.11/%/%.2">
-      <details key="start" value="1246"/>
-      <details key="end" value="1254"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.50" references="/0/CppBindHeader/%.11/%/%.2/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.51" references="/0/CppBindHeader/%.11/%/%.3">
-      <details key="start" value="1256"/>
-      <details key="end" value="1329"/>
-      <details key="line" value="32"/>
-    </eAnnotations>
-    <eAnnotations source="positions.52" references="/0/CppBindHeader/%.11/%/%.4">
-      <details key="start" value="1330"/>
-      <details key="end" value="1380"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.53" references="/0/CppBindHeader/%.11/%/%.4/%">
-      <details key="start" value="1330"/>
-      <details key="end" value="1375"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.54" references="/0/CppBindHeader/%.11/%/%.4/%/%">
-      <details key="start" value="1330"/>
-      <details key="end" value="1351"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.55" references="/0/CppBindHeader/%.11/%/%.4/%/%/templateElement">
-      <details key="start" value="1330"/>
-      <details key="end" value="1345"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.56" references="/0/CppBindHeader/%.11/%/%.4/%/%.1">
-      <details key="start" value="1362"/>
-      <details key="end" value="1374"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.57" references="/0/CppBindHeader/%.11/%/%.5">
-      <details key="start" value="1382"/>
-      <details key="end" value="1383"/>
-      <details key="line" value="34"/>
-    </eAnnotations>
-    <eAnnotations source="positions.58" references="/0/CppBindHeader/%.11/%/%.6">
-      <details key="start" value="1383"/>
-      <details key="end" value="1453"/>
-      <details key="line" value="34"/>
-    </eAnnotations>
-    <eAnnotations source="positions.59" references="/0/CppBindHeader/%.11/%/%.6/%">
-      <details key="start" value="1416"/>
-      <details key="end" value="1445"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.60" references="/0/CppBindHeader/%.11/%/%.6/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.61" references="/0/CppBindHeader/%.11/%/%.6/%.1">
-      <details key="start" value="1389"/>
-      <details key="end" value="1413"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.62" references="/0/CppBindHeader/%.11/%/%.6/%.1/tb">
-      <details key="start" value="1389"/>
-      <details key="end" value="1391"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.63" references="/0/CppBindHeader/%.11/%/%.7">
-      <details key="start" value="1453"/>
-      <details key="end" value="1455"/>
-      <details key="line" value="34"/>
-    </eAnnotations>
-    <eAnnotations source="positions.64" references="/0/CppBindHeader/%.11/%/%.8">
-      <details key="start" value="1456"/>
-      <details key="end" value="1466"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.65" references="/0/CppBindHeader/%.11/%/%.8/class">
-      <details key="start" value="1456"/>
-      <details key="end" value="1461"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.66" references="/0/CppBindHeader/%.11/%/%.9">
-      <details key="start" value="1468"/>
-      <details key="end" value="1471"/>
-      <details key="line" value="34"/>
-    </eAnnotations>
-    <eAnnotations source="positions.67" references="/0/CppBindHeader/%.11/%/%.10">
-      <details key="start" value="1472"/>
-      <details key="end" value="1481"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.68" references="/0/CppBindHeader/%.11/%/%.10/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.69" references="/0/CppBindHeader/%.11/%/%.11">
-      <details key="start" value="1483"/>
-      <details key="end" value="1484"/>
-      <details key="line" value="37"/>
-    </eAnnotations>
-    <eAnnotations source="positions.70" references="/0/CppBindHeader/%.11/%/templateElement">
-      <details key="start" value="1051"/>
-      <details key="end" value="1111"/>
-      <details key="line" value="29"/>
-    </eAnnotations>
-    <eAnnotations source="positions.71" references="/0/CppBindHeader/%.11/%/templateElement/%">
-      <details key="start" value="1080"/>
-      <details key="end" value="1112"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.72" references="/0/CppBindHeader/%.11/%/templateElement/%/%">
-      <details key="start" value="1080"/>
-      <details key="end" value="1103"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.73" references="/0/CppBindHeader/%.11/%/templateElement/%/%/%">
-      <details key="start" value="1080"/>
-      <details key="end" value="1089"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.74" references="/0/CppBindHeader/%.11/%/templateElement/%/%/%/tb">
-      <details key="start" value="1080"/>
-      <details key="end" value="1082"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.75" references="/0/CppBindHeader/%.11/tb">
-      <details key="start" value="1000"/>
-      <details key="end" value="1044"/>
-      <details key="line" value="28"/>
-    </eAnnotations>
-    <eAnnotations source="positions.76" references="/0/CppBindHeader/%.11/tb/%">
-      <details key="start" value="1024"/>
-      <details key="end" value="1045"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.77" references="/0/CppBindHeader/%.11/tb/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.78" references="/0/CppBindHeader/%.12">
-      <details key="start" value="1497"/>
-      <details key="end" value="1581"/>
-      <details key="line" value="38"/>
-    </eAnnotations>
-    <eAnnotations source="positions.79" references="/0/CppBindHeader/%.13">
-      <details key="start" value="1582"/>
-      <details key="end" value="1592"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.80" references="/0/CppBindHeader/%.13/class">
-      <details key="start" value="1582"/>
-      <details key="end" value="1587"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.81" references="/0/CppBindHeader/%.14">
-      <details key="start" value="1594"/>
-      <details key="end" value="1689"/>
-      <details key="line" value="40"/>
-    </eAnnotations>
-    <eAnnotations source="positions.82" references="/0/CppBindHeader/class">
-      <details key="start" value="539"/>
-      <details key="end" value="552"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindHeader.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindHeader.mtl
deleted file mode 100644
index 007a48b1f47..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindHeader.mtl
+++ /dev/null
@@ -1,44 +0,0 @@
-[module CppBindHeader('http://www.eclipse.org/uml2/5.0.0/UML')/]
-[import org::eclipse::papyrus::acceleo::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::CppGenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassIncludeClassDeclaration/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppTemplates/]
-[import org::eclipse::papyrus::cpp::codegen::preferences::CppCodeGenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::CppIncludeUtils/]
-
-
-[template public CppBindHeader(class : Class)] 
-#ifndef [getFullNameUC()/]_H
-#define [getFullNameUC()/]_H
-
-/************************************************************
-              [class.name/] template binding header
- ************************************************************/
-
-[for (path : String |
-	Sequence{ _package.cppOwnerPackageIncludePath() }
-		->addAll( CppClassAllIncludes() )
-		->flatten()
-		->asOrderedSet())]
-[path.IncludeDirective()/]
-[/for]
-
-[CppIncludeHeader()/]
-
-[let tb : TemplateBinding = getTemplateBindings()]
-[let templateElement : Element = tb.target->asSequence()->first()]
-[IncludeDirective( _package.getFullPath() + '/' + templateElement.owner.oclAsType(NamedElement).name + '.' + getHeaderSuffix() )/]
-
-[openNS()/] 
-/************************************************************/
-typedef [templateElement.owner.oclAsType(NamedElement).name/]<[for (tb.parameterSubstitution)][CppTemplateBindingParameter()/][/for]> [class.name/];
-
-[closeNS()/]
-[/let][/let]
-
-/************************************************************
-              End of [class.name/] template binding header
- ************************************************************/
-
-#endif
-[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassBody.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassBody.emtl
deleted file mode 100644
index f3905cb70d3..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassBody.emtl
+++ /dev/null
@@ -1,885 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppClassBody" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::CppClassBody" endHeaderPosition="61">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="../utils/CppGenUtils.emtl#/0"/>
-    <imports href="../utils/ClassUtils.emtl#/0"/>
-    <imports href="Constants.emtl#/0"/>
-    <imports href="CppIncludeUtils.emtl#/0"/>
-    <imports href="../preferences/CppCodeGenUtils.emtl#/0"/>
-    <imports href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0"/>
-    <imports href="util/clazz/CppClassOperationsImplementation.emtl#/0"/>
-    <imports href="util/CppAttribute.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppClassBody" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="#define "/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullName"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="_BODY&#xA;&#xA;/************************************************************&#xA;              "/>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/CppClassBody/class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" class body&#xA; ************************************************************/&#xA;&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="CppIncludeUtils.emtl#/0/CppIncludePreBody"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/8">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="Constants.emtl#/0/constIncludeHFile"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/9">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="CppIncludeUtils.emtl#/0/IncludeDirective"/>
-        <argument xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                <source xsi:type="mtl:QueryInvocation">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                  <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullPath"/>
-                  <argument xsi:type="ocl.ecore:OperationCallExp">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-                    <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/10">
-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                    </source>
-                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/getNearestPackage"/>
-                  </argument>
-                </source>
-                <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="/">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                </argument>
-              </source>
-              <argument xsi:type="ocl.ecore:PropertyCallExp">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                <source xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/CppClassBody/class">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                </source>
-                <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-              </argument>
-            </source>
-            <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            </argument>
-          </source>
-          <argument xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="../preferences/CppCodeGenUtils.emtl#/0/getHeaderSuffix"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/10">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </argument>
-          </argument>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="Constants.emtl#/0/constDerivedIncludes"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/11">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:ForBlock">
-        <body xsi:type="mtl:TemplateInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="CppIncludeUtils.emtl#/0/IncludeDirective"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="path" referredVariable="/0/CppClassBody/%.13/path">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          </argument>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-        <loopVariable name="path">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </loopVariable>
-        <iterSet xsi:type="ocl.ecore:OperationCallExp" eType="/12/OrderedSet(String)">
-          <source xsi:type="ocl.ecore:OperationCallExp" eType="/12/Sequence(String)">
-            <source xsi:type="mtl:QueryInvocation" eType="/12/Sequence(String)">
-              <definition href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0/CppClassAllIncludesDeclarationBody"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/13">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-              </argument>
-            </source>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)_Class/flatten"/>
-          </source>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)_Class/asOrderedSet"/>
-        </iterSet>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="CppIncludeUtils.emtl#/0/CppIncludeBody"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/18">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;"/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../utils/CppGenUtils.emtl#/0/openNS"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/CppClassBody/class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="util/CppAttribute.emtl#/0/CppStaticAttributes"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/CppClassBody/class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="mtl:TemplateInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="util/clazz/CppClassOperationsImplementation.emtl#/0/CppClassOperationsImplementation"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/22">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="false">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          </argument>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-        <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/21">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </source>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/isTemplate"/>
-          </source>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/not"/>
-        </ifExpr>
-      </body>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../utils/CppGenUtils.emtl#/0/closeNS"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/CppClassBody/class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;/************************************************************&#xA;              End of "/>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/CppClassBody/class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" class body&#xA; ************************************************************/"/>
-      <parameter name="class">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-      <eOperations name="+">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="other">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="CppClassBody">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppClassBody"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getFullName">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullName"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getFullPath">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullPath"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="openNS">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../utils/CppGenUtils.emtl#/0/openNS"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="closeNS">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../utils/CppGenUtils.emtl#/0/closeNS"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="constIncludeHFile">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="Constants.emtl#/0/constIncludeHFile"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="constDerivedIncludes">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="Constants.emtl#/0/constDerivedIncludes"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppIncludeBody">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="CppIncludeUtils.emtl#/0/CppIncludeBody"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="ne">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppIncludePreBody">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="CppIncludeUtils.emtl#/0/CppIncludePreBody"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="ne">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="IncludeDirective">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="CppIncludeUtils.emtl#/0/IncludeDirective"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="path">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getHeaderSuffix">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../preferences/CppCodeGenUtils.emtl#/0/getHeaderSuffix"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eOperations>
-      <eOperations name="CppClassAllIncludesDeclarationBody">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0/CppClassAllIncludesDeclarationBody"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:SequenceType" href="util/clazz/CppClassIncludeClassDeclaration.emtl#/3/Sequence(String)"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassOperationsImplementation">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/clazz/CppClassOperationsImplementation.emtl#/0/CppClassOperationsImplementation"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-        <eParameters name="inline">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppStaticAttributes">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/CppAttribute.emtl#/0/CppStaticAttributes"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="classifier">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="VisibilityKind_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Property_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(String)" instanceClassName="java.util.List">
-      <elementType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(String)" instanceClassName="java.util.LinkedHashSet">
-      <elementType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/CppClassBody">
-      <details key="start" value="740"/>
-      <details key="end" value="1626"/>
-      <details key="line" value="13"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/CppClassBody/%">
-      <details key="start" value="791"/>
-      <details key="end" value="799"/>
-      <details key="line" value="14"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/CppClassBody/%.1">
-      <details key="start" value="800"/>
-      <details key="end" value="813"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/CppClassBody/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/CppClassBody/%.2">
-      <details key="start" value="815"/>
-      <details key="end" value="898"/>
-      <details key="line" value="14"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/CppClassBody/%.3">
-      <details key="start" value="899"/>
-      <details key="end" value="909"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/CppClassBody/%.3/class">
-      <details key="start" value="899"/>
-      <details key="end" value="904"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/CppClassBody/%.4">
-      <details key="start" value="911"/>
-      <details key="end" value="987"/>
-      <details key="line" value="17"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/CppClassBody/%.5">
-      <details key="start" value="988"/>
-      <details key="end" value="1007"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/CppClassBody/%.5/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/CppClassBody/%.6">
-      <details key="start" value="1009"/>
-      <details key="end" value="1011"/>
-      <details key="line" value="21"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/CppClassBody/%.7">
-      <details key="start" value="1012"/>
-      <details key="end" value="1031"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/CppClassBody/%.7/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/CppClassBody/%.8">
-      <details key="start" value="1033"/>
-      <details key="end" value="1034"/>
-      <details key="line" value="23"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/CppClassBody/%.9">
-      <details key="start" value="1035"/>
-      <details key="end" value="1133"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/CppClassBody/%.9/%">
-      <details key="start" value="1053"/>
-      <details key="end" value="1131"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/CppClassBody/%.9/%/%">
-      <details key="start" value="1053"/>
-      <details key="end" value="1111"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/CppClassBody/%.9/%/%/%">
-      <details key="start" value="1053"/>
-      <details key="end" value="1105"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/CppClassBody/%.9/%/%/%/%">
-      <details key="start" value="1053"/>
-      <details key="end" value="1092"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/CppClassBody/%.9/%/%/%/%/%">
-      <details key="start" value="1053"/>
-      <details key="end" value="1086"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/CppClassBody/%.9/%/%/%/%/%/%">
-      <details key="start" value="1053"/>
-      <details key="end" value="1072"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/CppClassBody/%.9/%/%/%/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/CppClassBody/%.9/%/%/%/%/%.1">
-      <details key="start" value="1089"/>
-      <details key="end" value="1092"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/CppClassBody/%.9/%/%/%/%.1">
-      <details key="start" value="1095"/>
-      <details key="end" value="1105"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/CppClassBody/%.9/%/%/%/%.1/class">
-      <details key="start" value="1095"/>
-      <details key="end" value="1100"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/CppClassBody/%.9/%/%/%.1">
-      <details key="start" value="1108"/>
-      <details key="end" value="1111"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/CppClassBody/%.9/%/%.1">
-      <details key="start" value="1114"/>
-      <details key="end" value="1131"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/CppClassBody/%.9/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/CppClassBody/%.10">
-      <details key="start" value="1135"/>
-      <details key="end" value="1137"/>
-      <details key="line" value="24"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/CppClassBody/%.11">
-      <details key="start" value="1138"/>
-      <details key="end" value="1160"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/CppClassBody/%.11/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/CppClassBody/%.12">
-      <details key="start" value="1162"/>
-      <details key="end" value="1163"/>
-      <details key="line" value="26"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/CppClassBody/%.13">
-      <details key="start" value="1163"/>
-      <details key="end" value="1284"/>
-      <details key="line" value="26"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/CppClassBody/%.13/%">
-      <details key="start" value="1252"/>
-      <details key="end" value="1275"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/CppClassBody/%.13/%/path">
-      <details key="start" value="1252"/>
-      <details key="end" value="1256"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/CppClassBody/%.13/%.1">
-      <details key="start" value="1277"/>
-      <details key="end" value="1278"/>
-      <details key="line" value="28"/>
-    </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/CppClassBody/%.13/path">
-      <details key="start" value="1169"/>
-      <details key="end" value="1182"/>
-      <details key="line" value="26"/>
-    </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/CppClassBody/%.13/%.2">
-      <details key="start" value="1185"/>
-      <details key="end" value="1248"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/CppClassBody/%.13/%.2/%">
-      <details key="start" value="1185"/>
-      <details key="end" value="1232"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/CppClassBody/%.13/%.2/%/%">
-      <details key="start" value="1185"/>
-      <details key="end" value="1221"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/CppClassBody/%.13/%.2/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/CppClassBody/%.14">
-      <details key="start" value="1285"/>
-      <details key="end" value="1286"/>
-      <details key="line" value="29"/>
-    </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/CppClassBody/%.15">
-      <details key="start" value="1287"/>
-      <details key="end" value="1303"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.43" references="/0/CppClassBody/%.15/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.44" references="/0/CppClassBody/%.16">
-      <details key="start" value="1305"/>
-      <details key="end" value="1307"/>
-      <details key="line" value="31"/>
-    </eAnnotations>
-    <eAnnotations source="positions.45" references="/0/CppClassBody/%.17">
-      <details key="start" value="1308"/>
-      <details key="end" value="1321"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.46" references="/0/CppClassBody/%.17/class">
-      <details key="start" value="1315"/>
-      <details key="end" value="1320"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.47" references="/0/CppClassBody/%.18">
-      <details key="start" value="1323"/>
-      <details key="end" value="1324"/>
-      <details key="line" value="33"/>
-    </eAnnotations>
-    <eAnnotations source="positions.48" references="/0/CppClassBody/%.19">
-      <details key="start" value="1325"/>
-      <details key="end" value="1351"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.49" references="/0/CppClassBody/%.19/class">
-      <details key="start" value="1345"/>
-      <details key="end" value="1350"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.50" references="/0/CppClassBody/%.20">
-      <details key="start" value="1353"/>
-      <details key="end" value="1354"/>
-      <details key="line" value="34"/>
-    </eAnnotations>
-    <eAnnotations source="positions.51" references="/0/CppClassBody/%.21">
-      <details key="start" value="1354"/>
-      <details key="end" value="1424"/>
-      <details key="line" value="34"/>
-    </eAnnotations>
-    <eAnnotations source="positions.52" references="/0/CppClassBody/%.21/%">
-      <details key="start" value="1377"/>
-      <details key="end" value="1416"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.53" references="/0/CppClassBody/%.21/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.54" references="/0/CppClassBody/%.21/%/%">
-      <details key="start" value="1410"/>
-      <details key="end" value="1415"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.55" references="/0/CppClassBody/%.21/%.1">
-      <details key="start" value="1418"/>
-      <details key="end" value="1419"/>
-      <details key="line" value="36"/>
-    </eAnnotations>
-    <eAnnotations source="positions.56" references="/0/CppClassBody/%.21/%.2">
-      <details key="start" value="1358"/>
-      <details key="end" value="1374"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.57" references="/0/CppClassBody/%.21/%.2/%">
-      <details key="start" value="1362"/>
-      <details key="end" value="1374"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.58" references="/0/CppClassBody/%.21/%.2/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.59" references="/0/CppClassBody/%.22">
-      <details key="start" value="1426"/>
-      <details key="end" value="1440"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.60" references="/0/CppClassBody/%.22/class">
-      <details key="start" value="1434"/>
-      <details key="end" value="1439"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.61" references="/0/CppClassBody/%.23">
-      <details key="start" value="1442"/>
-      <details key="end" value="1527"/>
-      <details key="line" value="38"/>
-    </eAnnotations>
-    <eAnnotations source="positions.62" references="/0/CppClassBody/%.24">
-      <details key="start" value="1528"/>
-      <details key="end" value="1538"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.63" references="/0/CppClassBody/%.24/class">
-      <details key="start" value="1528"/>
-      <details key="end" value="1533"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.64" references="/0/CppClassBody/%.25">
-      <details key="start" value="1540"/>
-      <details key="end" value="1614"/>
-      <details key="line" value="40"/>
-    </eAnnotations>
-    <eAnnotations source="positions.65" references="/0/CppClassBody/class">
-      <details key="start" value="770"/>
-      <details key="end" value="788"/>
-      <details key="line" value="13"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassBody.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassBody.mtl
deleted file mode 100644
index af47e965998..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassBody.mtl
+++ /dev/null
@@ -1,42 +0,0 @@
-[module CppClassBody('http://www.eclipse.org/uml2/5.0.0/UML')/]
-[import org::eclipse::papyrus::acceleo::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::CppGenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::ClassUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::Constants/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::CppIncludeUtils/]
-[import org::eclipse::papyrus::cpp::codegen::preferences::CppCodeGenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassIncludeClassDeclaration/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassOperationsImplementation/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppAttribute/]
-
-
-[template public CppClassBody(class : Classifier)]
-#define [getFullName()/]_BODY
-
-/************************************************************
-              [class.name/] class body
- ************************************************************/
-
-[CppIncludePreBody()/]
-
-[constIncludeHFile()/]
-[IncludeDirective( getNearestPackage().getFullPath() + '/' + class.name + '.' + getHeaderSuffix() )/]
-
-[constDerivedIncludes()/]
-[for (path : String | CppClassAllIncludesDeclarationBody()->flatten()->asOrderedSet())]
-[path.IncludeDirective()/]
-[/for]
-
-[CppIncludeBody()/]
-
-[openNS(class)/]
-[CppStaticAttributes(class)/]
-[if not isTemplate()]
-[CppClassOperationsImplementation(false)/]
-[/if]
-[closeNS(class)/]
-
-/************************************************************
-              End of [class.name/] class body
- ************************************************************/
-[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
deleted file mode 100644
index 2fbf48e1a44..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
+++ /dev/null
@@ -1,2200 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppClassHeader" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::CppClassHeader" endHeaderPosition="105">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
-    </input>
-    <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="../utils/CppGenUtils.emtl#/0"/>
-    <imports href="../utils/ClassUtils.emtl#/0"/>
-    <imports href="Constants.emtl#/0"/>
-    <imports href="CppIncludeUtils.emtl#/0"/>
-    <imports href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0"/>
-    <imports href="util/clazz/CppClassTypeAndEnum.emtl#/0"/>
-    <imports href="util/clazz/CppClassFriendDeclaration.emtl#/0"/>
-    <imports href="util/clazz/CppClassInheritedDeclarations.emtl#/0"/>
-    <imports href="util/clazz/CppClassAttributesDeclaration.emtl#/0"/>
-    <imports href="util/clazz/CppClassOperationsDeclaration.emtl#/0"/>
-    <imports href="util/clazz/CppClassOperationsImplementation.emtl#/0"/>
-    <imports href="util/operation/CppOperations.emtl#/0"/>
-    <imports href="util/CppTemplates.emtl#/0"/>
-    <imports href="util/CppDocumentation.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Template" name="classUnionOrStruct" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="    'union'&#xA;"/>
-        <ifExpr xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Union">
-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Union"/>
-          </argument>
-        </ifExpr>
-        <else>
-          <body xsi:type="mtl:IfBlock">
-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="        "/>
-            <body xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="../utils/CppGenUtils.emtl#/0/resetVisibility"/>
-              <argument xsi:type="ocl.ecore:EnumLiteralExp">
-                <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-                <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/public"/>
-              </argument>
-            </body>
-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;        struct&#xA;"/>
-            <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/8">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-              </source>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/6/DataType">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType"/>
-              </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
-            </ifExpr>
-            <else>
-              <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="        "/>
-              <body xsi:type="mtl:QueryInvocation">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                <definition href="../utils/CppGenUtils.emtl#/0/resetVisibility"/>
-                <argument xsi:type="ocl.ecore:EnumLiteralExp">
-                  <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-                  <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/private"/>
-                </argument>
-              </body>
-              <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;        class&#xA;"/>
-            </else>
-          </body>
-        </else>
-      </body>
-      <parameter name="classifier">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Comment">
-      <body startPosition="1676" endPosition="1844" value=" default initializer for non-static attributes with a default value&#xA;TODO: should be disabled by default, since non-static members can be initialized directly&#xA;in C++ 011"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="defaultInitializer" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="mtl:LetBlock">
-          <body xsi:type="mtl:IfBlock">
-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="    &#x9;"/>
-            <body xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="classifier" referredVariable="/0/defaultInitializer/classifier">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-              </source>
-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-            </body>
-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="() : "/>
-            <body xsi:type="mtl:ForBlock">
-              <body xsi:type="ocl.ecore:PropertyCallExp">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/24">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-                </source>
-                <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-              </body>
-              <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="("/>
-              <body xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                <source xsi:type="ocl.ecore:PropertyCallExp">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ValueSpecification"/>
-                  <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/25">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-                  </source>
-                  <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/defaultValue"/>
-                </source>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/5.0.0/UML#//ValueSpecification/stringValue"/>
-              </body>
-              <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
-              <loopVariable name="a">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-              </loopVariable>
-              <iterSet xsi:type="ocl.ecore:VariableExp" name="attributeList" eType="/16/OrderedSet(Property)" referredVariable="/0/defaultInitializer/%/%/attributeList"/>
-              <each xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=", ">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              </each>
-            </body>
-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" {}&#xA;"/>
-            <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                <source xsi:type="ocl.ecore:VariableExp" name="attributeList" eType="/16/OrderedSet(Property)" referredVariable="/0/defaultInitializer/%/%/attributeList"/>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/isEmpty"/>
-              </source>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/not"/>
-            </ifExpr>
-          </body>
-          <letVariable name="attributeList" eType="/16/OrderedSet(Property)">
-            <initExpression xsi:type="ocl.ecore:IteratorExp" name="select" eType="/16/OrderedSet(Property)">
-              <source xsi:type="ocl.ecore:PropertyCallExp" eType="/16/OrderedSet(Property)">
-                <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/18">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                </source>
-                <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/attribute"/>
-              </source>
-              <body xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                <source xsi:type="ocl.ecore:OperationCallExp">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                  <source xsi:type="ocl.ecore:OperationCallExp">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                    <source xsi:type="ocl.ecore:PropertyCallExp">
-                      <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                      <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/defaultInitializer/%/%/attributeList/select/temp1">
-                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-                      </source>
-                      <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Feature/isStatic"/>
-                    </source>
-                    <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="false">
-                      <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                    </argument>
-                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/="/>
-                  </source>
-                  <argument xsi:type="ocl.ecore:OperationCallExp">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                    <source xsi:type="ocl.ecore:PropertyCallExp">
-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ValueSpecification"/>
-                      <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/defaultInitializer/%/%/attributeList/select/temp1">
-                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-                      </source>
-                      <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/defaultValue"/>
-                    </source>
-                    <argument xsi:type="ocl.ecore:NullLiteralExp">
-                      <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-                    </argument>
-                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/%3C%3E"/>
-                  </argument>
-                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
-                </source>
-                <argument xsi:type="ocl.ecore:OperationCallExp">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                  <source xsi:type="ocl.ecore:OperationCallExp">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                    <source xsi:type="ocl.ecore:PropertyCallExp">
-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ValueSpecification"/>
-                      <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/defaultInitializer/%/%/attributeList/select/temp1">
-                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-                      </source>
-                      <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/defaultValue"/>
-                    </source>
-                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/5.0.0/UML#//ValueSpecification/stringValue"/>
-                  </source>
-                  <argument xsi:type="ocl.ecore:NullLiteralExp">
-                    <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-                  </argument>
-                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/%3C%3E"/>
-                </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
-              </body>
-              <iterator xsi:type="ocl.ecore:Variable" name="temp1">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-              </iterator>
-            </initExpression>
-          </letVariable>
-        </body>
-        <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:IteratorExp" name="any">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            <source xsi:type="mtl:QueryInvocation" eType="/16/Sequence(Operation)">
-              <definition href="util/operation/CppOperations.emtl#/0/getOwnedOperations"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/17">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-              </argument>
-            </source>
-            <body xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/defaultInitializer/%/%.1/any/temp2">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-              </argument>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Create">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard#//Create"/>
-              </argument>
-            </body>
-            <iterator xsi:type="ocl.ecore:Variable" name="temp2">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </iterator>
-          </source>
-          <argument xsi:type="ocl.ecore:NullLiteralExp">
-            <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/>
-        </ifExpr>
-      </body>
-      <parameter name="classifier">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <post xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/trim">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/14">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </source>
-      </post>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppClassHeader" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="#ifndef "/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="_H&#xA;#define "/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/33">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="_H&#xA;&#xA;/************************************************************&#xA;              "/>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/CppClassHeader/class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" class header&#xA; ************************************************************/&#xA;&#xA;"/>
-      <body xsi:type="mtl:ForBlock">
-        <body xsi:type="mtl:TemplateInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="CppIncludeUtils.emtl#/0/IncludeDirective"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="path" referredVariable="/0/CppClassHeader/%.7/path">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          </argument>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-        <loopVariable name="path">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </loopVariable>
-        <iterSet xsi:type="ocl.ecore:OperationCallExp" eType="/16/OrderedSet(String)">
-          <source xsi:type="ocl.ecore:OperationCallExp" eType="/16/Sequence(String)">
-            <source xsi:type="ocl.ecore:OperationCallExp" eType="/16/Sequence(String)" referredOperation="/1/Collection(T)_Class/addAll">
-              <source xsi:type="ocl.ecore:CollectionLiteralExp" eType="/16/Sequence(String)" kind="Sequence">
-                <part xsi:type="ocl.ecore:CollectionItem">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                  <item xsi:type="mtl:QueryInvocation">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                    <definition href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0/cppOwnerPackageIncludePath"/>
-                    <argument xsi:type="ocl.ecore:PropertyCallExp">
-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-                      <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/35">
-                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                      </source>
-                      <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type/package"/>
-                    </argument>
-                  </item>
-                </part>
-              </source>
-              <argument xsi:type="mtl:QueryInvocation" eType="/16/Sequence(String)">
-                <definition href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0/CppClassAllIncludes"/>
-                <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/35">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                </argument>
-              </argument>
-            </source>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)_Class/flatten"/>
-          </source>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)_Class/asOrderedSet"/>
-        </iterSet>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="CppIncludeUtils.emtl#/0/CppIncludeHeader"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/40">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;"/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../utils/CppGenUtils.emtl#/0/openNS"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/41">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" &#xA;&#xA;/************************************************************/&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="util/CppDocumentation.emtl#/0/CppElementDoc"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/42">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="util/CppTemplates.emtl#/0/templateSignature"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/43">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:TemplateInvocation" definition="/0/classUnionOrStruct">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/44">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/CppClassHeader/class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="util/clazz/CppClassInheritedDeclarations.emtl#/0/CppClassInheritedDeclarations"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/46">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" {&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="util/clazz/CppClassFriendDeclaration.emtl#/0/CppClassIncludeFriendDeclaration"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/47">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="util/clazz/CppClassTypeAndEnum.emtl#/0/CppClassTypeAndEnum"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/48">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;    "/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../utils/CppGenUtils.emtl#/0/getSection"/>
-        <argument xsi:type="ocl.ecore:EnumLiteralExp">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-          <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/public"/>
-        </argument>
-        <argument xsi:type="mtl:TemplateInvocation" definition="/0/defaultInitializer">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/49">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;    "/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../utils/CppGenUtils.emtl#/0/getSection"/>
-        <argument xsi:type="ocl.ecore:EnumLiteralExp">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-          <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/public"/>
-        </argument>
-        <argument xsi:type="mtl:TemplateInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="util/clazz/CppClassAttributesDeclaration.emtl#/0/CppClassAttributesDeclaration"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/50">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:EnumLiteralExp">
-            <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-            <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/public"/>
-          </argument>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;    "/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../utils/CppGenUtils.emtl#/0/getSection"/>
-        <argument xsi:type="ocl.ecore:EnumLiteralExp">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-          <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/public"/>
-        </argument>
-        <argument xsi:type="mtl:TemplateInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="util/clazz/CppClassOperationsDeclaration.emtl#/0/CppClassOperationsDeclaration"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/51">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:EnumLiteralExp">
-            <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-            <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/public"/>
-          </argument>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;    "/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../utils/CppGenUtils.emtl#/0/getSection"/>
-        <argument xsi:type="ocl.ecore:EnumLiteralExp">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-          <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/protected"/>
-        </argument>
-        <argument xsi:type="mtl:TemplateInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="util/clazz/CppClassAttributesDeclaration.emtl#/0/CppClassAttributesDeclaration"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/52">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:EnumLiteralExp">
-            <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-            <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/protected"/>
-          </argument>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;    "/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../utils/CppGenUtils.emtl#/0/getSection"/>
-        <argument xsi:type="ocl.ecore:EnumLiteralExp">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-          <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/protected"/>
-        </argument>
-        <argument xsi:type="mtl:TemplateInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="util/clazz/CppClassOperationsDeclaration.emtl#/0/CppClassOperationsDeclaration"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/53">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:EnumLiteralExp">
-            <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-            <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/protected"/>
-          </argument>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;    "/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../utils/CppGenUtils.emtl#/0/getSection"/>
-        <argument xsi:type="ocl.ecore:EnumLiteralExp">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-          <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/private"/>
-        </argument>
-        <argument xsi:type="mtl:TemplateInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="util/clazz/CppClassAttributesDeclaration.emtl#/0/CppClassAttributesDeclaration"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/54">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:EnumLiteralExp">
-            <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-            <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/private"/>
-          </argument>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;    "/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../utils/CppGenUtils.emtl#/0/getSection"/>
-        <argument xsi:type="ocl.ecore:EnumLiteralExp">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-          <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/private"/>
-        </argument>
-        <argument xsi:type="mtl:TemplateInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="util/clazz/CppClassOperationsDeclaration.emtl#/0/CppClassOperationsDeclaration"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/55">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:EnumLiteralExp">
-            <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-            <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/private"/>
-          </argument>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;};&#xA;/************************************************************/&#xA;/* External declarations (package visibility)               */&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="util/clazz/CppClassAttributesDeclaration.emtl#/0/CppClassAttributesDeclaration"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/56">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:EnumLiteralExp">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-          <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/package"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="util/clazz/CppClassOperationsDeclaration.emtl#/0/CppClassOperationsDeclaration"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/57">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:EnumLiteralExp">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-          <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/package"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;/************************************************************/&#xA;&#xA;"/>
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="/************************************************************/&#xA;/* Template functions                                       */&#xA;"/>
-        <body xsi:type="mtl:TemplateInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="util/clazz/CppClassOperationsImplementation.emtl#/0/CppClassOperationsImplementation"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/59">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="false">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          </argument>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-        <ifExpr xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <definition href="util/CppTemplates.emtl#/0/isTemplate"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/58">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-        </ifExpr>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;/* Inline functions                                         */&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="util/clazz/CppClassOperationsImplementation.emtl#/0/CppClassOperationsImplementation"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/60">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="true">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../utils/CppGenUtils.emtl#/0/closeNS"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/61">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;/************************************************************&#xA;              End of "/>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/CppClassHeader/class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" class header&#xA; ************************************************************/&#xA;&#xA;#endif"/>
-      <parameter name="class">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-      <eOperations name="trim">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="classUnionOrStruct">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/classUnionOrStruct"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="classifier">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="defaultInitializer">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/defaultInitializer"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="classifier">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassHeader">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppClassHeader"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getFullNameUC">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="hasStereotype">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="definition">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="openNS">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../utils/CppGenUtils.emtl#/0/openNS"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="closeNS">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../utils/CppGenUtils.emtl#/0/closeNS"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="resetVisibility">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../utils/CppGenUtils.emtl#/0/resetVisibility"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getSection">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../utils/CppGenUtils.emtl#/0/getSection"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-        </eParameters>
-        <eParameters name="arg1">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppIncludeHeader">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="CppIncludeUtils.emtl#/0/CppIncludeHeader"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="ne">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="IncludeDirective">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="CppIncludeUtils.emtl#/0/IncludeDirective"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="path">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="cppOwnerPackageIncludePath">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0/cppOwnerPackageIncludePath"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="pkg">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassAllIncludes">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0/CppClassAllIncludes"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:SequenceType" href="util/clazz/CppClassIncludeClassDeclaration.emtl#/3/Sequence(String)"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassTypeAndEnum">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/clazz/CppClassTypeAndEnum.emtl#/0/CppClassTypeAndEnum"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassIncludeFriendDeclaration">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/clazz/CppClassFriendDeclaration.emtl#/0/CppClassIncludeFriendDeclaration"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassInheritedDeclarations">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/clazz/CppClassInheritedDeclarations.emtl#/0/CppClassInheritedDeclarations"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassAttributesDeclaration">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/clazz/CppClassAttributesDeclaration.emtl#/0/CppClassAttributesDeclaration"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-        <eParameters name="visibilityFilter">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassOperationsDeclaration">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/clazz/CppClassOperationsDeclaration.emtl#/0/CppClassOperationsDeclaration"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-        <eParameters name="visibilityFilter">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassOperationsImplementation">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/clazz/CppClassOperationsImplementation.emtl#/0/CppClassOperationsImplementation"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-        <eParameters name="inline">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getOwnedOperations">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/operation/CppOperations.emtl#/0/getOwnedOperations"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:SequenceType" href="util/operation/CppOperations.emtl#/3/Sequence(Operation)"/>
-        <eParameters name="cl">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="isTemplate">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/CppTemplates.emtl#/0/isTemplate"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="templateSignature">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/CppTemplates.emtl#/0/templateSignature"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppElementDoc">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/CppDocumentation.emtl#/0/CppElementDoc"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="argument">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-      <eOperations name="addAll">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:CollectionType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-        <eParameters name="otherCollection">
-          <eType xsi:type="ocl.ecore:CollectionType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="VisibilityKind_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Namespace_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Relationship_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Relationship"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameterSubstitution_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Parameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="types">
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Union">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Union"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="DataType">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Create">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard#//Create"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Operation)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(Property)" instanceClassName="java.util.LinkedHashSet">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(Property)" instanceClassName="java.util.Set">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(String)" instanceClassName="java.util.List">
-      <elementType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:CollectionType" name="Collection(String)">
-      <elementType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(String)" instanceClassName="java.util.LinkedHashSet">
-      <elementType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/classUnionOrStruct">
-      <details key="start" value="1354"/>
-      <details key="end" value="1666"/>
-      <details key="line" value="18"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/classUnionOrStruct/%">
-      <details key="start" value="1416"/>
-      <details key="end" value="1654"/>
-      <details key="line" value="19"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/classUnionOrStruct/%/%">
-      <details key="start" value="1451"/>
-      <details key="end" value="1463"/>
-      <details key="line" value="20"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/classUnionOrStruct/%/%.1">
-      <details key="start" value="1420"/>
-      <details key="end" value="1449"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/classUnionOrStruct/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/classUnionOrStruct/%/%.1/%">
-      <details key="start" value="1435"/>
-      <details key="end" value="1447"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/classUnionOrStruct/%/%.2">
-      <details key="start" value="1463"/>
-      <details key="end" value="1649"/>
-      <details key="line" value="21"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/classUnionOrStruct/%/%.2/%">
-      <details key="start" value="1471"/>
-      <details key="end" value="1648"/>
-      <details key="line" value="22"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/classUnionOrStruct/%/%.2/%/%">
-      <details key="start" value="1500"/>
-      <details key="end" value="1508"/>
-      <details key="line" value="23"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/classUnionOrStruct/%/%.2/%/%.1">
-      <details key="start" value="1509"/>
-      <details key="end" value="1549"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/classUnionOrStruct/%/%.2/%/%.1/%">
-      <details key="start" value="1509"/>
-      <details key="end" value="1531"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/classUnionOrStruct/%/%.2/%/%.2">
-      <details key="start" value="1551"/>
-      <details key="end" value="1567"/>
-      <details key="line" value="24"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/classUnionOrStruct/%/%.2/%/%.3">
-      <details key="start" value="1475"/>
-      <details key="end" value="1498"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/classUnionOrStruct/%/%.2/%/%.3/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/classUnionOrStruct/%/%.2/%/%.3/%">
-      <details key="start" value="1488"/>
-      <details key="end" value="1496"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/classUnionOrStruct/%/%.2/%/%.4">
-      <details key="start" value="1568"/>
-      <details key="end" value="1643"/>
-      <details key="line" value="25"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/classUnionOrStruct/%/%.2/%/%.4/%">
-      <details key="start" value="1575"/>
-      <details key="end" value="1583"/>
-      <details key="line" value="26"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/classUnionOrStruct/%/%.2/%/%.4/%.1">
-      <details key="start" value="1584"/>
-      <details key="end" value="1625"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/classUnionOrStruct/%/%.2/%/%.4/%.1/%">
-      <details key="start" value="1584"/>
-      <details key="end" value="1607"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/classUnionOrStruct/%/%.2/%/%.4/%.2">
-      <details key="start" value="1627"/>
-      <details key="end" value="1642"/>
-      <details key="line" value="27"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/classUnionOrStruct/classifier">
-      <details key="start" value="1390"/>
-      <details key="end" value="1413"/>
-      <details key="line" value="18"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/%">
-      <details key="start" value="1668"/>
-      <details key="end" value="1846"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/defaultInitializer">
-      <details key="start" value="1847"/>
-      <details key="end" value="3397"/>
-      <details key="line" value="35"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/defaultInitializer/%">
-      <details key="start" value="2948"/>
-      <details key="end" value="3385"/>
-      <details key="line" value="54"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/defaultInitializer/%/%">
-      <details key="start" value="3023"/>
-      <details key="end" value="3379"/>
-      <details key="line" value="55"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/defaultInitializer/%/%/%">
-      <details key="start" value="3195"/>
-      <details key="end" value="3373"/>
-      <details key="line" value="59"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/defaultInitializer/%/%/%/%">
-      <details key="start" value="3229"/>
-      <details key="end" value="3234"/>
-      <details key="line" value="60"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/defaultInitializer/%/%/%/%.1">
-      <details key="start" value="3235"/>
-      <details key="end" value="3250"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/defaultInitializer/%/%/%/%.1/classifier">
-      <details key="start" value="3235"/>
-      <details key="end" value="3245"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/defaultInitializer/%/%/%/%.2">
-      <details key="start" value="3252"/>
-      <details key="end" value="3257"/>
-      <details key="line" value="60"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/defaultInitializer/%/%/%/%.3">
-      <details key="start" value="3257"/>
-      <details key="end" value="3360"/>
-      <details key="line" value="60"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/defaultInitializer/%/%/%/%.3/%">
-      <details key="start" value="3317"/>
-      <details key="end" value="3321"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/defaultInitializer/%/%/%/%.3/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/defaultInitializer/%/%/%/%.3/%.1">
-      <details key="start" value="3323"/>
-      <details key="end" value="3324"/>
-      <details key="line" value="61"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/defaultInitializer/%/%/%/%.3/%.2">
-      <details key="start" value="3325"/>
-      <details key="end" value="3351"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/defaultInitializer/%/%/%/%.3/%.2/%">
-      <details key="start" value="3325"/>
-      <details key="end" value="3337"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/defaultInitializer/%/%/%/%.3/%.2/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/defaultInitializer/%/%/%/%.3/%.3">
-      <details key="start" value="3353"/>
-      <details key="end" value="3354"/>
-      <details key="line" value="61"/>
-    </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/defaultInitializer/%/%/%/%.3/a">
-      <details key="start" value="3263"/>
-      <details key="end" value="3275"/>
-      <details key="line" value="60"/>
-    </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/defaultInitializer/%/%/%/%.3/attributeList">
-      <details key="start" value="3278"/>
-      <details key="end" value="3291"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/defaultInitializer/%/%/%/%.3/%.4">
-      <details key="start" value="3303"/>
-      <details key="end" value="3307"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/defaultInitializer/%/%/%/%.4">
-      <details key="start" value="3360"/>
-      <details key="end" value="3364"/>
-      <details key="line" value="61"/>
-    </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/defaultInitializer/%/%/%/%.5">
-      <details key="start" value="3199"/>
-      <details key="end" value="3227"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.43" references="/0/defaultInitializer/%/%/%/%.5/%">
-      <details key="start" value="3203"/>
-      <details key="end" value="3227"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.44" references="/0/defaultInitializer/%/%/%/%.5/%/attributeList">
-      <details key="start" value="3203"/>
-      <details key="end" value="3216"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.45" references="/0/defaultInitializer/%/%/attributeList">
-      <details key="start" value="3028"/>
-      <details key="end" value="3189"/>
-      <details key="line" value="55"/>
-    </eAnnotations>
-    <eAnnotations source="positions.46" references="/0/defaultInitializer/%/%/attributeList/select">
-      <details key="start" value="3068"/>
-      <details key="end" value="3190"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.47" references="/0/defaultInitializer/%/%/attributeList/select/%">
-      <details key="start" value="3068"/>
-      <details key="end" value="3077"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.48" references="/0/defaultInitializer/%/%/attributeList/select/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.49" references="/0/defaultInitializer/%/%/attributeList/select/%.1">
-      <details key="start" value="3093"/>
-      <details key="end" value="3189"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.50" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%">
-      <details key="start" value="3093"/>
-      <details key="end" value="3143"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.51" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%">
-      <details key="start" value="3093"/>
-      <details key="end" value="3111"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.52" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%/%">
-      <details key="start" value="3094"/>
-      <details key="end" value="3102"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.53" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%/%/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.54" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%/%.1">
-      <details key="start" value="3105"/>
-      <details key="end" value="3110"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.55" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%.1">
-      <details key="start" value="3121"/>
-      <details key="end" value="3143"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.56" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%.1/%">
-      <details key="start" value="3122"/>
-      <details key="end" value="3134"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.57" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%.1/%/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.58" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%.1/%.1">
-      <details key="start" value="3138"/>
-      <details key="end" value="3142"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.59" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%.1">
-      <details key="start" value="3153"/>
-      <details key="end" value="3189"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.60" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%.1/%">
-      <details key="start" value="3154"/>
-      <details key="end" value="3180"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.61" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%.1/%/%">
-      <details key="start" value="3154"/>
-      <details key="end" value="3166"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.62" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%.1/%/%/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.63" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%.1/%.1">
-      <details key="start" value="3184"/>
-      <details key="end" value="3188"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.64" references="/0/defaultInitializer/%/%/attributeList/select/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.65" references="/0/defaultInitializer/%/%.1">
-      <details key="start" value="2952"/>
-      <details key="end" value="3017"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.66" references="/0/defaultInitializer/%/%.1/any">
-      <details key="start" value="2952"/>
-      <details key="end" value="3010"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.67" references="/0/defaultInitializer/%/%.1/any/%">
-      <details key="start" value="2952"/>
-      <details key="end" value="2972"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.68" references="/0/defaultInitializer/%/%.1/any/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.69" references="/0/defaultInitializer/%/%.1/any/%.1">
-      <details key="start" value="2978"/>
-      <details key="end" value="3009"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.70" references="/0/defaultInitializer/%/%.1/any/%.1/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.71" references="/0/defaultInitializer/%/%.1/any/%.1/%">
-      <details key="start" value="2992"/>
-      <details key="end" value="3008"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.72" references="/0/defaultInitializer/%/%.1/any/temp2">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.73" references="/0/defaultInitializer/%/%.1/%">
-      <details key="start" value="3013"/>
-      <details key="end" value="3017"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.74" references="/0/defaultInitializer/classifier">
-      <details key="start" value="1883"/>
-      <details key="end" value="1906"/>
-      <details key="line" value="35"/>
-    </eAnnotations>
-    <eAnnotations source="positions.75" references="/0/defaultInitializer/%.1">
-      <details key="start" value="1913"/>
-      <details key="end" value="1919"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.76" references="/0/defaultInitializer/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.77" references="/0/CppClassHeader">
-      <details key="start" value="3400"/>
-      <details key="end" value="5608"/>
-      <details key="line" value="67"/>
-    </eAnnotations>
-    <eAnnotations source="positions.78" references="/0/CppClassHeader/%">
-      <details key="start" value="3453"/>
-      <details key="end" value="3461"/>
-      <details key="line" value="68"/>
-    </eAnnotations>
-    <eAnnotations source="positions.79" references="/0/CppClassHeader/%.1">
-      <details key="start" value="3462"/>
-      <details key="end" value="3477"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.80" references="/0/CppClassHeader/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.81" references="/0/CppClassHeader/%.2">
-      <details key="start" value="3479"/>
-      <details key="end" value="3490"/>
-      <details key="line" value="68"/>
-    </eAnnotations>
-    <eAnnotations source="positions.82" references="/0/CppClassHeader/%.3">
-      <details key="start" value="3491"/>
-      <details key="end" value="3506"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.83" references="/0/CppClassHeader/%.3/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.84" references="/0/CppClassHeader/%.4">
-      <details key="start" value="3508"/>
-      <details key="end" value="3588"/>
-      <details key="line" value="69"/>
-    </eAnnotations>
-    <eAnnotations source="positions.85" references="/0/CppClassHeader/%.5">
-      <details key="start" value="3589"/>
-      <details key="end" value="3599"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.86" references="/0/CppClassHeader/%.5/class">
-      <details key="start" value="3589"/>
-      <details key="end" value="3594"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.87" references="/0/CppClassHeader/%.6">
-      <details key="start" value="3601"/>
-      <details key="end" value="3679"/>
-      <details key="line" value="72"/>
-    </eAnnotations>
-    <eAnnotations source="positions.88" references="/0/CppClassHeader/%.7">
-      <details key="start" value="3679"/>
-      <details key="end" value="3856"/>
-      <details key="line" value="75"/>
-    </eAnnotations>
-    <eAnnotations source="positions.89" references="/0/CppClassHeader/%.7/%">
-      <details key="start" value="3824"/>
-      <details key="end" value="3847"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.90" references="/0/CppClassHeader/%.7/%/path">
-      <details key="start" value="3824"/>
-      <details key="end" value="3828"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.91" references="/0/CppClassHeader/%.7/%.1">
-      <details key="start" value="3849"/>
-      <details key="end" value="3850"/>
-      <details key="line" value="81"/>
-    </eAnnotations>
-    <eAnnotations source="positions.92" references="/0/CppClassHeader/%.7/path">
-      <details key="start" value="3685"/>
-      <details key="end" value="3698"/>
-      <details key="line" value="75"/>
-    </eAnnotations>
-    <eAnnotations source="positions.93" references="/0/CppClassHeader/%.7/%.2">
-      <details key="start" value="3702"/>
-      <details key="end" value="3820"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.94" references="/0/CppClassHeader/%.7/%.2/%">
-      <details key="start" value="3702"/>
-      <details key="end" value="3801"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.95" references="/0/CppClassHeader/%.7/%.2/%/%">
-      <details key="start" value="3702"/>
-      <details key="end" value="3787"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.96" references="/0/CppClassHeader/%.7/%.2/%/%/%">
-      <details key="start" value="3702"/>
-      <details key="end" value="3751"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.97" references="/0/CppClassHeader/%.7/%.2/%/%/%/%/%">
-      <details key="start" value="3712"/>
-      <details key="end" value="3749"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.98" references="/0/CppClassHeader/%.7/%.2/%/%/%/%/%/%">
-      <details key="start" value="3712"/>
-      <details key="end" value="3720"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.99" references="/0/CppClassHeader/%.7/%.2/%/%/%/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.100" references="/0/CppClassHeader/%.7/%.2/%/%/%.1">
-      <details key="start" value="3764"/>
-      <details key="end" value="3785"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.101" references="/0/CppClassHeader/%.7/%.2/%/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.102" references="/0/CppClassHeader/%.8">
-      <details key="start" value="3857"/>
-      <details key="end" value="3858"/>
-      <details key="line" value="82"/>
-    </eAnnotations>
-    <eAnnotations source="positions.103" references="/0/CppClassHeader/%.9">
-      <details key="start" value="3859"/>
-      <details key="end" value="3877"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.104" references="/0/CppClassHeader/%.9/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.105" references="/0/CppClassHeader/%.10">
-      <details key="start" value="3879"/>
-      <details key="end" value="3881"/>
-      <details key="line" value="84"/>
-    </eAnnotations>
-    <eAnnotations source="positions.106" references="/0/CppClassHeader/%.11">
-      <details key="start" value="3882"/>
-      <details key="end" value="3890"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.107" references="/0/CppClassHeader/%.11/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.108" references="/0/CppClassHeader/%.12">
-      <details key="start" value="3892"/>
-      <details key="end" value="3958"/>
-      <details key="line" value="85"/>
-    </eAnnotations>
-    <eAnnotations source="positions.109" references="/0/CppClassHeader/%.13">
-      <details key="start" value="3959"/>
-      <details key="end" value="3974"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.110" references="/0/CppClassHeader/%.13/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.111" references="/0/CppClassHeader/%.14">
-      <details key="start" value="3976"/>
-      <details key="end" value="3977"/>
-      <details key="line" value="89"/>
-    </eAnnotations>
-    <eAnnotations source="positions.112" references="/0/CppClassHeader/%.15">
-      <details key="start" value="3978"/>
-      <details key="end" value="3997"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.113" references="/0/CppClassHeader/%.15/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.114" references="/0/CppClassHeader/%.16">
-      <details key="start" value="4000"/>
-      <details key="end" value="4020"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.115" references="/0/CppClassHeader/%.16/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.116" references="/0/CppClassHeader/%.17">
-      <details key="start" value="4022"/>
-      <details key="end" value="4023"/>
-      <details key="line" value="89"/>
-    </eAnnotations>
-    <eAnnotations source="positions.117" references="/0/CppClassHeader/%.18">
-      <details key="start" value="4024"/>
-      <details key="end" value="4034"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.118" references="/0/CppClassHeader/%.18/class">
-      <details key="start" value="4024"/>
-      <details key="end" value="4029"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.119" references="/0/CppClassHeader/%.19">
-      <details key="start" value="4037"/>
-      <details key="end" value="4068"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.120" references="/0/CppClassHeader/%.19/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.121" references="/0/CppClassHeader/%.20">
-      <details key="start" value="4070"/>
-      <details key="end" value="4073"/>
-      <details key="line" value="89"/>
-    </eAnnotations>
-    <eAnnotations source="positions.122" references="/0/CppClassHeader/%.21">
-      <details key="start" value="4074"/>
-      <details key="end" value="4108"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.123" references="/0/CppClassHeader/%.21/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.124" references="/0/CppClassHeader/%.22">
-      <details key="start" value="4111"/>
-      <details key="end" value="4132"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.125" references="/0/CppClassHeader/%.22/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.126" references="/0/CppClassHeader/%.23">
-      <details key="start" value="4134"/>
-      <details key="end" value="4139"/>
-      <details key="line" value="91"/>
-    </eAnnotations>
-    <eAnnotations source="positions.127" references="/0/CppClassHeader/%.24">
-      <details key="start" value="4140"/>
-      <details key="end" value="4195"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.128" references="/0/CppClassHeader/%.24/%">
-      <details key="start" value="4140"/>
-      <details key="end" value="4162"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.129" references="/0/CppClassHeader/%.24/%.1">
-      <details key="start" value="4174"/>
-      <details key="end" value="4194"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.130" references="/0/CppClassHeader/%.24/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.131" references="/0/CppClassHeader/%.25">
-      <details key="start" value="4197"/>
-      <details key="end" value="4202"/>
-      <details key="line" value="92"/>
-    </eAnnotations>
-    <eAnnotations source="positions.132" references="/0/CppClassHeader/%.26">
-      <details key="start" value="4203"/>
-      <details key="end" value="4291"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.133" references="/0/CppClassHeader/%.26/%">
-      <details key="start" value="4203"/>
-      <details key="end" value="4225"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.134" references="/0/CppClassHeader/%.26/%.1">
-      <details key="start" value="4237"/>
-      <details key="end" value="4290"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.135" references="/0/CppClassHeader/%.26/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.136" references="/0/CppClassHeader/%.26/%.1/%">
-      <details key="start" value="4267"/>
-      <details key="end" value="4289"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.137" references="/0/CppClassHeader/%.27">
-      <details key="start" value="4293"/>
-      <details key="end" value="4298"/>
-      <details key="line" value="93"/>
-    </eAnnotations>
-    <eAnnotations source="positions.138" references="/0/CppClassHeader/%.28">
-      <details key="start" value="4299"/>
-      <details key="end" value="4387"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.139" references="/0/CppClassHeader/%.28/%">
-      <details key="start" value="4299"/>
-      <details key="end" value="4321"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.140" references="/0/CppClassHeader/%.28/%.1">
-      <details key="start" value="4333"/>
-      <details key="end" value="4386"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.141" references="/0/CppClassHeader/%.28/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.142" references="/0/CppClassHeader/%.28/%.1/%">
-      <details key="start" value="4363"/>
-      <details key="end" value="4385"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.143" references="/0/CppClassHeader/%.29">
-      <details key="start" value="4389"/>
-      <details key="end" value="4395"/>
-      <details key="line" value="94"/>
-    </eAnnotations>
-    <eAnnotations source="positions.144" references="/0/CppClassHeader/%.30">
-      <details key="start" value="4396"/>
-      <details key="end" value="4490"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.145" references="/0/CppClassHeader/%.30/%">
-      <details key="start" value="4396"/>
-      <details key="end" value="4421"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.146" references="/0/CppClassHeader/%.30/%.1">
-      <details key="start" value="4433"/>
-      <details key="end" value="4489"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.147" references="/0/CppClassHeader/%.30/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.148" references="/0/CppClassHeader/%.30/%.1/%">
-      <details key="start" value="4463"/>
-      <details key="end" value="4488"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.149" references="/0/CppClassHeader/%.31">
-      <details key="start" value="4492"/>
-      <details key="end" value="4497"/>
-      <details key="line" value="96"/>
-    </eAnnotations>
-    <eAnnotations source="positions.150" references="/0/CppClassHeader/%.32">
-      <details key="start" value="4498"/>
-      <details key="end" value="4592"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.151" references="/0/CppClassHeader/%.32/%">
-      <details key="start" value="4498"/>
-      <details key="end" value="4523"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.152" references="/0/CppClassHeader/%.32/%.1">
-      <details key="start" value="4535"/>
-      <details key="end" value="4591"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.153" references="/0/CppClassHeader/%.32/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.154" references="/0/CppClassHeader/%.32/%.1/%">
-      <details key="start" value="4565"/>
-      <details key="end" value="4590"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.155" references="/0/CppClassHeader/%.33">
-      <details key="start" value="4594"/>
-      <details key="end" value="4600"/>
-      <details key="line" value="97"/>
-    </eAnnotations>
-    <eAnnotations source="positions.156" references="/0/CppClassHeader/%.34">
-      <details key="start" value="4601"/>
-      <details key="end" value="4691"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.157" references="/0/CppClassHeader/%.34/%">
-      <details key="start" value="4601"/>
-      <details key="end" value="4624"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.158" references="/0/CppClassHeader/%.34/%.1">
-      <details key="start" value="4636"/>
-      <details key="end" value="4690"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.159" references="/0/CppClassHeader/%.34/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.160" references="/0/CppClassHeader/%.34/%.1/%">
-      <details key="start" value="4666"/>
-      <details key="end" value="4689"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.161" references="/0/CppClassHeader/%.35">
-      <details key="start" value="4693"/>
-      <details key="end" value="4698"/>
-      <details key="line" value="99"/>
-    </eAnnotations>
-    <eAnnotations source="positions.162" references="/0/CppClassHeader/%.36">
-      <details key="start" value="4699"/>
-      <details key="end" value="4789"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.163" references="/0/CppClassHeader/%.36/%">
-      <details key="start" value="4699"/>
-      <details key="end" value="4722"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.164" references="/0/CppClassHeader/%.36/%.1">
-      <details key="start" value="4734"/>
-      <details key="end" value="4788"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.165" references="/0/CppClassHeader/%.36/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.166" references="/0/CppClassHeader/%.36/%.1/%">
-      <details key="start" value="4764"/>
-      <details key="end" value="4787"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.167" references="/0/CppClassHeader/%.37">
-      <details key="start" value="4791"/>
-      <details key="end" value="4921"/>
-      <details key="line" value="100"/>
-    </eAnnotations>
-    <eAnnotations source="positions.168" references="/0/CppClassHeader/%.38">
-      <details key="start" value="4922"/>
-      <details key="end" value="4977"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.169" references="/0/CppClassHeader/%.38/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.170" references="/0/CppClassHeader/%.38/%">
-      <details key="start" value="4952"/>
-      <details key="end" value="4976"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.171" references="/0/CppClassHeader/%.39">
-      <details key="start" value="4979"/>
-      <details key="end" value="4980"/>
-      <details key="line" value="104"/>
-    </eAnnotations>
-    <eAnnotations source="positions.172" references="/0/CppClassHeader/%.40">
-      <details key="start" value="4981"/>
-      <details key="end" value="5036"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.173" references="/0/CppClassHeader/%.40/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.174" references="/0/CppClassHeader/%.40/%">
-      <details key="start" value="5011"/>
-      <details key="end" value="5035"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.175" references="/0/CppClassHeader/%.41">
-      <details key="start" value="5038"/>
-      <details key="end" value="5103"/>
-      <details key="line" value="105"/>
-    </eAnnotations>
-    <eAnnotations source="positions.176" references="/0/CppClassHeader/%.42">
-      <details key="start" value="5103"/>
-      <details key="end" value="5295"/>
-      <details key="line" value="107"/>
-    </eAnnotations>
-    <eAnnotations source="positions.177" references="/0/CppClassHeader/%.42/%">
-      <details key="start" value="5121"/>
-      <details key="end" value="5247"/>
-      <details key="line" value="108"/>
-    </eAnnotations>
-    <eAnnotations source="positions.178" references="/0/CppClassHeader/%.42/%.1">
-      <details key="start" value="5248"/>
-      <details key="end" value="5287"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.179" references="/0/CppClassHeader/%.42/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.180" references="/0/CppClassHeader/%.42/%.1/%">
-      <details key="start" value="5281"/>
-      <details key="end" value="5286"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.181" references="/0/CppClassHeader/%.42/%.2">
-      <details key="start" value="5289"/>
-      <details key="end" value="5290"/>
-      <details key="line" value="111"/>
-    </eAnnotations>
-    <eAnnotations source="positions.182" references="/0/CppClassHeader/%.42/%.3">
-      <details key="start" value="5107"/>
-      <details key="end" value="5119"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.183" references="/0/CppClassHeader/%.42/%.3/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.184" references="/0/CppClassHeader/%.43">
-      <details key="start" value="5296"/>
-      <details key="end" value="5360"/>
-      <details key="line" value="112"/>
-    </eAnnotations>
-    <eAnnotations source="positions.185" references="/0/CppClassHeader/%.44">
-      <details key="start" value="5361"/>
-      <details key="end" value="5399"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.186" references="/0/CppClassHeader/%.44/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.187" references="/0/CppClassHeader/%.44/%">
-      <details key="start" value="5394"/>
-      <details key="end" value="5398"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.188" references="/0/CppClassHeader/%.45">
-      <details key="start" value="5401"/>
-      <details key="end" value="5402"/>
-      <details key="line" value="115"/>
-    </eAnnotations>
-    <eAnnotations source="positions.189" references="/0/CppClassHeader/%.46">
-      <details key="start" value="5403"/>
-      <details key="end" value="5412"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.190" references="/0/CppClassHeader/%.46/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.191" references="/0/CppClassHeader/%.47">
-      <details key="start" value="5414"/>
-      <details key="end" value="5499"/>
-      <details key="line" value="116"/>
-    </eAnnotations>
-    <eAnnotations source="positions.192" references="/0/CppClassHeader/%.48">
-      <details key="start" value="5500"/>
-      <details key="end" value="5510"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.193" references="/0/CppClassHeader/%.48/class">
-      <details key="start" value="5500"/>
-      <details key="end" value="5505"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.194" references="/0/CppClassHeader/%.49">
-      <details key="start" value="5512"/>
-      <details key="end" value="5596"/>
-      <details key="line" value="118"/>
-    </eAnnotations>
-    <eAnnotations source="positions.195" references="/0/CppClassHeader/class">
-      <details key="start" value="3432"/>
-      <details key="end" value="3450"/>
-      <details key="line" value="67"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.mtl
deleted file mode 100644
index 767eb5f68ad..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.mtl
+++ /dev/null
@@ -1,122 +0,0 @@
-[module CppClassHeader('http://www.eclipse.org/uml2/5.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/]
-[import org::eclipse::papyrus::acceleo::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::CppGenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::ClassUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::Constants/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::CppIncludeUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassIncludeClassDeclaration/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassTypeAndEnum/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassFriendDeclaration/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassInheritedDeclarations/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassAttributesDeclaration/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassOperationsDeclaration/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassOperationsImplementation/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::operation::CppOperations/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppTemplates/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppDocumentation/]
-
-[template public classUnionOrStruct(classifier : Classifier)]
-[if (hasStereotype(C_Cpp::Union))]
-    'union'
-[else]
-	[if (oclIsKindOf(DataType))]
-        [VisibilityKind::public.resetVisibility()/]
-        struct
-	[else]
-        [VisibilityKind::private.resetVisibility()/]
-        class
-	[/if]
-[/if]
-[/template]
-
-[comment default initializer for non-static attributes with a default value
-TODO: should be disabled by default, since non-static members can be initialized directly
-in C++ 011/]
-[template public defaultInitializer(classifier : Classifier) post(trim())]
-[comment
-Bug 422373: The default initializer should not be generated if there are any user-defined
-            constructors.  In plain C++ code, the existence of a constructor with parameters
-            means that the compiler will not synthesize a default one.
-
-            E.g., this would be invalid in plain C++ code:
-            class T1 { };
-            class T2 { public: T(int); };
-            T1 * t1 = new T1;     // OK, sythesized default constructor used
-            T2 * t2a = new T2(5); // OK, user-defined constructor used
-            T2 * t2b = new T2; // ERROR, default constructor was not synthesized
-
-            Also, if the user has provided a default constructor in the code, we don't need
-            to generate a second copy here.  A default constructor should only be generated
-            here if the compiler would have synthesized one anyhow.  Otherwise the default
-            property values should be set in the constructors that are generated by
-            CppClassOperationsDeclaration.
-/]
-[if getOwnedOperations()->any(hasStereotype(standard::Create)) = null]
-    [let attributeList : OrderedSet(Property) = attribute->select(	
-    	(isStatic = false) and
-    	(defaultValue <> null) and
-    	(defaultValue.stringValue() <> null))]
-    [if not attributeList->isEmpty()]
-    	[classifier.name/]() : [for (a : Property | attributeList) separator(', ')
-    		][name/]([defaultValue.stringValue()/])[/for] {}
-    [/if][/let]
-[/if]
-[/template]
-
-
-[template public CppClassHeader(class : Classifier)]
-#ifndef [getFullNameUC()/]_H
-#define [getFullNameUC()/]_H
-
-/************************************************************
-              [class.name/] class header
- ************************************************************/
-
-[for (path : String |
-	Sequence{ _package.cppOwnerPackageIncludePath() }
-		->addAll( CppClassAllIncludes() )
-		->flatten()
-		->asOrderedSet())]
-[path.IncludeDirective()/]
-[/for]
-
-[CppIncludeHeader()/]
-
-[openNS()/] 
-
-/************************************************************/
-[CppElementDoc()/]
-[templateSignature()/][classUnionOrStruct()/] [class.name/][CppClassInheritedDeclarations()/] {
-[CppClassIncludeFriendDeclaration()/][CppClassTypeAndEnum()/]
-    [VisibilityKind::public.getSection(defaultInitializer())/]
-    [VisibilityKind::public.getSection(CppClassAttributesDeclaration(VisibilityKind::public))/]
-    [VisibilityKind::public.getSection(CppClassOperationsDeclaration(VisibilityKind::public))/]
-
-    [VisibilityKind::protected.getSection(CppClassAttributesDeclaration(VisibilityKind::protected))/]
-    [VisibilityKind::protected.getSection(CppClassOperationsDeclaration(VisibilityKind::protected))/]
-
-    [VisibilityKind::private.getSection(CppClassAttributesDeclaration(VisibilityKind::private))/]
-    [VisibilityKind::private.getSection(CppClassOperationsDeclaration(VisibilityKind::private))/]
-};
-/************************************************************/
-/* External declarations (package visibility)               */
-[CppClassAttributesDeclaration(VisibilityKind::_package)/]
-[CppClassOperationsDeclaration(VisibilityKind::_package)/]
-/************************************************************/
-
-[if isTemplate()]
-/************************************************************/
-/* Template functions                                       */
-[CppClassOperationsImplementation(false)/]
-[/if]
-
-/* Inline functions                                         */
-[CppClassOperationsImplementation(true)/]
-[closeNS()/]
-
-/************************************************************
-              End of [class.name/] class header
- ************************************************************/
-
-#endif
-[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppIncludeUtils.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppIncludeUtils.emtl
deleted file mode 100644
index b32aedf7db3..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppIncludeUtils.emtl
+++ /dev/null
@@ -1,1253 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppIncludeUtils" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::CppIncludeUtils" startHeaderPosition="29" endHeaderPosition="185">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
-    </input>
-    <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="Constants.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppIncludeHeader" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="mtl:LetBlock">
-          <body xsi:type="mtl:IfBlock">
-            <body xsi:type="mtl:TemplateInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="Constants.emtl#/0/constIncludeHeaderStart"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/10">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-              </argument>
-            </body>
-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-            <body xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/cleanCR"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="header" referredVariable="/0/CppIncludeHeader/%/%/header">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              </argument>
-            </body>
-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-            <body xsi:type="mtl:TemplateInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="Constants.emtl#/0/constIncludeHeaderEnd"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/12">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-              </argument>
-            </body>
-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-            <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                <source xsi:type="ocl.ecore:VariableExp" name="header" referredVariable="/0/CppIncludeHeader/%/%/header">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                </source>
-                <argument xsi:type="ocl.ecore:NullLiteralExp">
-                  <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-                </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/%3C%3E"/>
-              </source>
-              <argument xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                <source xsi:type="ocl.ecore:OperationCallExp">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-                  <source xsi:type="ocl.ecore:VariableExp" name="header" referredVariable="/0/CppIncludeHeader/%/%/header">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                  </source>
-                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/size"/>
-                </source>
-                <argument xsi:type="ocl.ecore:IntegerLiteralExp" integerSymbol="0">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-                </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer_Class/%3E"/>
-              </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
-            </ifExpr>
-          </body>
-          <letVariable name="header">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <initExpression xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/>
-              <source xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Include"/>
-                <source xsi:type="mtl:QueryInvocation">
-                  <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-                  <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
-                  <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/8">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-                  </argument>
-                  <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Include">
-                    <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Include"/>
-                  </argument>
-                </source>
-                <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Include">
-                  <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Include"/>
-                </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-              </source>
-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Include/header"/>
-            </initExpression>
-          </letVariable>
-        </body>
-        <ifExpr xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Include">
-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Include"/>
-          </argument>
-        </ifExpr>
-      </body>
-      <parameter name="ne">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppIncludeBody" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="mtl:LetBlock">
-          <body xsi:type="mtl:IfBlock">
-            <body xsi:type="mtl:TemplateInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="Constants.emtl#/0/constIncludeBodyStart"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/20">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-              </argument>
-            </body>
-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-            <body xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/cleanCR"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="_body" referredVariable="/0/CppIncludeBody/%/%/_body">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              </argument>
-            </body>
-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-            <body xsi:type="mtl:TemplateInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="Constants.emtl#/0/constIncludeBodyEnd"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/22">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-              </argument>
-            </body>
-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-            <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                <source xsi:type="ocl.ecore:VariableExp" name="_body" referredVariable="/0/CppIncludeBody/%/%/_body">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                </source>
-                <argument xsi:type="ocl.ecore:NullLiteralExp">
-                  <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-                </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/%3C%3E"/>
-              </source>
-              <argument xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                <source xsi:type="ocl.ecore:OperationCallExp">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-                  <source xsi:type="ocl.ecore:VariableExp" name="_body" referredVariable="/0/CppIncludeBody/%/%/_body">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                  </source>
-                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/size"/>
-                </source>
-                <argument xsi:type="ocl.ecore:IntegerLiteralExp" integerSymbol="0">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-                </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer_Class/%3E"/>
-              </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
-            </ifExpr>
-          </body>
-          <letVariable name="_body">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <initExpression xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/>
-              <source xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Include"/>
-                <source xsi:type="mtl:QueryInvocation">
-                  <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-                  <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
-                  <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/18">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-                  </argument>
-                  <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Include">
-                    <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Include"/>
-                  </argument>
-                </source>
-                <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Include">
-                  <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Include"/>
-                </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-              </source>
-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Include/body"/>
-            </initExpression>
-          </letVariable>
-        </body>
-        <ifExpr xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/17">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Include">
-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Include"/>
-          </argument>
-        </ifExpr>
-      </body>
-      <parameter name="ne">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppIncludePreBody" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="mtl:LetBlock">
-          <body xsi:type="mtl:IfBlock">
-            <body xsi:type="mtl:TemplateInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="Constants.emtl#/0/constIncludePreBodyStart"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/30">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-              </argument>
-            </body>
-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-            <body xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/cleanCR"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="preBody" referredVariable="/0/CppIncludePreBody/%/%/preBody">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              </argument>
-            </body>
-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-            <body xsi:type="mtl:TemplateInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="Constants.emtl#/0/constIncludePreBodyEnd"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-              </argument>
-            </body>
-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-            <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                <source xsi:type="ocl.ecore:VariableExp" name="preBody" referredVariable="/0/CppIncludePreBody/%/%/preBody">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                </source>
-                <argument xsi:type="ocl.ecore:NullLiteralExp">
-                  <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-                </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/%3C%3E"/>
-              </source>
-              <argument xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                <source xsi:type="ocl.ecore:OperationCallExp">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-                  <source xsi:type="ocl.ecore:VariableExp" name="preBody" referredVariable="/0/CppIncludePreBody/%/%/preBody">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                  </source>
-                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/size"/>
-                </source>
-                <argument xsi:type="ocl.ecore:IntegerLiteralExp" integerSymbol="0">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-                </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer_Class/%3E"/>
-              </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
-            </ifExpr>
-          </body>
-          <letVariable name="preBody">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <initExpression xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/>
-              <source xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Include"/>
-                <source xsi:type="mtl:QueryInvocation">
-                  <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-                  <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
-                  <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/28">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-                  </argument>
-                  <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Include">
-                    <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Include"/>
-                  </argument>
-                </source>
-                <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Include">
-                  <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Include"/>
-                </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-              </source>
-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Include/preBody"/>
-            </initExpression>
-          </letVariable>
-        </body>
-        <ifExpr xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/27">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Include">
-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Include"/>
-          </argument>
-        </ifExpr>
-      </body>
-      <parameter name="ne">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="IncludeDirective" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="#include &quot;"/>
-        <body xsi:type="ocl.ecore:VariableExp" name="path" referredVariable="/0/IncludeDirective/path">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&quot;&#xA;"/>
-        <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="path" referredVariable="/0/IncludeDirective/path">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            </source>
-            <argument xsi:type="ocl.ecore:NullLiteralExp">
-              <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/%3C%3E"/>
-          </source>
-          <argument xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="path" referredVariable="/0/IncludeDirective/path">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              </source>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/size"/>
-            </source>
-            <argument xsi:type="ocl.ecore:IntegerLiteralExp" integerSymbol="0">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer_Class/%3E"/>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
-        </ifExpr>
-      </body>
-      <parameter name="path">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="CppIncludeHeader">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppIncludeHeader"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="ne">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppIncludeBody">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppIncludeBody"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="ne">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppIncludePreBody">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppIncludePreBody"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="ne">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="IncludeDirective">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/IncludeDirective"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="path">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="hasStereotype">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="definition">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getApplication">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="arg1">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="cleanCR">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/cleanCR"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="str">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="constIncludeHeaderStart">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="Constants.emtl#/0/constIncludeHeaderStart"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="constIncludePreBodyStart">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="Constants.emtl#/0/constIncludePreBodyStart"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="constIncludePreBodyEnd">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="Constants.emtl#/0/constIncludePreBodyEnd"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="constIncludeBodyStart">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="Constants.emtl#/0/constIncludeBodyStart"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="constIncludeHeaderEnd">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="Constants.emtl#/0/constIncludeHeaderEnd"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="constIncludeBodyEnd">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="Constants.emtl#/0/constIncludeBodyEnd"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="types">
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Include">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Include"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/CppIncludeHeader">
-      <details key="start" value="255"/>
-      <details key="end" value="584"/>
-      <details key="line" value="6"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/CppIncludeHeader/%">
-      <details key="start" value="309"/>
-      <details key="end" value="572"/>
-      <details key="line" value="7"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/CppIncludeHeader/%/%">
-      <details key="start" value="346"/>
-      <details key="end" value="567"/>
-      <details key="line" value="8"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/CppIncludeHeader/%/%/%">
-      <details key="start" value="434"/>
-      <details key="end" value="561"/>
-      <details key="line" value="9"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/CppIncludeHeader/%/%/%/%">
-      <details key="start" value="481"/>
-      <details key="end" value="506"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/CppIncludeHeader/%/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/CppIncludeHeader/%/%/%/%.1">
-      <details key="start" value="508"/>
-      <details key="end" value="509"/>
-      <details key="line" value="11"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/CppIncludeHeader/%/%/%/%.2">
-      <details key="start" value="510"/>
-      <details key="end" value="526"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/CppIncludeHeader/%/%/%/%.2/header">
-      <details key="start" value="510"/>
-      <details key="end" value="516"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/CppIncludeHeader/%/%/%/%.3">
-      <details key="start" value="528"/>
-      <details key="end" value="529"/>
-      <details key="line" value="12"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/CppIncludeHeader/%/%/%/%.4">
-      <details key="start" value="530"/>
-      <details key="end" value="553"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/CppIncludeHeader/%/%/%/%.4/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/CppIncludeHeader/%/%/%/%.5">
-      <details key="start" value="555"/>
-      <details key="end" value="556"/>
-      <details key="line" value="13"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/CppIncludeHeader/%/%/%/%.6">
-      <details key="start" value="438"/>
-      <details key="end" value="478"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/CppIncludeHeader/%/%/%/%.6/%">
-      <details key="start" value="438"/>
-      <details key="end" value="454"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/CppIncludeHeader/%/%/%/%.6/%/header">
-      <details key="start" value="439"/>
-      <details key="end" value="445"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/CppIncludeHeader/%/%/%/%.6/%/%">
-      <details key="start" value="449"/>
-      <details key="end" value="453"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/CppIncludeHeader/%/%/%/%.6/%.1">
-      <details key="start" value="459"/>
-      <details key="end" value="478"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/CppIncludeHeader/%/%/%/%.6/%.1/%">
-      <details key="start" value="460"/>
-      <details key="end" value="473"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/CppIncludeHeader/%/%/%/%.6/%.1/%/header">
-      <details key="start" value="460"/>
-      <details key="end" value="466"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/CppIncludeHeader/%/%/%/%.6/%.1/%.1">
-      <details key="start" value="476"/>
-      <details key="end" value="477"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/CppIncludeHeader/%/%/header">
-      <details key="start" value="351"/>
-      <details key="end" value="432"/>
-      <details key="line" value="8"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/CppIncludeHeader/%/%/header/%">
-      <details key="start" value="370"/>
-      <details key="end" value="433"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/CppIncludeHeader/%/%/header/%/%">
-      <details key="start" value="370"/>
-      <details key="end" value="426"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/CppIncludeHeader/%/%/header/%/%/%">
-      <details key="start" value="370"/>
-      <details key="end" value="400"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/CppIncludeHeader/%/%/header/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/CppIncludeHeader/%/%/header/%/%/%/%">
-      <details key="start" value="385"/>
-      <details key="end" value="399"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/CppIncludeHeader/%/%/header/%/%/%.1">
-      <details key="start" value="411"/>
-      <details key="end" value="425"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/CppIncludeHeader/%/%.1">
-      <details key="start" value="313"/>
-      <details key="end" value="344"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/CppIncludeHeader/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/CppIncludeHeader/%/%.1/%">
-      <details key="start" value="328"/>
-      <details key="end" value="342"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/CppIncludeHeader/ne">
-      <details key="start" value="289"/>
-      <details key="end" value="306"/>
-      <details key="line" value="6"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/CppIncludeBody">
-      <details key="start" value="586"/>
-      <details key="end" value="904"/>
-      <details key="line" value="16"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/CppIncludeBody/%">
-      <details key="start" value="638"/>
-      <details key="end" value="892"/>
-      <details key="line" value="17"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/CppIncludeBody/%/%">
-      <details key="start" value="675"/>
-      <details key="end" value="887"/>
-      <details key="line" value="18"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/CppIncludeBody/%/%/%">
-      <details key="start" value="761"/>
-      <details key="end" value="881"/>
-      <details key="line" value="19"/>
-    </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/CppIncludeBody/%/%/%/%">
-      <details key="start" value="806"/>
-      <details key="end" value="829"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/CppIncludeBody/%/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/CppIncludeBody/%/%/%/%.1">
-      <details key="start" value="831"/>
-      <details key="end" value="832"/>
-      <details key="line" value="21"/>
-    </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/CppIncludeBody/%/%/%/%.2">
-      <details key="start" value="833"/>
-      <details key="end" value="848"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/CppIncludeBody/%/%/%/%.2/_body">
-      <details key="start" value="833"/>
-      <details key="end" value="838"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/CppIncludeBody/%/%/%/%.3">
-      <details key="start" value="850"/>
-      <details key="end" value="851"/>
-      <details key="line" value="22"/>
-    </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/CppIncludeBody/%/%/%/%.4">
-      <details key="start" value="852"/>
-      <details key="end" value="873"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.43" references="/0/CppIncludeBody/%/%/%/%.4/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.44" references="/0/CppIncludeBody/%/%/%/%.5">
-      <details key="start" value="875"/>
-      <details key="end" value="876"/>
-      <details key="line" value="23"/>
-    </eAnnotations>
-    <eAnnotations source="positions.45" references="/0/CppIncludeBody/%/%/%/%.6">
-      <details key="start" value="765"/>
-      <details key="end" value="803"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.46" references="/0/CppIncludeBody/%/%/%/%.6/%">
-      <details key="start" value="765"/>
-      <details key="end" value="780"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.47" references="/0/CppIncludeBody/%/%/%/%.6/%/_body">
-      <details key="start" value="766"/>
-      <details key="end" value="771"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.48" references="/0/CppIncludeBody/%/%/%/%.6/%/%">
-      <details key="start" value="775"/>
-      <details key="end" value="779"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.49" references="/0/CppIncludeBody/%/%/%/%.6/%.1">
-      <details key="start" value="785"/>
-      <details key="end" value="803"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.50" references="/0/CppIncludeBody/%/%/%/%.6/%.1/%">
-      <details key="start" value="786"/>
-      <details key="end" value="798"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.51" references="/0/CppIncludeBody/%/%/%/%.6/%.1/%/_body">
-      <details key="start" value="786"/>
-      <details key="end" value="791"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.52" references="/0/CppIncludeBody/%/%/%/%.6/%.1/%.1">
-      <details key="start" value="801"/>
-      <details key="end" value="802"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.53" references="/0/CppIncludeBody/%/%/_body">
-      <details key="start" value="680"/>
-      <details key="end" value="759"/>
-      <details key="line" value="18"/>
-    </eAnnotations>
-    <eAnnotations source="positions.54" references="/0/CppIncludeBody/%/%/_body/%">
-      <details key="start" value="698"/>
-      <details key="end" value="760"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.55" references="/0/CppIncludeBody/%/%/_body/%/%">
-      <details key="start" value="698"/>
-      <details key="end" value="754"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.56" references="/0/CppIncludeBody/%/%/_body/%/%/%">
-      <details key="start" value="698"/>
-      <details key="end" value="728"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.57" references="/0/CppIncludeBody/%/%/_body/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.58" references="/0/CppIncludeBody/%/%/_body/%/%/%/%">
-      <details key="start" value="713"/>
-      <details key="end" value="727"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.59" references="/0/CppIncludeBody/%/%/_body/%/%/%.1">
-      <details key="start" value="739"/>
-      <details key="end" value="753"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.60" references="/0/CppIncludeBody/%/%.1">
-      <details key="start" value="642"/>
-      <details key="end" value="673"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.61" references="/0/CppIncludeBody/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.62" references="/0/CppIncludeBody/%/%.1/%">
-      <details key="start" value="657"/>
-      <details key="end" value="671"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.63" references="/0/CppIncludeBody/ne">
-      <details key="start" value="618"/>
-      <details key="end" value="635"/>
-      <details key="line" value="16"/>
-    </eAnnotations>
-    <eAnnotations source="positions.64" references="/0/CppIncludePreBody">
-      <details key="start" value="906"/>
-      <details key="end" value="1243"/>
-      <details key="line" value="26"/>
-    </eAnnotations>
-    <eAnnotations source="positions.65" references="/0/CppIncludePreBody/%">
-      <details key="start" value="961"/>
-      <details key="end" value="1231"/>
-      <details key="line" value="27"/>
-    </eAnnotations>
-    <eAnnotations source="positions.66" references="/0/CppIncludePreBody/%/%">
-      <details key="start" value="998"/>
-      <details key="end" value="1226"/>
-      <details key="line" value="28"/>
-    </eAnnotations>
-    <eAnnotations source="positions.67" references="/0/CppIncludePreBody/%/%/%">
-      <details key="start" value="1088"/>
-      <details key="end" value="1220"/>
-      <details key="line" value="29"/>
-    </eAnnotations>
-    <eAnnotations source="positions.68" references="/0/CppIncludePreBody/%/%/%/%">
-      <details key="start" value="1137"/>
-      <details key="end" value="1163"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.69" references="/0/CppIncludePreBody/%/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.70" references="/0/CppIncludePreBody/%/%/%/%.1">
-      <details key="start" value="1165"/>
-      <details key="end" value="1166"/>
-      <details key="line" value="31"/>
-    </eAnnotations>
-    <eAnnotations source="positions.71" references="/0/CppIncludePreBody/%/%/%/%.2">
-      <details key="start" value="1167"/>
-      <details key="end" value="1184"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.72" references="/0/CppIncludePreBody/%/%/%/%.2/preBody">
-      <details key="start" value="1167"/>
-      <details key="end" value="1174"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.73" references="/0/CppIncludePreBody/%/%/%/%.3">
-      <details key="start" value="1186"/>
-      <details key="end" value="1187"/>
-      <details key="line" value="32"/>
-    </eAnnotations>
-    <eAnnotations source="positions.74" references="/0/CppIncludePreBody/%/%/%/%.4">
-      <details key="start" value="1188"/>
-      <details key="end" value="1212"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.75" references="/0/CppIncludePreBody/%/%/%/%.4/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.76" references="/0/CppIncludePreBody/%/%/%/%.5">
-      <details key="start" value="1214"/>
-      <details key="end" value="1215"/>
-      <details key="line" value="33"/>
-    </eAnnotations>
-    <eAnnotations source="positions.77" references="/0/CppIncludePreBody/%/%/%/%.6">
-      <details key="start" value="1092"/>
-      <details key="end" value="1134"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.78" references="/0/CppIncludePreBody/%/%/%/%.6/%">
-      <details key="start" value="1092"/>
-      <details key="end" value="1109"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.79" references="/0/CppIncludePreBody/%/%/%/%.6/%/preBody">
-      <details key="start" value="1093"/>
-      <details key="end" value="1100"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.80" references="/0/CppIncludePreBody/%/%/%/%.6/%/%">
-      <details key="start" value="1104"/>
-      <details key="end" value="1108"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.81" references="/0/CppIncludePreBody/%/%/%/%.6/%.1">
-      <details key="start" value="1114"/>
-      <details key="end" value="1134"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.82" references="/0/CppIncludePreBody/%/%/%/%.6/%.1/%">
-      <details key="start" value="1115"/>
-      <details key="end" value="1129"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.83" references="/0/CppIncludePreBody/%/%/%/%.6/%.1/%/preBody">
-      <details key="start" value="1115"/>
-      <details key="end" value="1122"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.84" references="/0/CppIncludePreBody/%/%/%/%.6/%.1/%.1">
-      <details key="start" value="1132"/>
-      <details key="end" value="1133"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.85" references="/0/CppIncludePreBody/%/%/preBody">
-      <details key="start" value="1003"/>
-      <details key="end" value="1086"/>
-      <details key="line" value="28"/>
-    </eAnnotations>
-    <eAnnotations source="positions.86" references="/0/CppIncludePreBody/%/%/preBody/%">
-      <details key="start" value="1023"/>
-      <details key="end" value="1087"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.87" references="/0/CppIncludePreBody/%/%/preBody/%/%">
-      <details key="start" value="1023"/>
-      <details key="end" value="1079"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.88" references="/0/CppIncludePreBody/%/%/preBody/%/%/%">
-      <details key="start" value="1023"/>
-      <details key="end" value="1053"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.89" references="/0/CppIncludePreBody/%/%/preBody/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.90" references="/0/CppIncludePreBody/%/%/preBody/%/%/%/%">
-      <details key="start" value="1038"/>
-      <details key="end" value="1052"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.91" references="/0/CppIncludePreBody/%/%/preBody/%/%/%.1">
-      <details key="start" value="1064"/>
-      <details key="end" value="1078"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.92" references="/0/CppIncludePreBody/%/%.1">
-      <details key="start" value="965"/>
-      <details key="end" value="996"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.93" references="/0/CppIncludePreBody/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.94" references="/0/CppIncludePreBody/%/%.1/%">
-      <details key="start" value="980"/>
-      <details key="end" value="994"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.95" references="/0/CppIncludePreBody/ne">
-      <details key="start" value="941"/>
-      <details key="end" value="958"/>
-      <details key="line" value="26"/>
-    </eAnnotations>
-    <eAnnotations source="positions.96" references="/0/IncludeDirective">
-      <details key="start" value="1245"/>
-      <details key="end" value="1373"/>
-      <details key="line" value="36"/>
-    </eAnnotations>
-    <eAnnotations source="positions.97" references="/0/IncludeDirective/%">
-      <details key="start" value="1295"/>
-      <details key="end" value="1361"/>
-      <details key="line" value="37"/>
-    </eAnnotations>
-    <eAnnotations source="positions.98" references="/0/IncludeDirective/%/%">
-      <details key="start" value="1337"/>
-      <details key="end" value="1347"/>
-      <details key="line" value="38"/>
-    </eAnnotations>
-    <eAnnotations source="positions.99" references="/0/IncludeDirective/%/path">
-      <details key="start" value="1348"/>
-      <details key="end" value="1352"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.100" references="/0/IncludeDirective/%/%.1">
-      <details key="start" value="1354"/>
-      <details key="end" value="1356"/>
-      <details key="line" value="38"/>
-    </eAnnotations>
-    <eAnnotations source="positions.101" references="/0/IncludeDirective/%/%.2">
-      <details key="start" value="1299"/>
-      <details key="end" value="1335"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.102" references="/0/IncludeDirective/%/%.2/%">
-      <details key="start" value="1299"/>
-      <details key="end" value="1313"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.103" references="/0/IncludeDirective/%/%.2/%/path">
-      <details key="start" value="1300"/>
-      <details key="end" value="1304"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.104" references="/0/IncludeDirective/%/%.2/%/%">
-      <details key="start" value="1308"/>
-      <details key="end" value="1312"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.105" references="/0/IncludeDirective/%/%.2/%.1">
-      <details key="start" value="1318"/>
-      <details key="end" value="1335"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.106" references="/0/IncludeDirective/%/%.2/%.1/%">
-      <details key="start" value="1319"/>
-      <details key="end" value="1330"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.107" references="/0/IncludeDirective/%/%.2/%.1/%/path">
-      <details key="start" value="1319"/>
-      <details key="end" value="1323"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.108" references="/0/IncludeDirective/%/%.2/%.1/%.1">
-      <details key="start" value="1333"/>
-      <details key="end" value="1334"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.109" references="/0/IncludeDirective/path">
-      <details key="start" value="1279"/>
-      <details key="end" value="1292"/>
-      <details key="line" value="36"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppIncludeUtils.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppIncludeUtils.mtl
deleted file mode 100644
index 4c6f033928d..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppIncludeUtils.mtl
+++ /dev/null
@@ -1,40 +0,0 @@
-[comment encoding = UTF-8 /]
-[module CppIncludeUtils('http://www.eclipse.org/uml2/5.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')]
-[import org::eclipse::papyrus::acceleo::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::Constants/]
-
-[template public CppIncludeHeader(ne : NamedElement)]
-[if (hasStereotype(C_Cpp::Include))]
-[let header : String = getApplication(C_Cpp::Include).oclAsType(C_Cpp::Include).header]
-[if (header <> null) and (header.size() > 0)]
-[constIncludeHeaderStart()/]
-[header.cleanCR()/]
-[constIncludeHeaderEnd()/]
-[/if][/let][/if]
-[/template]
-
-[template public CppIncludeBody(ne : NamedElement)]
-[if (hasStereotype(C_Cpp::Include))]
-[let _body : String = getApplication(C_Cpp::Include).oclAsType(C_Cpp::Include)._body]
-[if (_body <> null) and (_body.size() > 0)]
-[constIncludeBodyStart()/]
-[_body.cleanCR()/]
-[constIncludeBodyEnd()/]
-[/if][/let][/if]
-[/template]
-
-[template public CppIncludePreBody(ne : NamedElement)]
-[if (hasStereotype(C_Cpp::Include))]
-[let preBody : String = getApplication(C_Cpp::Include).oclAsType(C_Cpp::Include).preBody]
-[if (preBody <> null) and (preBody.size() > 0)]
-[constIncludePreBodyStart()/]
-[preBody.cleanCR()/]
-[constIncludePreBodyEnd()/]
-[/if][/let][/if]
-[/template]
-
-[template public IncludeDirective(path : String)]
-[if (path <> null) and (path.size() > 0)]
-#include "[path/]"
-[/if]
-[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppPackageHeader.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppPackageHeader.emtl
deleted file mode 100644
index 55fc473da7a..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppPackageHeader.emtl
+++ /dev/null
@@ -1,749 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppPackageHeader" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::CppPackageHeader" endHeaderPosition="65">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="../utils/CppGenUtils.emtl#/0"/>
-    <imports href="../preferences/CppCodeGenUtils.emtl#/0"/>
-    <imports href="Constants.emtl#/0"/>
-    <imports href="CppIncludeUtils.emtl#/0"/>
-    <imports href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0"/>
-    <imports href="util/clazz/CppClassTypeAndEnum.emtl#/0"/>
-    <imports href="util/clazz/CppClassFriendDeclaration.emtl#/0"/>
-    <imports href="util/CppDocumentation.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppPackageHeader" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="#ifndef PKG_"/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;#define PKG_"/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;/************************************************************&#xA;              Pkg_"/>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/8">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" package header&#xA; ************************************************************/&#xA;&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="CppIncludeUtils.emtl#/0/IncludeDirective"/>
-        <argument xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0/cppOwnerPackageIncludePath"/>
-          <argument xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/9">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-            </source>
-            <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/nestingPackage"/>
-          </argument>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;#ifndef _IN_&#xA;#define _IN_&#xA;#endif&#xA;#ifndef _OUT_&#xA;#define _OUT_&#xA;#endif&#xA;#ifndef _INOUT_&#xA;#define _INOUT_&#xA;#endif&#xA;&#xA;&#x9;&#xA;/* Package dependency header include                        */&#xA;"/>
-      <body xsi:type="mtl:ForBlock">
-        <body xsi:type="mtl:TemplateInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="CppIncludeUtils.emtl#/0/IncludeDirective"/>
-          <argument xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                  <source xsi:type="mtl:QueryInvocation">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                    <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullPath"/>
-                    <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/13">
-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-                    </argument>
-                  </source>
-                  <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="/Pkg_">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                  </argument>
-                </source>
-                <argument xsi:type="ocl.ecore:PropertyCallExp">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                  <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/13">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-                  </source>
-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-                </argument>
-              </source>
-              <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              </argument>
-            </source>
-            <argument xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="../preferences/CppCodeGenUtils.emtl#/0/getHeaderSuffix"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/13">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-              </argument>
-            </argument>
-          </argument>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-        <iterSet xsi:type="mtl:QueryInvocation" eType="/10/Sequence(Package)">
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getUsedPackages"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/11">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-          </argument>
-        </iterSet>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="CppIncludeUtils.emtl#/0/CppIncludeHeader"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/16">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;"/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../utils/CppGenUtils.emtl#/0/openNS"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/17">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="Constants.emtl#/0/packageTypes"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/18">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="util/clazz/CppClassTypeAndEnum.emtl#/0/CppClassTypeAndEnumPackage"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/19">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../utils/CppGenUtils.emtl#/0/closeNS"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/20">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;/************************************************************&#xA;              End of Pkg_"/>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/21">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" package header&#xA; ************************************************************/&#xA;&#xA;#endif"/>
-      <parameter name="pkg">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-      <eOperations name="+">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="other">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="CppPackageHeader">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppPackageHeader"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="pkg">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getFullNameUC">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getUsedPackages">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getUsedPackages"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:SequenceType" href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/3/Sequence(Package)"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getFullPath">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullPath"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="openNS">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../utils/CppGenUtils.emtl#/0/openNS"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="closeNS">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../utils/CppGenUtils.emtl#/0/closeNS"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getHeaderSuffix">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../preferences/CppCodeGenUtils.emtl#/0/getHeaderSuffix"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eOperations>
-      <eOperations name="packageTypes">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="Constants.emtl#/0/packageTypes"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppIncludeHeader">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="CppIncludeUtils.emtl#/0/CppIncludeHeader"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="ne">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="IncludeDirective">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="CppIncludeUtils.emtl#/0/IncludeDirective"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="path">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="cppOwnerPackageIncludePath">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0/cppOwnerPackageIncludePath"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="pkg">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassTypeAndEnumPackage">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="util/clazz/CppClassTypeAndEnum.emtl#/0/CppClassTypeAndEnumPackage"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="pkg">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="VisibilityKind_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Namespace_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Parameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Package)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/CppPackageHeader">
-      <details key="start" value="767"/>
-      <details key="end" value="1692"/>
-      <details key="line" value="15"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/CppPackageHeader/%">
-      <details key="start" value="817"/>
-      <details key="end" value="829"/>
-      <details key="line" value="16"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/CppPackageHeader/%.1">
-      <details key="start" value="830"/>
-      <details key="end" value="845"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/CppPackageHeader/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/CppPackageHeader/%.2">
-      <details key="start" value="847"/>
-      <details key="end" value="860"/>
-      <details key="line" value="17"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/CppPackageHeader/%.3">
-      <details key="start" value="861"/>
-      <details key="end" value="876"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/CppPackageHeader/%.3/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/CppPackageHeader/%.4">
-      <details key="start" value="878"/>
-      <details key="end" value="960"/>
-      <details key="line" value="18"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/CppPackageHeader/%.5">
-      <details key="start" value="961"/>
-      <details key="end" value="965"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/CppPackageHeader/%.5/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/CppPackageHeader/%.6">
-      <details key="start" value="967"/>
-      <details key="end" value="1047"/>
-      <details key="line" value="20"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/CppPackageHeader/%.7">
-      <details key="start" value="1048"/>
-      <details key="end" value="1110"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/CppPackageHeader/%.7/%">
-      <details key="start" value="1048"/>
-      <details key="end" value="1091"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/CppPackageHeader/%.7/%/%">
-      <details key="start" value="1048"/>
-      <details key="end" value="1062"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/CppPackageHeader/%.7/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/CppPackageHeader/%.8">
-      <details key="start" value="1112"/>
-      <details key="end" value="1287"/>
-      <details key="line" value="24"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/CppPackageHeader/%.9">
-      <details key="start" value="1287"/>
-      <details key="end" value="1399"/>
-      <details key="line" value="37"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/CppPackageHeader/%.9/%">
-      <details key="start" value="1314"/>
-      <details key="end" value="1390"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/CppPackageHeader/%.9/%/%">
-      <details key="start" value="1332"/>
-      <details key="end" value="1388"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/CppPackageHeader/%.9/%/%/%">
-      <details key="start" value="1332"/>
-      <details key="end" value="1368"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/CppPackageHeader/%.9/%/%/%/%">
-      <details key="start" value="1332"/>
-      <details key="end" value="1362"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/CppPackageHeader/%.9/%/%/%/%/%">
-      <details key="start" value="1332"/>
-      <details key="end" value="1355"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/CppPackageHeader/%.9/%/%/%/%/%/%">
-      <details key="start" value="1332"/>
-      <details key="end" value="1345"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/CppPackageHeader/%.9/%/%/%/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/CppPackageHeader/%.9/%/%/%/%/%/%.1">
-      <details key="start" value="1348"/>
-      <details key="end" value="1355"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/CppPackageHeader/%.9/%/%/%/%/%.1">
-      <details key="start" value="1358"/>
-      <details key="end" value="1362"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/CppPackageHeader/%.9/%/%/%/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/CppPackageHeader/%.9/%/%/%/%.1">
-      <details key="start" value="1365"/>
-      <details key="end" value="1368"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/CppPackageHeader/%.9/%/%/%.1">
-      <details key="start" value="1371"/>
-      <details key="end" value="1388"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/CppPackageHeader/%.9/%/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/CppPackageHeader/%.9/%.1">
-      <details key="start" value="1392"/>
-      <details key="end" value="1393"/>
-      <details key="line" value="39"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/CppPackageHeader/%.9/%.2">
-      <details key="start" value="1293"/>
-      <details key="end" value="1310"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/CppPackageHeader/%.9/%.2/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/CppPackageHeader/%.10">
-      <details key="start" value="1400"/>
-      <details key="end" value="1401"/>
-      <details key="line" value="40"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/CppPackageHeader/%.11">
-      <details key="start" value="1402"/>
-      <details key="end" value="1420"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/CppPackageHeader/%.11/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/CppPackageHeader/%.12">
-      <details key="start" value="1422"/>
-      <details key="end" value="1424"/>
-      <details key="line" value="42"/>
-    </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/CppPackageHeader/%.13">
-      <details key="start" value="1425"/>
-      <details key="end" value="1433"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/CppPackageHeader/%.13/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/CppPackageHeader/%.14">
-      <details key="start" value="1435"/>
-      <details key="end" value="1436"/>
-      <details key="line" value="44"/>
-    </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/CppPackageHeader/%.15">
-      <details key="start" value="1437"/>
-      <details key="end" value="1451"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/CppPackageHeader/%.15/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/CppPackageHeader/%.16">
-      <details key="start" value="1453"/>
-      <details key="end" value="1454"/>
-      <details key="line" value="45"/>
-    </eAnnotations>
-    <eAnnotations source="positions.43" references="/0/CppPackageHeader/%.17">
-      <details key="start" value="1455"/>
-      <details key="end" value="1483"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.44" references="/0/CppPackageHeader/%.17/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.45" references="/0/CppPackageHeader/%.18">
-      <details key="start" value="1485"/>
-      <details key="end" value="1486"/>
-      <details key="line" value="46"/>
-    </eAnnotations>
-    <eAnnotations source="positions.46" references="/0/CppPackageHeader/%.19">
-      <details key="start" value="1487"/>
-      <details key="end" value="1496"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.47" references="/0/CppPackageHeader/%.19/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.48" references="/0/CppPackageHeader/%.20">
-      <details key="start" value="1498"/>
-      <details key="end" value="1587"/>
-      <details key="line" value="47"/>
-    </eAnnotations>
-    <eAnnotations source="positions.49" references="/0/CppPackageHeader/%.21">
-      <details key="start" value="1588"/>
-      <details key="end" value="1592"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.50" references="/0/CppPackageHeader/%.21/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.51" references="/0/CppPackageHeader/%.22">
-      <details key="start" value="1594"/>
-      <details key="end" value="1680"/>
-      <details key="line" value="49"/>
-    </eAnnotations>
-    <eAnnotations source="positions.52" references="/0/CppPackageHeader/pkg">
-      <details key="start" value="801"/>
-      <details key="end" value="814"/>
-      <details key="line" value="15"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppPackageHeader.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppPackageHeader.mtl
deleted file mode 100644
index cca687e2f9e..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppPackageHeader.mtl
+++ /dev/null
@@ -1,53 +0,0 @@
-[module CppPackageHeader('http://www.eclipse.org/uml2/5.0.0/UML')/]
-[import org::eclipse::papyrus::acceleo::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::CppGenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::preferences::CppCodeGenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::Constants/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::CppIncludeUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassIncludeClassDeclaration/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassTypeAndEnum/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassFriendDeclaration/]
-
-
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppDocumentation/]
-
-
-[template public CppPackageHeader(pkg : Package)]
-#ifndef PKG_[getFullNameUC()/]
-#define PKG_[getFullNameUC()/]
-
-/************************************************************
-              Pkg_[name/] package header
- ************************************************************/
-
-[nestingPackage.cppOwnerPackageIncludePath().IncludeDirective()/]
-
-#ifndef _IN_
-#define _IN_
-#endif
-#ifndef _OUT_
-#define _OUT_
-#endif
-#ifndef _INOUT_
-#define _INOUT_
-#endif
-
-	
-/* Package dependency header include                        */
-[for (getUsedPackages())]
-[IncludeDirective( getFullPath() + '/Pkg_' + name + '.' + getHeaderSuffix() )/]
-[/for]
-
-[CppIncludeHeader()/]
-
-[openNS()/]
-[packageTypes()/]
-[CppClassTypeAndEnumPackage()/]
-[closeNS()/]
-
-/************************************************************
-              End of Pkg_[name/] package header
- ************************************************************/
-
-#endif
-[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.emtl
deleted file mode 100644
index 03689dcf0f3..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.emtl
+++ /dev/null
@@ -1,1702 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppAttribute" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::CppAttribute" endHeaderPosition="103">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
-    </input>
-    <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="../../utils/CppGenUtils.emtl#/0"/>
-    <imports href="../../utils/Modifier.emtl#/0"/>
-    <imports href="../Constants.emtl#/0"/>
-    <imports href="CppDocumentation.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Template" name="defaultValue" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" = "/>
-        <body xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <source xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ValueSpecification"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="attribute" referredVariable="/0/defaultValue/attribute">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-            </source>
-            <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/defaultValue"/>
-          </source>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/5.0.0/UML#//ValueSpecification/stringValue"/>
-        </body>
-        <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ValueSpecification"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-              </source>
-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/defaultValue"/>
-            </source>
-            <argument xsi:type="ocl.ecore:NullLiteralExp">
-              <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/%3C%3E"/>
-          </source>
-          <argument xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-            </source>
-            <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Feature/isStatic"/>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
-        </ifExpr>
-      </body>
-      <parameter name="attribute">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="staticValue" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="static "/>
-        <ifExpr xsi:type="ocl.ecore:PropertyCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:VariableExp" name="attribute" referredVariable="/0/staticValue/attribute">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-          </source>
-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Feature/isStatic"/>
-        </ifExpr>
-      </body>
-      <parameter name="attribute">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppAttributeDeclaration" visibility="Public">
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="CppDocumentation.emtl#/0/CppElementDoc"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/18">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation" definition="/0/staticValue">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/19">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../utils/Modifier.emtl#/0/modCVQualifier"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/20">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
-        <argument xsi:type="ocl.ecore:PropertyCallExp">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type"/>
-          <source xsi:type="ocl.ecore:VariableExp" name="attribute" referredVariable="/0/CppAttributeDeclaration/attribute">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-          </source>
-          <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TypedElement/type"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../utils/Modifier.emtl#/0/modPtr"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/22">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../utils/Modifier.emtl#/0/modRef"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/23">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="attribute" referredVariable="/0/CppAttributeDeclaration/attribute">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../utils/Modifier.emtl#/0/modArray"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/25">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="mtl:TemplateInvocation" definition="/0/defaultValue">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/28">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-          </argument>
-        </body>
-        <ifExpr xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/27">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:TypeExp" eType="/26/Const">
-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Const"/>
-          </argument>
-        </ifExpr>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=";"/>
-      <parameter name="attribute">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppAttributeImplementation" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#x9;"/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="CppDocumentation.emtl#/0/CppElementDoc"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/33">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#x9;"/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../utils/Modifier.emtl#/0/modCVQualifier"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/34">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
-        <argument xsi:type="ocl.ecore:PropertyCallExp">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type"/>
-          <source xsi:type="ocl.ecore:VariableExp" name="attribute" referredVariable="/0/CppAttributeImplementation/attribute">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-          </source>
-          <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TypedElement/type"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../utils/Modifier.emtl#/0/modPtr"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/36">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../utils/Modifier.emtl#/0/modRef"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/37">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="attribute" referredVariable="/0/CppAttributeImplementation/attribute">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../utils/Modifier.emtl#/0/modArray"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/39">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=";"/>
-      <parameter name="attribute">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppStaticAttributeImplementation" visibility="Public">
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="CppDocumentation.emtl#/0/CppElementDoc"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/44">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
-        <argument xsi:type="ocl.ecore:PropertyCallExp">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type"/>
-          <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/45">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-          </source>
-          <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TypedElement/type"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../utils/Modifier.emtl#/0/modPtr"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/46">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../utils/Modifier.emtl#/0/modRef"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/47">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:PropertyCallExp">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-          <source xsi:type="ocl.ecore:VariableExp" name="attribute" referredVariable="/0/CppStaticAttributeImplementation/attribute">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-          </source>
-          <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/class"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="::"/>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="attribute" referredVariable="/0/CppStaticAttributeImplementation/attribute">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../utils/Modifier.emtl#/0/modArray"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/50">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:TemplateInvocation" definition="/0/defaultValue">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/51">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=";"/>
-      <parameter name="attribute">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Comment">
-      <body startPosition="1419" endPosition="1507" value="&#xA;return a list of owned attributes, since this is not supported directly on a classifier"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getOwnedAttributes" visibility="Public" type="/3/Sequence(Property)">
-      <parameter name="cl">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:IfExp" eType="/3/Collection(Property)">
-        <condition xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/getOwnedAttributes/cl">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </source>
-          <argument xsi:type="ocl.ecore:TypeExp" eType="/26/Class">
-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
-        </condition>
-        <thenExpression xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(Property)">
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/54">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </source>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/26/Class">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-          </source>
-          <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
-        </thenExpression>
-        <elseExpression xsi:type="ocl.ecore:IfExp" eType="/3/Collection(Property)">
-          <condition xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/getOwnedAttributes/cl">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </source>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/26/DataType">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
-          </condition>
-          <thenExpression xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(Property)">
-            <source xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/54">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-              </source>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/26/DataType">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType"/>
-              </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-            </source>
-            <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType/ownedAttribute"/>
-          </thenExpression>
-          <elseExpression xsi:type="ocl.ecore:IfExp" eType="/3/Collection(Property)">
-            <condition xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/getOwnedAttributes/cl">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-              </source>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/26/Interface">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>
-              </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
-            </condition>
-            <thenExpression xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(Property)">
-              <source xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>
-                <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/54">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                </source>
-                <argument xsi:type="ocl.ecore:TypeExp" eType="/26/Interface">
-                  <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>
-                </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-              </source>
-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface/ownedAttribute"/>
-            </thenExpression>
-            <elseExpression xsi:type="ocl.ecore:IfExp" eType="/3/Collection(Property)">
-              <condition xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/getOwnedAttributes/cl">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                </source>
-                <argument xsi:type="ocl.ecore:TypeExp" eType="/26/Signal">
-                  <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Signal"/>
-                </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
-              </condition>
-              <thenExpression xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(Property)">
-                <source xsi:type="ocl.ecore:OperationCallExp">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Signal"/>
-                  <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/54">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                  </source>
-                  <argument xsi:type="ocl.ecore:TypeExp" eType="/26/Signal">
-                    <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Signal"/>
-                  </argument>
-                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-                </source>
-                <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Signal/ownedAttribute"/>
-              </thenExpression>
-              <elseExpression xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(OclVoid)" kind="Sequence"/>
-            </elseExpression>
-          </elseExpression>
-        </elseExpression>
-      </expression>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Comment">
-      <body startPosition="1964" endPosition="2103" value="&#xA;Loop over attributes. Check that the attribute is not a static const.&#xA;Constant static attributes are declared within the class declaration"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppStaticAttributes" visibility="Public">
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../Constants.emtl#/0/constStaticAttributes"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/59">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:ForBlock">
-        <body xsi:type="mtl:IfBlock">
-          <body xsi:type="mtl:TemplateInvocation" definition="/0/CppStaticAttributeImplementation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/63">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-            </argument>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#xA;"/>
-          <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/62">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-              </source>
-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Feature/isStatic"/>
-            </source>
-            <argument xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="mtl:QueryInvocation">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-                <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/62">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-                </argument>
-                <argument xsi:type="ocl.ecore:TypeExp" eType="/26/Const">
-                  <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Const"/>
-                </argument>
-              </source>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/not"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
-          </ifExpr>
-        </body>
-        <iterSet xsi:type="mtl:QueryInvocation" eType="/3/Sequence(Property)" definition="/0/getOwnedAttributes">
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/60">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-        </iterSet>
-      </body>
-      <parameter name="classifier">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="defaultValue">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/defaultValue"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="attribute">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="staticValue">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/staticValue"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="attribute">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppAttributeDeclaration">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppAttributeDeclaration"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="attribute">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppAttributeImplementation">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppAttributeImplementation"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="attribute">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppStaticAttributeImplementation">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppStaticAttributeImplementation"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="attribute">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getOwnedAttributes" eType="/3/Sequence(Property)">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getOwnedAttributes"/>
-        <eParameters name="cl">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppStaticAttributes">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppStaticAttributes"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="classifier">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="hasStereotype">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="definition">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="cppQualifiedName">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="modPtr">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../utils/Modifier.emtl#/0/modPtr"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="propertyOrParameter">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="modRef">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../utils/Modifier.emtl#/0/modRef"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="propertyOrParameter">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="modArray">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../utils/Modifier.emtl#/0/modArray"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="propertyOrParameter">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="modCVQualifier">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../utils/Modifier.emtl#/0/modCVQualifier"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="propertyOrParameter">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="constStaticAttributes">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../Constants.emtl#/0/constStaticAttributes"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="dummy">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppElementDoc">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="CppDocumentation.emtl#/0/CppElementDoc"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="argument">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Property_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="VisibilityKind_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Parameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Property)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(Property)" instanceClassName="java.util.LinkedHashSet">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OclVoid)" instanceClassName="java.util.List">
-      <elementType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:CollectionType" name="Collection(Property)">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="types">
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Const">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Const"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Class">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="DataType">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Interface">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Signal">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Signal"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/defaultValue">
-      <details key="start" value="433"/>
-      <details key="end" value="585"/>
-      <details key="line" value="9"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/defaultValue/%">
-      <details key="start" value="486"/>
-      <details key="end" value="573"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/defaultValue/%/%">
-      <details key="start" value="526"/>
-      <details key="end" value="529"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/defaultValue/%/%.1">
-      <details key="start" value="530"/>
-      <details key="end" value="566"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/defaultValue/%/%.1/%">
-      <details key="start" value="530"/>
-      <details key="end" value="552"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/defaultValue/%/%.1/%/attribute">
-      <details key="start" value="530"/>
-      <details key="end" value="539"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/defaultValue/%/%.2">
-      <details key="start" value="490"/>
-      <details key="end" value="525"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/defaultValue/%/%.2/%">
-      <details key="start" value="490"/>
-      <details key="end" value="512"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/defaultValue/%/%.2/%/%">
-      <details key="start" value="491"/>
-      <details key="end" value="503"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/defaultValue/%/%.2/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/defaultValue/%/%.2/%/%.1">
-      <details key="start" value="507"/>
-      <details key="end" value="511"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/defaultValue/%/%.2/%.1">
-      <details key="start" value="517"/>
-      <details key="end" value="525"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/defaultValue/%/%.2/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/defaultValue/attribute">
-      <details key="start" value="463"/>
-      <details key="end" value="483"/>
-      <details key="line" value="9"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/staticValue">
-      <details key="start" value="588"/>
-      <details key="end" value="689"/>
-      <details key="line" value="14"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/staticValue/%">
-      <details key="start" value="640"/>
-      <details key="end" value="677"/>
-      <details key="line" value="15"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/staticValue/%/%">
-      <details key="start" value="665"/>
-      <details key="end" value="672"/>
-      <details key="line" value="15"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/staticValue/%/%.1">
-      <details key="start" value="644"/>
-      <details key="end" value="664"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/staticValue/%/%.1/attribute">
-      <details key="start" value="645"/>
-      <details key="end" value="654"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/staticValue/attribute">
-      <details key="start" value="617"/>
-      <details key="end" value="637"/>
-      <details key="line" value="14"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/CppAttributeDeclaration">
-      <details key="start" value="692"/>
-      <details key="end" value="968"/>
-      <details key="line" value="19"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/CppAttributeDeclaration/%">
-      <details key="start" value="757"/>
-      <details key="end" value="772"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/CppAttributeDeclaration/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/CppAttributeDeclaration/%.1">
-      <details key="start" value="774"/>
-      <details key="end" value="775"/>
-      <details key="line" value="21"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/CppAttributeDeclaration/%.2">
-      <details key="start" value="776"/>
-      <details key="end" value="789"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/CppAttributeDeclaration/%.2/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/CppAttributeDeclaration/%.3">
-      <details key="start" value="792"/>
-      <details key="end" value="808"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/CppAttributeDeclaration/%.3/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/CppAttributeDeclaration/%.4">
-      <details key="start" value="811"/>
-      <details key="end" value="844"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/CppAttributeDeclaration/%.4/%">
-      <details key="start" value="811"/>
-      <details key="end" value="825"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/CppAttributeDeclaration/%.4/%/attribute">
-      <details key="start" value="811"/>
-      <details key="end" value="820"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/CppAttributeDeclaration/%.5">
-      <details key="start" value="847"/>
-      <details key="end" value="855"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/CppAttributeDeclaration/%.5/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/CppAttributeDeclaration/%.6">
-      <details key="start" value="858"/>
-      <details key="end" value="866"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/CppAttributeDeclaration/%.6/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/CppAttributeDeclaration/%.7">
-      <details key="start" value="868"/>
-      <details key="end" value="869"/>
-      <details key="line" value="21"/>
-    </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/CppAttributeDeclaration/%.8">
-      <details key="start" value="870"/>
-      <details key="end" value="884"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/CppAttributeDeclaration/%.8/attribute">
-      <details key="start" value="870"/>
-      <details key="end" value="879"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/CppAttributeDeclaration/%.9">
-      <details key="start" value="887"/>
-      <details key="end" value="897"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/CppAttributeDeclaration/%.9/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/CppAttributeDeclaration/%.10">
-      <details key="start" value="899"/>
-      <details key="end" value="955"/>
-      <details key="line" value="21"/>
-    </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/CppAttributeDeclaration/%.10/%">
-      <details key="start" value="934"/>
-      <details key="end" value="948"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/CppAttributeDeclaration/%.10/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.43" references="/0/CppAttributeDeclaration/%.10/%.1">
-      <details key="start" value="903"/>
-      <details key="end" value="932"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.44" references="/0/CppAttributeDeclaration/%.10/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.45" references="/0/CppAttributeDeclaration/%.10/%.1/%">
-      <details key="start" value="918"/>
-      <details key="end" value="930"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.46" references="/0/CppAttributeDeclaration/%.11">
-      <details key="start" value="955"/>
-      <details key="end" value="956"/>
-      <details key="line" value="21"/>
-    </eAnnotations>
-    <eAnnotations source="positions.47" references="/0/CppAttributeDeclaration/attribute">
-      <details key="start" value="733"/>
-      <details key="end" value="753"/>
-      <details key="line" value="19"/>
-    </eAnnotations>
-    <eAnnotations source="positions.48" references="/0/CppAttributeImplementation">
-      <details key="start" value="971"/>
-      <details key="end" value="1180"/>
-      <details key="line" value="25"/>
-    </eAnnotations>
-    <eAnnotations source="positions.49" references="/0/CppAttributeImplementation/%">
-      <details key="start" value="1038"/>
-      <details key="end" value="1039"/>
-      <details key="line" value="26"/>
-    </eAnnotations>
-    <eAnnotations source="positions.50" references="/0/CppAttributeImplementation/%.1">
-      <details key="start" value="1040"/>
-      <details key="end" value="1055"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.51" references="/0/CppAttributeImplementation/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.52" references="/0/CppAttributeImplementation/%.2">
-      <details key="start" value="1057"/>
-      <details key="end" value="1059"/>
-      <details key="line" value="27"/>
-    </eAnnotations>
-    <eAnnotations source="positions.53" references="/0/CppAttributeImplementation/%.3">
-      <details key="start" value="1060"/>
-      <details key="end" value="1076"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.54" references="/0/CppAttributeImplementation/%.3/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.55" references="/0/CppAttributeImplementation/%.4">
-      <details key="start" value="1079"/>
-      <details key="end" value="1112"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.56" references="/0/CppAttributeImplementation/%.4/%">
-      <details key="start" value="1079"/>
-      <details key="end" value="1093"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.57" references="/0/CppAttributeImplementation/%.4/%/attribute">
-      <details key="start" value="1079"/>
-      <details key="end" value="1088"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.58" references="/0/CppAttributeImplementation/%.5">
-      <details key="start" value="1115"/>
-      <details key="end" value="1123"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.59" references="/0/CppAttributeImplementation/%.5/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.60" references="/0/CppAttributeImplementation/%.6">
-      <details key="start" value="1126"/>
-      <details key="end" value="1134"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.61" references="/0/CppAttributeImplementation/%.6/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.62" references="/0/CppAttributeImplementation/%.7">
-      <details key="start" value="1136"/>
-      <details key="end" value="1137"/>
-      <details key="line" value="27"/>
-    </eAnnotations>
-    <eAnnotations source="positions.63" references="/0/CppAttributeImplementation/%.8">
-      <details key="start" value="1138"/>
-      <details key="end" value="1152"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.64" references="/0/CppAttributeImplementation/%.8/attribute">
-      <details key="start" value="1138"/>
-      <details key="end" value="1147"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.65" references="/0/CppAttributeImplementation/%.9">
-      <details key="start" value="1155"/>
-      <details key="end" value="1165"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.66" references="/0/CppAttributeImplementation/%.9/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.67" references="/0/CppAttributeImplementation/%.10">
-      <details key="start" value="1167"/>
-      <details key="end" value="1168"/>
-      <details key="line" value="27"/>
-    </eAnnotations>
-    <eAnnotations source="positions.68" references="/0/CppAttributeImplementation/attribute">
-      <details key="start" value="1015"/>
-      <details key="end" value="1035"/>
-      <details key="line" value="25"/>
-    </eAnnotations>
-    <eAnnotations source="positions.69" references="/0/CppStaticAttributeImplementation">
-      <details key="start" value="1182"/>
-      <details key="end" value="1408"/>
-      <details key="line" value="30"/>
-    </eAnnotations>
-    <eAnnotations source="positions.70" references="/0/CppStaticAttributeImplementation/%">
-      <details key="start" value="1256"/>
-      <details key="end" value="1271"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.71" references="/0/CppStaticAttributeImplementation/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.72" references="/0/CppStaticAttributeImplementation/%.1">
-      <details key="start" value="1273"/>
-      <details key="end" value="1274"/>
-      <details key="line" value="32"/>
-    </eAnnotations>
-    <eAnnotations source="positions.73" references="/0/CppStaticAttributeImplementation/%.2">
-      <details key="start" value="1275"/>
-      <details key="end" value="1298"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.74" references="/0/CppStaticAttributeImplementation/%.2/%">
-      <details key="start" value="1275"/>
-      <details key="end" value="1279"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.75" references="/0/CppStaticAttributeImplementation/%.2/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.76" references="/0/CppStaticAttributeImplementation/%.3">
-      <details key="start" value="1301"/>
-      <details key="end" value="1309"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.77" references="/0/CppStaticAttributeImplementation/%.3/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.78" references="/0/CppStaticAttributeImplementation/%.4">
-      <details key="start" value="1312"/>
-      <details key="end" value="1320"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.79" references="/0/CppStaticAttributeImplementation/%.4/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.80" references="/0/CppStaticAttributeImplementation/%.5">
-      <details key="start" value="1322"/>
-      <details key="end" value="1323"/>
-      <details key="line" value="32"/>
-    </eAnnotations>
-    <eAnnotations source="positions.81" references="/0/CppStaticAttributeImplementation/%.6">
-      <details key="start" value="1324"/>
-      <details key="end" value="1344"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.82" references="/0/CppStaticAttributeImplementation/%.6/%">
-      <details key="start" value="1324"/>
-      <details key="end" value="1339"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.83" references="/0/CppStaticAttributeImplementation/%.6/%/attribute">
-      <details key="start" value="1324"/>
-      <details key="end" value="1333"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.84" references="/0/CppStaticAttributeImplementation/%.7">
-      <details key="start" value="1346"/>
-      <details key="end" value="1348"/>
-      <details key="line" value="32"/>
-    </eAnnotations>
-    <eAnnotations source="positions.85" references="/0/CppStaticAttributeImplementation/%.8">
-      <details key="start" value="1349"/>
-      <details key="end" value="1363"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.86" references="/0/CppStaticAttributeImplementation/%.8/attribute">
-      <details key="start" value="1349"/>
-      <details key="end" value="1358"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.87" references="/0/CppStaticAttributeImplementation/%.9">
-      <details key="start" value="1366"/>
-      <details key="end" value="1376"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.88" references="/0/CppStaticAttributeImplementation/%.9/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.89" references="/0/CppStaticAttributeImplementation/%.10">
-      <details key="start" value="1379"/>
-      <details key="end" value="1393"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.90" references="/0/CppStaticAttributeImplementation/%.10/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.91" references="/0/CppStaticAttributeImplementation/%.11">
-      <details key="start" value="1395"/>
-      <details key="end" value="1396"/>
-      <details key="line" value="32"/>
-    </eAnnotations>
-    <eAnnotations source="positions.92" references="/0/CppStaticAttributeImplementation/attribute">
-      <details key="start" value="1232"/>
-      <details key="end" value="1252"/>
-      <details key="line" value="30"/>
-    </eAnnotations>
-    <eAnnotations source="positions.93" references="/0/%">
-      <details key="start" value="1411"/>
-      <details key="end" value="1509"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.94" references="/0/getOwnedAttributes">
-      <details key="start" value="1510"/>
-      <details key="end" value="1953"/>
-      <details key="line" value="38"/>
-    </eAnnotations>
-    <eAnnotations source="positions.95" references="/0/getOwnedAttributes/cl">
-      <details key="start" value="1543"/>
-      <details key="end" value="1558"/>
-      <details key="line" value="38"/>
-    </eAnnotations>
-    <eAnnotations source="positions.96" references="/0/getOwnedAttributes/%">
-      <details key="start" value="1584"/>
-      <details key="end" value="1950"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.97" references="/0/getOwnedAttributes/%/%">
-      <details key="start" value="1587"/>
-      <details key="end" value="1608"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.98" references="/0/getOwnedAttributes/%/%/cl">
-      <details key="start" value="1587"/>
-      <details key="end" value="1589"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.99" references="/0/getOwnedAttributes/%/%/%">
-      <details key="start" value="1602"/>
-      <details key="end" value="1607"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.100" references="/0/getOwnedAttributes/%/%.1">
-      <details key="start" value="1616"/>
-      <details key="end" value="1647"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.101" references="/0/getOwnedAttributes/%/%.1/%">
-      <details key="start" value="1616"/>
-      <details key="end" value="1632"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.102" references="/0/getOwnedAttributes/%/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.103" references="/0/getOwnedAttributes/%/%.1/%/%">
-      <details key="start" value="1626"/>
-      <details key="end" value="1631"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.104" references="/0/getOwnedAttributes/%/%.2">
-      <details key="start" value="1656"/>
-      <details key="end" value="1943"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.105" references="/0/getOwnedAttributes/%/%.2/%">
-      <details key="start" value="1659"/>
-      <details key="end" value="1683"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.106" references="/0/getOwnedAttributes/%/%.2/%/cl">
-      <details key="start" value="1659"/>
-      <details key="end" value="1661"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.107" references="/0/getOwnedAttributes/%/%.2/%/%">
-      <details key="start" value="1674"/>
-      <details key="end" value="1682"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.108" references="/0/getOwnedAttributes/%/%.2/%.1">
-      <details key="start" value="1692"/>
-      <details key="end" value="1726"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.109" references="/0/getOwnedAttributes/%/%.2/%.1/%">
-      <details key="start" value="1692"/>
-      <details key="end" value="1711"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.110" references="/0/getOwnedAttributes/%/%.2/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.111" references="/0/getOwnedAttributes/%/%.2/%.1/%/%">
-      <details key="start" value="1702"/>
-      <details key="end" value="1710"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.112" references="/0/getOwnedAttributes/%/%.2/%.2">
-      <details key="start" value="1737"/>
-      <details key="end" value="1935"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.113" references="/0/getOwnedAttributes/%/%.2/%.2/%">
-      <details key="start" value="1740"/>
-      <details key="end" value="1765"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.114" references="/0/getOwnedAttributes/%/%.2/%.2/%/cl">
-      <details key="start" value="1740"/>
-      <details key="end" value="1742"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.115" references="/0/getOwnedAttributes/%/%.2/%.2/%/%">
-      <details key="start" value="1755"/>
-      <details key="end" value="1764"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.116" references="/0/getOwnedAttributes/%/%.2/%.2/%.1">
-      <details key="start" value="1775"/>
-      <details key="end" value="1810"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.117" references="/0/getOwnedAttributes/%/%.2/%.2/%.1/%">
-      <details key="start" value="1775"/>
-      <details key="end" value="1795"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.118" references="/0/getOwnedAttributes/%/%.2/%.2/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.119" references="/0/getOwnedAttributes/%/%.2/%.2/%.1/%/%">
-      <details key="start" value="1785"/>
-      <details key="end" value="1794"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.120" references="/0/getOwnedAttributes/%/%.2/%.2/%.2">
-      <details key="start" value="1823"/>
-      <details key="end" value="1926"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.121" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%">
-      <details key="start" value="1826"/>
-      <details key="end" value="1848"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.122" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%/cl">
-      <details key="start" value="1826"/>
-      <details key="end" value="1828"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.123" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%/%">
-      <details key="start" value="1841"/>
-      <details key="end" value="1847"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.124" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%.1">
-      <details key="start" value="1859"/>
-      <details key="end" value="1891"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.125" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%.1/%">
-      <details key="start" value="1859"/>
-      <details key="end" value="1876"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.126" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.127" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%.1/%/%">
-      <details key="start" value="1869"/>
-      <details key="end" value="1875"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.128" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%.2">
-      <details key="start" value="1906"/>
-      <details key="end" value="1916"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.129" references="/0/%.1">
-      <details key="start" value="1956"/>
-      <details key="end" value="2105"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.130" references="/0/CppStaticAttributes">
-      <details key="start" value="2107"/>
-      <details key="end" value="2344"/>
-      <details key="line" value="62"/>
-    </eAnnotations>
-    <eAnnotations source="positions.131" references="/0/CppStaticAttributes/%">
-      <details key="start" value="2171"/>
-      <details key="end" value="2194"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.132" references="/0/CppStaticAttributes/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.133" references="/0/CppStaticAttributes/%.1">
-      <details key="start" value="2196"/>
-      <details key="end" value="2197"/>
-      <details key="line" value="64"/>
-    </eAnnotations>
-    <eAnnotations source="positions.134" references="/0/CppStaticAttributes/%.2">
-      <details key="start" value="2197"/>
-      <details key="end" value="2332"/>
-      <details key="line" value="64"/>
-    </eAnnotations>
-    <eAnnotations source="positions.135" references="/0/CppStaticAttributes/%.2/%">
-      <details key="start" value="2227"/>
-      <details key="end" value="2325"/>
-      <details key="line" value="65"/>
-    </eAnnotations>
-    <eAnnotations source="positions.136" references="/0/CppStaticAttributes/%.2/%/%">
-      <details key="start" value="2281"/>
-      <details key="end" value="2315"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.137" references="/0/CppStaticAttributes/%.2/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.138" references="/0/CppStaticAttributes/%.2/%/%.1">
-      <details key="start" value="2317"/>
-      <details key="end" value="2319"/>
-      <details key="line" value="67"/>
-    </eAnnotations>
-    <eAnnotations source="positions.139" references="/0/CppStaticAttributes/%.2/%/%.2">
-      <details key="start" value="2230"/>
-      <details key="end" value="2278"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.140" references="/0/CppStaticAttributes/%.2/%/%.2/%">
-      <details key="start" value="2231"/>
-      <details key="end" value="2239"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.141" references="/0/CppStaticAttributes/%.2/%/%.2/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.142" references="/0/CppStaticAttributes/%.2/%/%.2/%.1">
-      <details key="start" value="2244"/>
-      <details key="end" value="2277"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.143" references="/0/CppStaticAttributes/%.2/%/%.2/%.1/%">
-      <details key="start" value="2249"/>
-      <details key="end" value="2276"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.144" references="/0/CppStaticAttributes/%.2/%/%.2/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.145" references="/0/CppStaticAttributes/%.2/%/%.2/%.1/%/%">
-      <details key="start" value="2263"/>
-      <details key="end" value="2275"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.146" references="/0/CppStaticAttributes/%.2/%.1">
-      <details key="start" value="2203"/>
-      <details key="end" value="2223"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.147" references="/0/CppStaticAttributes/%.2/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.148" references="/0/CppStaticAttributes/classifier">
-      <details key="start" value="2144"/>
-      <details key="end" value="2167"/>
-      <details key="line" value="62"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl
deleted file mode 100644
index d94e14d709b..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl
+++ /dev/null
@@ -1,71 +0,0 @@
-[module CppAttribute('http://www.eclipse.org/uml2/5.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/]
-[import org::eclipse::papyrus::acceleo::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::CppGenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::Modifier/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::Constants/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppDocumentation/]
-
-
-[template public defaultValue(attribute : Property)]
-[if (defaultValue <> null) and isStatic] = [attribute.defaultValue.stringValue()/][/if]
-[/template]
-
-
-[template public staticValue(attribute : Property)]
-[if (attribute.isStatic)]static [/if]
-[/template]
-
-
-[template public CppAttributeDeclaration(attribute : Property)]
-[CppElementDoc()/]
-[staticValue()/][modCVQualifier()/][attribute.type.cppQualifiedName()/][modPtr()/][modRef()/] [attribute.name/][modArray()/][if (hasStereotype(C_Cpp::Const))][defaultValue()/][/if];
-[/template]
-
-
-[template public CppAttributeImplementation(attribute : Property)]
-	[CppElementDoc()/]
-	[modCVQualifier()/][attribute.type.cppQualifiedName()/][modPtr()/][modRef()/] [attribute.name/][modArray()/];
-[/template]
-
-[template public CppStaticAttributeImplementation(attribute : Property)]
-[CppElementDoc()/]
-[type.cppQualifiedName()/][modPtr()/][modRef()/] [attribute.class.name/]::[attribute.name/][modArray()/][defaultValue()/];
-[/template]
-
-
-[comment
-return a list of owned attributes, since this is not supported directly on a classifier/]
-[query public getOwnedAttributes(cl : Classifier) : Sequence(Property) =
-	if cl.oclIsKindOf(Class) then
-		oclAsType(Class).ownedAttribute
-	else
-		if cl.oclIsKindOf(DataType) then
-			oclAsType(DataType).ownedAttribute
-		else
-			if cl.oclIsKindOf(Interface) then
-				oclAsType(Interface).ownedAttribute
-			else
-				if cl.oclIsKindOf(Signal) then
-					oclAsType(Signal).ownedAttribute
-				else
-					Sequence{}
-				endif
-			endif
-		endif
-	endif
-/]
-
-
-[comment
-Loop over attributes. Check that the attribute is not a static const.
-Constant static attributes are declared within the class declaration/] 
-[template public CppStaticAttributes(classifier : Classifier)]
-[constStaticAttributes()/]
-[for (getOwnedAttributes())]
-	[if(isStatic and (not hasStereotype(C_Cpp::Const)))]
-[CppStaticAttributeImplementation()/]
-
-	[/if]
-[/for]
-[/template]
-
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl
deleted file mode 100644
index 6dad5303306..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl
+++ /dev/null
@@ -1,645 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppDocumentation" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::CppDocumentation" endHeaderPosition="65">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppElementDoc" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="/**&#xA; * "/>
-      <body xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/replaceAll">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getComments"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-          </argument>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA; * ">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA; */"/>
-      <parameter name="argument">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppOperationDoc" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="/**&#xA; * "/>
-      <body xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/replaceAll">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getComments"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/11">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-          </argument>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA; * ">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA; * "/>
-      <body xsi:type="mtl:ForBlock">
-        <body xsi:type="mtl:TemplateInvocation" definition="/0/CppParamDoc">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/15">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-          </argument>
-        </body>
-        <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/12/OrderedSet(Parameter)">
-          <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/13">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-          </source>
-          <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
-        </iterSet>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA; */"/>
-      <parameter name="operation">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppBehaviorDoc" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="/**&#xA; * "/>
-      <body xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/replaceAll">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getComments"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/22">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-          </argument>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA; * ">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA; * "/>
-      <body xsi:type="mtl:ForBlock">
-        <body xsi:type="mtl:TemplateInvocation" definition="/0/CppParamDoc">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/25">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-          </argument>
-        </body>
-        <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/12/OrderedSet(Parameter)">
-          <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/23">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-          </source>
-          <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/ownedParameter"/>
-        </iterSet>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA; */"/>
-      <parameter name="behavior">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppParamDoc" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="@param "/>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
-      <body xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/replaceAll">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getComments"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/33">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-          </argument>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA; *    ">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-      </body>
-      <parameter name="parameter">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-      <eOperations name="replaceAll">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="substring">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-        <eParameters name="replacement">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="CppElementDoc">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppElementDoc"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="argument">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppOperationDoc">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppOperationDoc"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppBehaviorDoc">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppBehaviorDoc"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="behavior">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppParamDoc">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppParamDoc"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="parameter">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getComments">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getComments"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Parameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(Parameter)" instanceClassName="java.util.LinkedHashSet">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/CppElementDoc">
-      <details key="start" value="121"/>
-      <details key="end" value="238"/>
-      <details key="line" value="5"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/CppElementDoc/%">
-      <details key="start" value="173"/>
-      <details key="end" value="180"/>
-      <details key="line" value="6"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/CppElementDoc/%.1">
-      <details key="start" value="181"/>
-      <details key="end" value="220"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/CppElementDoc/%.1/%">
-      <details key="start" value="181"/>
-      <details key="end" value="194"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/CppElementDoc/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/CppElementDoc/%.1/%.1">
-      <details key="start" value="206"/>
-      <details key="end" value="210"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/CppElementDoc/%.1/%.2">
-      <details key="start" value="212"/>
-      <details key="end" value="219"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/CppElementDoc/%.2">
-      <details key="start" value="222"/>
-      <details key="end" value="226"/>
-      <details key="line" value="8"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/CppElementDoc/argument">
-      <details key="start" value="152"/>
-      <details key="end" value="170"/>
-      <details key="line" value="5"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/CppOperationDoc">
-      <details key="start" value="241"/>
-      <details key="end" value="411"/>
-      <details key="line" value="12"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/CppOperationDoc/%">
-      <details key="start" value="298"/>
-      <details key="end" value="305"/>
-      <details key="line" value="13"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/CppOperationDoc/%.1">
-      <details key="start" value="306"/>
-      <details key="end" value="345"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/CppOperationDoc/%.1/%">
-      <details key="start" value="306"/>
-      <details key="end" value="319"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/CppOperationDoc/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/CppOperationDoc/%.1/%.1">
-      <details key="start" value="331"/>
-      <details key="end" value="335"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/CppOperationDoc/%.1/%.2">
-      <details key="start" value="337"/>
-      <details key="end" value="344"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/CppOperationDoc/%.2">
-      <details key="start" value="347"/>
-      <details key="end" value="351"/>
-      <details key="line" value="15"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/CppOperationDoc/%.3">
-      <details key="start" value="351"/>
-      <details key="end" value="395"/>
-      <details key="line" value="15"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/CppOperationDoc/%.3/%">
-      <details key="start" value="374"/>
-      <details key="end" value="387"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/CppOperationDoc/%.3/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/CppOperationDoc/%.3/%.1">
-      <details key="start" value="357"/>
-      <details key="end" value="371"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/CppOperationDoc/%.3/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/CppOperationDoc/%.4">
-      <details key="start" value="395"/>
-      <details key="end" value="399"/>
-      <details key="line" value="16"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/CppOperationDoc/operation">
-      <details key="start" value="274"/>
-      <details key="end" value="295"/>
-      <details key="line" value="12"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/CppBehaviorDoc">
-      <details key="start" value="414"/>
-      <details key="end" value="581"/>
-      <details key="line" value="20"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/CppBehaviorDoc/%">
-      <details key="start" value="468"/>
-      <details key="end" value="475"/>
-      <details key="line" value="21"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/CppBehaviorDoc/%.1">
-      <details key="start" value="476"/>
-      <details key="end" value="515"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/CppBehaviorDoc/%.1/%">
-      <details key="start" value="476"/>
-      <details key="end" value="489"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/CppBehaviorDoc/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/CppBehaviorDoc/%.1/%.1">
-      <details key="start" value="501"/>
-      <details key="end" value="505"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/CppBehaviorDoc/%.1/%.2">
-      <details key="start" value="507"/>
-      <details key="end" value="514"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/CppBehaviorDoc/%.2">
-      <details key="start" value="517"/>
-      <details key="end" value="521"/>
-      <details key="line" value="23"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/CppBehaviorDoc/%.3">
-      <details key="start" value="521"/>
-      <details key="end" value="565"/>
-      <details key="line" value="23"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/CppBehaviorDoc/%.3/%">
-      <details key="start" value="544"/>
-      <details key="end" value="557"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/CppBehaviorDoc/%.3/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/CppBehaviorDoc/%.3/%.1">
-      <details key="start" value="527"/>
-      <details key="end" value="541"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/CppBehaviorDoc/%.3/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/CppBehaviorDoc/%.4">
-      <details key="start" value="565"/>
-      <details key="end" value="569"/>
-      <details key="line" value="24"/>
-    </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/CppBehaviorDoc/behavior">
-      <details key="start" value="446"/>
-      <details key="end" value="465"/>
-      <details key="line" value="20"/>
-    </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/CppParamDoc">
-      <details key="start" value="584"/>
-      <details key="end" value="709"/>
-      <details key="line" value="28"/>
-    </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/CppParamDoc/%">
-      <details key="start" value="637"/>
-      <details key="end" value="644"/>
-      <details key="line" value="29"/>
-    </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/CppParamDoc/%.1">
-      <details key="start" value="645"/>
-      <details key="end" value="649"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/CppParamDoc/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.43" references="/0/CppParamDoc/%.2">
-      <details key="start" value="651"/>
-      <details key="end" value="652"/>
-      <details key="line" value="29"/>
-    </eAnnotations>
-    <eAnnotations source="positions.44" references="/0/CppParamDoc/%.3">
-      <details key="start" value="653"/>
-      <details key="end" value="695"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.45" references="/0/CppParamDoc/%.3/%">
-      <details key="start" value="653"/>
-      <details key="end" value="666"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.46" references="/0/CppParamDoc/%.3/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.47" references="/0/CppParamDoc/%.3/%.1">
-      <details key="start" value="678"/>
-      <details key="end" value="682"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.48" references="/0/CppParamDoc/%.3/%.2">
-      <details key="start" value="684"/>
-      <details key="end" value="694"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.49" references="/0/CppParamDoc/parameter">
-      <details key="start" value="613"/>
-      <details key="end" value="634"/>
-      <details key="line" value="28"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.mtl
deleted file mode 100644
index c20f8ae17bf..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.mtl
+++ /dev/null
@@ -1,30 +0,0 @@
-[module CppDocumentation('http://www.eclipse.org/uml2/5.0.0/UML')/]
-[import org::eclipse::papyrus::acceleo::GenUtils/]
-
-
-[template public CppElementDoc(argument : Element)]
-/**
- * [getComments().replaceAll('\n', '\n * ')/]
- */
-[/template]
-
-
-[template public CppOperationDoc(operation : Operation)]
-/**
- * [getComments().replaceAll('\n', '\n * ')/]
- * [for (ownedParameter)][CppParamDoc()/][/for]
- */
-[/template]
-
-
-[template public CppBehaviorDoc(behavior : Behavior)]
-/**
- * [getComments().replaceAll('\n', '\n * ')/]
- * [for (ownedParameter)][CppParamDoc()/][/for]
- */
-[/template]
-
-
-[template public CppParamDoc(parameter : Parameter)]
-@param [name/] [getComments().replaceAll('\n', '\n *    ')/]
-[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppEnumerations.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppEnumerations.emtl
deleted file mode 100644
index 9e348de6a52..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppEnumerations.emtl
+++ /dev/null
@@ -1,450 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppEnumerations" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::CppEnumerations" endHeaderPosition="106">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
-    </input>
-    <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="CppDocumentation.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppEnumerationDefinition" visibility="Public">
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="CppDocumentation.emtl#/0/CppElementDoc"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;enum "/>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="enum" referredVariable="/0/CppEnumerationDefinition/enum">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" {&#xA;"/>
-      <body xsi:type="mtl:ForBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#x9;"/>
-        <body xsi:type="mtl:TemplateInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="CppDocumentation.emtl#/0/CppElementDoc"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/11">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//EnumerationLiteral"/>
-          </argument>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#x9;"/>
-        <body xsi:type="ocl.ecore:PropertyCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/12">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//EnumerationLiteral"/>
-          </source>
-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-        </body>
-        <body xsi:type="mtl:IfBlock">
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" = "/>
-          <body xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//Integer"/>
-            <source xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//CppInit"/>
-              <source xsi:type="mtl:QueryInvocation">
-                <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-                <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
-                <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/15">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//EnumerationLiteral"/>
-                </argument>
-                <argument xsi:type="ocl.ecore:TypeExp" eType="/13/CppInit">
-                  <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//CppInit"/>
-                </argument>
-              </source>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/13/CppInit">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//CppInit"/>
-              </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-            </source>
-            <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/papyrus/C_Cpp/1#//CppInit/value"/>
-          </body>
-          <ifExpr xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/14">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//EnumerationLiteral"/>
-            </argument>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/13/CppInit">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//CppInit"/>
-            </argument>
-          </ifExpr>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=",&#xA;"/>
-        <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/8/OrderedSet(EnumerationLiteral)">
-          <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/9">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-          </source>
-          <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration/ownedLiteral"/>
-        </iterSet>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="};&#xA;"/>
-      <parameter name="enum">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="CppEnumerationDefinition">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppEnumerationDefinition"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="enum">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="hasStereotype">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="definition">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getApplication">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="arg1">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppElementDoc">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="CppDocumentation.emtl#/0/CppElementDoc"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="argument">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Enumeration_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Parameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(EnumerationLiteral)" instanceClassName="java.util.LinkedHashSet">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//EnumerationLiteral"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//EnumerationLiteral"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//EnumerationLiteral"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//EnumerationLiteral"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="types">
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="CppInit">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//CppInit"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//EnumerationLiteral"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//EnumerationLiteral"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/CppEnumerationDefinition">
-      <details key="start" value="240"/>
-      <details key="end" value="501"/>
-      <details key="line" value="5"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/CppEnumerationDefinition/%">
-      <details key="start" value="304"/>
-      <details key="end" value="319"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/CppEnumerationDefinition/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/CppEnumerationDefinition/%.1">
-      <details key="start" value="321"/>
-      <details key="end" value="327"/>
-      <details key="line" value="7"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/CppEnumerationDefinition/%.2">
-      <details key="start" value="328"/>
-      <details key="end" value="337"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/CppEnumerationDefinition/%.2/enum">
-      <details key="start" value="328"/>
-      <details key="end" value="332"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/CppEnumerationDefinition/%.3">
-      <details key="start" value="339"/>
-      <details key="end" value="342"/>
-      <details key="line" value="7"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/CppEnumerationDefinition/%.4">
-      <details key="start" value="342"/>
-      <details key="end" value="485"/>
-      <details key="line" value="8"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/CppEnumerationDefinition/%.4/%">
-      <details key="start" value="363"/>
-      <details key="end" value="364"/>
-      <details key="line" value="9"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/CppEnumerationDefinition/%.4/%.1">
-      <details key="start" value="365"/>
-      <details key="end" value="380"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/CppEnumerationDefinition/%.4/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/CppEnumerationDefinition/%.4/%.2">
-      <details key="start" value="382"/>
-      <details key="end" value="384"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/CppEnumerationDefinition/%.4/%.3">
-      <details key="start" value="385"/>
-      <details key="end" value="389"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/CppEnumerationDefinition/%.4/%.3/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/CppEnumerationDefinition/%.4/%.4">
-      <details key="start" value="391"/>
-      <details key="end" value="477"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/CppEnumerationDefinition/%.4/%.4/%">
-      <details key="start" value="418"/>
-      <details key="end" value="421"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/CppEnumerationDefinition/%.4/%.4/%.1">
-      <details key="start" value="422"/>
-      <details key="end" value="470"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/CppEnumerationDefinition/%.4/%.4/%.1/%">
-      <details key="start" value="422"/>
-      <details key="end" value="464"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/CppEnumerationDefinition/%.4/%.4/%.1/%/%">
-      <details key="start" value="422"/>
-      <details key="end" value="445"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/CppEnumerationDefinition/%.4/%.4/%.1/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/CppEnumerationDefinition/%.4/%.4/%.1/%/%/%">
-      <details key="start" value="437"/>
-      <details key="end" value="444"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/CppEnumerationDefinition/%.4/%.4/%.1/%/%.1">
-      <details key="start" value="456"/>
-      <details key="end" value="463"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/CppEnumerationDefinition/%.4/%.4/%.2">
-      <details key="start" value="395"/>
-      <details key="end" value="417"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/CppEnumerationDefinition/%.4/%.4/%.2/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/CppEnumerationDefinition/%.4/%.4/%.2/%">
-      <details key="start" value="409"/>
-      <details key="end" value="416"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/CppEnumerationDefinition/%.4/%.5">
-      <details key="start" value="477"/>
-      <details key="end" value="479"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/CppEnumerationDefinition/%.4/%.6">
-      <details key="start" value="348"/>
-      <details key="end" value="360"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/CppEnumerationDefinition/%.4/%.6/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/CppEnumerationDefinition/%.5">
-      <details key="start" value="486"/>
-      <details key="end" value="489"/>
-      <details key="line" value="12"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/CppEnumerationDefinition/enum">
-      <details key="start" value="282"/>
-      <details key="end" value="300"/>
-      <details key="line" value="5"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppEnumerations.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppEnumerations.mtl
deleted file mode 100644
index f66666b9517..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppEnumerations.mtl
+++ /dev/null
@@ -1,14 +0,0 @@
-[module CppEnumerations('http://www.eclipse.org/uml2/5.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/]
-[import org::eclipse::papyrus::acceleo::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppDocumentation/]
-
-[template public CppEnumerationDefinition(enum : Enumeration)]
-[CppElementDoc()/]
-enum [enum.name/] {
-[for (ownedLiteral)]
-	[CppElementDoc()/]
-	[name/][if hasStereotype(CppInit)] = [getApplication(CppInit).oclAsType(CppInit).value/][/if],
-[/for]
-};
-
-[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl
deleted file mode 100644
index 14bdcb4745a..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl
+++ /dev/null
@@ -1,584 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppPrimitiveTypes" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::CppPrimitiveTypes" endHeaderPosition="108">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
-    </input>
-    <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="../../utils/CppGenUtils.emtl#/0"/>
-    <imports href="CppDocumentation.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Comment">
-      <body startPosition="317" endPosition="1131" value="&#xA; * Support two different kinds of primitive types&#xA; * (1) those that are native types of the programming language such as long&#xA; *     For these, no additional definition has to be done and they should be referenced&#xA; *     with their name only&#xA; * (2) those that correspond to a typedef (e.g. typedef long ErrorType). These require&#xA; *     a typedef definition within the package and need to be referenced with their&#xA; *     fully qualified name (e.g. MyPackage::ErrorType)&#xA; * (3) Sometimes the name of the type defined by a typedef does not appear at the end, e.g.&#xA; *     when defining functionPointers such as &quot;typedef int (*HandlerFct) (void*);&quot;&#xA; *&#x9;   (a function with a void* argument returning int)&#xA; *     Support this case via a specific 'typeName' constant that gets replaced by the name of the&#xA; *     type&#xA; */&#xA;"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppPrimitiveTypeDefinition" visibility="Public">
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="CppDocumentation.emtl#/0/CppElementDoc"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="typedef "/>
-        <body xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/replaceAll">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <source xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/>
-              <source xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef"/>
-                <source xsi:type="mtl:QueryInvocation">
-                  <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-                  <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
-                  <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/9">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-                  </argument>
-                  <argument xsi:type="ocl.ecore:TypeExp" eType="/7/Typedef">
-                    <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef"/>
-                  </argument>
-                </source>
-                <argument xsi:type="ocl.ecore:TypeExp" eType="/7/Typedef">
-                  <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef"/>
-                </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-              </source>
-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef/definition"/>
-            </source>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/7/String">
-              <referredType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-          </source>
-          <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="typeName">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="primitiveType" referredVariable="/0/CppPrimitiveTypeDefinition/primitiveType">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-            </source>
-            <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-          </argument>
-        </body>
-        <body xsi:type="mtl:IfBlock">
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
-          <body xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="primitiveType" referredVariable="/0/CppPrimitiveTypeDefinition/primitiveType">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-            </source>
-            <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-          </body>
-          <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/contains">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                <source xsi:type="ocl.ecore:PropertyCallExp">
-                  <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/>
-                  <source xsi:type="ocl.ecore:OperationCallExp">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef"/>
-                    <source xsi:type="mtl:QueryInvocation">
-                      <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-                      <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
-                      <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/10">
-                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-                      </argument>
-                      <argument xsi:type="ocl.ecore:TypeExp" eType="/7/Typedef">
-                        <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef"/>
-                      </argument>
-                    </source>
-                    <argument xsi:type="ocl.ecore:TypeExp" eType="/7/Typedef">
-                      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef"/>
-                    </argument>
-                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-                  </source>
-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef/definition"/>
-                </source>
-                <argument xsi:type="ocl.ecore:TypeExp" eType="/7/String">
-                  <referredType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-              </source>
-              <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="typeName">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              </argument>
-            </source>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/not"/>
-          </ifExpr>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=";&#xA;"/>
-        <ifExpr xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/8">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:TypeExp" eType="/7/Typedef">
-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef"/>
-          </argument>
-        </ifExpr>
-        <else>
-          <body xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="../../utils/CppGenUtils.emtl#/0/getStdtypes"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="primitiveType" referredVariable="/0/CppPrimitiveTypeDefinition/primitiveType">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-            </argument>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=";&#xA;"/>
-        </else>
-      </body>
-      <parameter name="primitiveType">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-      <eOperations name="replaceAll">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="substring">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-        <eParameters name="replacement">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="contains">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="substring">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="CppPrimitiveTypeDefinition">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppPrimitiveTypeDefinition"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="primitiveType">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="hasStereotype">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="definition">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getApplication">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="arg1">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getStdtypes">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../utils/CppGenUtils.emtl#/0/getStdtypes"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppElementDoc">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="CppDocumentation.emtl#/0/CppElementDoc"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="argument">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="VisibilityKind_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Parameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="types">
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Typedef">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="String">
-      <referredType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/%">
-      <details key="start" value="309"/>
-      <details key="end" value="1133"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/CppPrimitiveTypeDefinition">
-      <details key="start" value="1134"/>
-      <details key="end" value="1573"/>
-      <details key="line" value="22"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/CppPrimitiveTypeDefinition/%">
-      <details key="start" value="1211"/>
-      <details key="end" value="1226"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/CppPrimitiveTypeDefinition/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/CppPrimitiveTypeDefinition/%.1">
-      <details key="start" value="1228"/>
-      <details key="end" value="1229"/>
-      <details key="line" value="24"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/CppPrimitiveTypeDefinition/%.2">
-      <details key="start" value="1229"/>
-      <details key="end" value="1561"/>
-      <details key="line" value="24"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/CppPrimitiveTypeDefinition/%.2/%">
-      <details key="start" value="1259"/>
-      <details key="end" value="1267"/>
-      <details key="line" value="25"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/CppPrimitiveTypeDefinition/%.2/%.1">
-      <details key="start" value="1268"/>
-      <details key="end" value="1382"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%">
-      <details key="start" value="1268"/>
-      <details key="end" value="1339"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%/%">
-      <details key="start" value="1268"/>
-      <details key="end" value="1321"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%/%/%">
-      <details key="start" value="1268"/>
-      <details key="end" value="1310"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%/%/%/%">
-      <details key="start" value="1268"/>
-      <details key="end" value="1291"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%/%/%/%/%">
-      <details key="start" value="1283"/>
-      <details key="end" value="1290"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%/%/%/%.1">
-      <details key="start" value="1302"/>
-      <details key="end" value="1309"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%/%.1">
-      <details key="start" value="1332"/>
-      <details key="end" value="1338"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%.1">
-      <details key="start" value="1351"/>
-      <details key="end" value="1361"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%.2">
-      <details key="start" value="1363"/>
-      <details key="end" value="1381"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%.2/primitiveType">
-      <details key="start" value="1363"/>
-      <details key="end" value="1376"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/CppPrimitiveTypeDefinition/%.2/%.2">
-      <details key="start" value="1386"/>
-      <details key="end" value="1516"/>
-      <details key="line" value="26"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%">
-      <details key="start" value="1489"/>
-      <details key="end" value="1490"/>
-      <details key="line" value="26"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.1">
-      <details key="start" value="1491"/>
-      <details key="end" value="1509"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.1/primitiveType">
-      <details key="start" value="1491"/>
-      <details key="end" value="1504"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2">
-      <details key="start" value="1390"/>
-      <details key="end" value="1488"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%">
-      <details key="start" value="1395"/>
-      <details key="end" value="1487"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%">
-      <details key="start" value="1395"/>
-      <details key="end" value="1466"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%/%">
-      <details key="start" value="1395"/>
-      <details key="end" value="1448"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%/%/%">
-      <details key="start" value="1395"/>
-      <details key="end" value="1437"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%/%/%/%">
-      <details key="start" value="1395"/>
-      <details key="end" value="1418"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%/%/%/%/%">
-      <details key="start" value="1410"/>
-      <details key="end" value="1417"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%/%/%/%.1">
-      <details key="start" value="1429"/>
-      <details key="end" value="1436"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%/%.1">
-      <details key="start" value="1459"/>
-      <details key="end" value="1465"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%.1">
-      <details key="start" value="1476"/>
-      <details key="end" value="1486"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/CppPrimitiveTypeDefinition/%.2/%.3">
-      <details key="start" value="1516"/>
-      <details key="end" value="1518"/>
-      <details key="line" value="26"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/CppPrimitiveTypeDefinition/%.2/%.4">
-      <details key="start" value="1233"/>
-      <details key="end" value="1257"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/CppPrimitiveTypeDefinition/%.2/%.4/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/CppPrimitiveTypeDefinition/%.2/%.4/%">
-      <details key="start" value="1248"/>
-      <details key="end" value="1255"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/CppPrimitiveTypeDefinition/%.2/%.5">
-      <details key="start" value="1518"/>
-      <details key="end" value="1556"/>
-      <details key="line" value="27"/>
-    </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/CppPrimitiveTypeDefinition/%.2/%.5/%">
-      <details key="start" value="1526"/>
-      <details key="end" value="1552"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/CppPrimitiveTypeDefinition/%.2/%.5/%/primitiveType">
-      <details key="start" value="1538"/>
-      <details key="end" value="1551"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/CppPrimitiveTypeDefinition/%.2/%.5/%.1">
-      <details key="start" value="1554"/>
-      <details key="end" value="1556"/>
-      <details key="line" value="28"/>
-    </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/CppPrimitiveTypeDefinition/primitiveType">
-      <details key="start" value="1178"/>
-      <details key="end" value="1207"/>
-      <details key="line" value="22"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.mtl
deleted file mode 100644
index 1450157608b..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.mtl
+++ /dev/null
@@ -1,30 +0,0 @@
-[module CppPrimitiveTypes('http://www.eclipse.org/uml2/5.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/]
-[import org::eclipse::papyrus::acceleo::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::CppGenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppDocumentation/]
-
-
-[comment
- * Support two different kinds of primitive types
- * (1) those that are native types of the programming language such as long
- *     For these, no additional definition has to be done and they should be referenced
- *     with their name only
- * (2) those that correspond to a typedef (e.g. typedef long ErrorType). These require
- *     a typedef definition within the package and need to be referenced with their
- *     fully qualified name (e.g. MyPackage::ErrorType)
- * (3) Sometimes the name of the type defined by a typedef does not appear at the end, e.g.
- *     when defining functionPointers such as "typedef int (*HandlerFct) (void*);"
- *	   (a function with a void* argument returning int)
- *     Support this case via a specific 'typeName' constant that gets replaced by the name of the
- *     type
- */
-/]
-[template public CppPrimitiveTypeDefinition(primitiveType : PrimitiveType)]
-[CppElementDoc()/]
-[if (hasStereotype(Typedef))]
-typedef [getApplication(Typedef).oclAsType(Typedef).definition.oclAsType(String).replaceAll('typeName', primitiveType.name)
-	/][if (not getApplication(Typedef).oclAsType(Typedef).definition.oclAsType(String).contains('typeName'))] [primitiveType.name/][/if];
-[else]
-[getStdtypes(primitiveType)/];
-[/if]
-[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppTemplates.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppTemplates.emtl
deleted file mode 100644
index 3b7160af472..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppTemplates.emtl
+++ /dev/null
@@ -1,855 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppTemplates" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::CppTemplates" endHeaderPosition="61">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="../../utils/CppGenUtils.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Query" name="CppTemplateBindingParameter" visibility="Public">
-      <parameter name="tps">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:IfExp">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <condition xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="tps" referredVariable="/0/CppTemplateBindingParameter/tps">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-            </source>
-            <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution/actual"/>
-          </source>
-          <argument xsi:type="ocl.ecore:TypeExp" eType="/4/LiteralInteger">
-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralInteger"/>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
-        </condition>
-        <thenExpression xsi:type="ocl.ecore:PropertyCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralInteger"/>
-            <source xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="tps" referredVariable="/0/CppTemplateBindingParameter/tps">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-              </source>
-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution/actual"/>
-            </source>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/4/LiteralInteger">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralInteger"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-          </source>
-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralInteger/value"/>
-        </thenExpression>
-        <elseExpression xsi:type="ocl.ecore:PropertyCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-            <source xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="tps" referredVariable="/0/CppTemplateBindingParameter/tps">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-              </source>
-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution/actual"/>
-            </source>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/4/NamedElement">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-          </source>
-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-        </elseExpression>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="isTemplate" visibility="Public">
-      <parameter name="class">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <source xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-          <source xsi:type="mtl:QueryInvocation" eType="/8/Collection(TemplateParameter)">
-            <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getTemplateParameters"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/9">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </argument>
-          </source>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)_Class/size"/>
-        </source>
-        <argument xsi:type="ocl.ecore:IntegerLiteralExp" integerSymbol="0">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-        </argument>
-        <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer_Class/%3E"/>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="templateSignature" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="template&lt;"/>
-        <body xsi:type="mtl:ForBlock">
-          <body xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="../../utils/CppGenUtils.emtl#/0/getTemplateTypeName"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/18">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-            </argument>
-          </body>
-          <iterSet xsi:type="mtl:QueryInvocation" eType="/8/Collection(TemplateParameter)">
-            <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getTemplateParameters"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/15">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </argument>
-          </iterSet>
-          <each xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=", ">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          </each>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=">&#xA;"/>
-        <ifExpr xsi:type="mtl:QueryInvocation" definition="/0/isTemplate">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/14">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-        </ifExpr>
-      </body>
-      <parameter name="class">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="templateShortSignature" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;"/>
-        <body xsi:type="mtl:ForBlock">
-          <body xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getTemplateName"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/29">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-            </argument>
-          </body>
-          <iterSet xsi:type="mtl:QueryInvocation" eType="/8/Collection(TemplateParameter)">
-            <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getTemplateParameters"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/26">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </argument>
-          </iterSet>
-          <each xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=", ">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          </each>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="> "/>
-        <ifExpr xsi:type="mtl:QueryInvocation" definition="/0/isTemplate">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/25">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-        </ifExpr>
-      </body>
-      <parameter name="class">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="templateSignature" visibility="Public">
-      <body xsi:type="mtl:TemplateInvocation" definition="/0/templateSignature">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          <source xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/36">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </source>
-            <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>
-          </source>
-          <argument xsi:type="ocl.ecore:TypeExp" eType="/4/Classifier">
-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-        </argument>
-      </body>
-      <parameter name="operation">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="templateShortSignature" visibility="Public">
-      <body xsi:type="mtl:TemplateInvocation" definition="/0/templateShortSignature">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          <source xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/41">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </source>
-            <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>
-          </source>
-          <argument xsi:type="ocl.ecore:TypeExp" eType="/4/Classifier">
-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-        </argument>
-      </body>
-      <parameter name="operation">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="CppTemplateBindingParameter">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppTemplateBindingParameter"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="tps">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="isTemplate">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/isTemplate"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="templateSignature">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/templateSignature"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="templateShortSignature">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/templateShortSignature"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="templateSignature">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/templateSignature.1"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="templateShortSignature">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/templateShortSignature.1"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getTemplateName">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getTemplateName"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getTemplateParameters">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getTemplateParameters"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:CollectionType" href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/3/Collection(TemplateParameter)"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getTemplateTypeName">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../utils/CppGenUtils.emtl#/0/getTemplateTypeName"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameterSubstitution_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="VisibilityKind_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="types">
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="LiteralInteger">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralInteger"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="NamedElement">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Classifier">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:CollectionType" name="Collection(TemplateParameter)">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/CppTemplateBindingParameter">
-      <details key="start" value="183"/>
-      <details key="end" value="420"/>
-      <details key="line" value="6"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/CppTemplateBindingParameter/tps">
-      <details key="start" value="225"/>
-      <details key="end" value="260"/>
-      <details key="line" value="6"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/CppTemplateBindingParameter/%">
-      <details key="start" value="273"/>
-      <details key="end" value="417"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/CppTemplateBindingParameter/%/%">
-      <details key="start" value="276"/>
-      <details key="end" value="316"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/CppTemplateBindingParameter/%/%/%">
-      <details key="start" value="277"/>
-      <details key="end" value="287"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/CppTemplateBindingParameter/%/%/%/tps">
-      <details key="start" value="277"/>
-      <details key="end" value="280"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/CppTemplateBindingParameter/%/%/%.1">
-      <details key="start" value="300"/>
-      <details key="end" value="314"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/CppTemplateBindingParameter/%/%.1">
-      <details key="start" value="323"/>
-      <details key="end" value="365"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/CppTemplateBindingParameter/%/%.1/%">
-      <details key="start" value="323"/>
-      <details key="end" value="359"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/CppTemplateBindingParameter/%/%.1/%/%">
-      <details key="start" value="323"/>
-      <details key="end" value="333"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/CppTemplateBindingParameter/%/%.1/%/%/tps">
-      <details key="start" value="323"/>
-      <details key="end" value="326"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/CppTemplateBindingParameter/%/%.1/%/%.1">
-      <details key="start" value="344"/>
-      <details key="end" value="358"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/CppTemplateBindingParameter/%/%.2">
-      <details key="start" value="372"/>
-      <details key="end" value="411"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/CppTemplateBindingParameter/%/%.2/%">
-      <details key="start" value="372"/>
-      <details key="end" value="406"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/CppTemplateBindingParameter/%/%.2/%/%">
-      <details key="start" value="372"/>
-      <details key="end" value="382"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/CppTemplateBindingParameter/%/%.2/%/%/tps">
-      <details key="start" value="372"/>
-      <details key="end" value="375"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/CppTemplateBindingParameter/%/%.2/%/%.1">
-      <details key="start" value="393"/>
-      <details key="end" value="405"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/isTemplate">
-      <details key="start" value="422"/>
-      <details key="end" value="518"/>
-      <details key="line" value="14"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/isTemplate/class">
-      <details key="start" value="447"/>
-      <details key="end" value="465"/>
-      <details key="line" value="14"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/isTemplate/%">
-      <details key="start" value="480"/>
-      <details key="end" value="515"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/isTemplate/%/%">
-      <details key="start" value="480"/>
-      <details key="end" value="511"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/isTemplate/%/%/%">
-      <details key="start" value="480"/>
-      <details key="end" value="503"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/isTemplate/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/isTemplate/%/%.1">
-      <details key="start" value="514"/>
-      <details key="end" value="515"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/templateSignature">
-      <details key="start" value="521"/>
-      <details key="end" value="700"/>
-      <details key="line" value="19"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/templateSignature/%">
-      <details key="start" value="577"/>
-      <details key="end" value="688"/>
-      <details key="line" value="20"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/templateSignature/%/%">
-      <details key="start" value="595"/>
-      <details key="end" value="604"/>
-      <details key="line" value="21"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/templateSignature/%/%.1">
-      <details key="start" value="604"/>
-      <details key="end" value="681"/>
-      <details key="line" value="21"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/templateSignature/%/%.1/%">
-      <details key="start" value="652"/>
-      <details key="end" value="673"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/templateSignature/%/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/templateSignature/%/%.1/%.1">
-      <details key="start" value="610"/>
-      <details key="end" value="633"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/templateSignature/%/%.1/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/templateSignature/%/%.1/%.2">
-      <details key="start" value="645"/>
-      <details key="end" value="649"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/templateSignature/%/%.2">
-      <details key="start" value="681"/>
-      <details key="end" value="683"/>
-      <details key="line" value="21"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/templateSignature/%/%.3">
-      <details key="start" value="581"/>
-      <details key="end" value="593"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/templateSignature/%/%.3/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/templateSignature/class">
-      <details key="start" value="556"/>
-      <details key="end" value="574"/>
-      <details key="line" value="19"/>
-    </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/templateShortSignature">
-      <details key="start" value="703"/>
-      <details key="end" value="875"/>
-      <details key="line" value="26"/>
-    </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/templateShortSignature/%">
-      <details key="start" value="764"/>
-      <details key="end" value="863"/>
-      <details key="line" value="27"/>
-    </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/templateShortSignature/%/%">
-      <details key="start" value="782"/>
-      <details key="end" value="783"/>
-      <details key="line" value="28"/>
-    </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/templateShortSignature/%/%.1">
-      <details key="start" value="783"/>
-      <details key="end" value="856"/>
-      <details key="line" value="28"/>
-    </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/templateShortSignature/%/%.1/%">
-      <details key="start" value="831"/>
-      <details key="end" value="848"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/templateShortSignature/%/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.43" references="/0/templateShortSignature/%/%.1/%.1">
-      <details key="start" value="789"/>
-      <details key="end" value="812"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.44" references="/0/templateShortSignature/%/%.1/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.45" references="/0/templateShortSignature/%/%.1/%.2">
-      <details key="start" value="824"/>
-      <details key="end" value="828"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.46" references="/0/templateShortSignature/%/%.2">
-      <details key="start" value="856"/>
-      <details key="end" value="858"/>
-      <details key="line" value="28"/>
-    </eAnnotations>
-    <eAnnotations source="positions.47" references="/0/templateShortSignature/%/%.3">
-      <details key="start" value="768"/>
-      <details key="end" value="780"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.48" references="/0/templateShortSignature/%/%.3/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.49" references="/0/templateShortSignature/class">
-      <details key="start" value="743"/>
-      <details key="end" value="761"/>
-      <details key="line" value="26"/>
-    </eAnnotations>
-    <eAnnotations source="positions.50" references="/0/templateSignature.1">
-      <details key="start" value="878"/>
-      <details key="end" value="999"/>
-      <details key="line" value="32"/>
-    </eAnnotations>
-    <eAnnotations source="positions.51" references="/0/templateSignature.1/%">
-      <details key="start" value="938"/>
-      <details key="end" value="985"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.52" references="/0/templateSignature.1/%/%">
-      <details key="start" value="938"/>
-      <details key="end" value="965"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.53" references="/0/templateSignature.1/%/%/%">
-      <details key="start" value="938"/>
-      <details key="end" value="943"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.54" references="/0/templateSignature.1/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.55" references="/0/templateSignature.1/%/%/%.1">
-      <details key="start" value="954"/>
-      <details key="end" value="964"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.56" references="/0/templateSignature.1/operation">
-      <details key="start" value="913"/>
-      <details key="end" value="934"/>
-      <details key="line" value="32"/>
-    </eAnnotations>
-    <eAnnotations source="positions.57" references="/0/templateShortSignature.1">
-      <details key="start" value="1002"/>
-      <details key="end" value="1133"/>
-      <details key="line" value="37"/>
-    </eAnnotations>
-    <eAnnotations source="positions.58" references="/0/templateShortSignature.1/%">
-      <details key="start" value="1067"/>
-      <details key="end" value="1119"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.59" references="/0/templateShortSignature.1/%/%">
-      <details key="start" value="1067"/>
-      <details key="end" value="1094"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.60" references="/0/templateShortSignature.1/%/%/%">
-      <details key="start" value="1067"/>
-      <details key="end" value="1072"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.61" references="/0/templateShortSignature.1/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.62" references="/0/templateShortSignature.1/%/%/%.1">
-      <details key="start" value="1083"/>
-      <details key="end" value="1093"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.63" references="/0/templateShortSignature.1/operation">
-      <details key="start" value="1042"/>
-      <details key="end" value="1063"/>
-      <details key="line" value="37"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppTemplates.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppTemplates.mtl
deleted file mode 100644
index b306948e75d..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppTemplates.mtl
+++ /dev/null
@@ -1,39 +0,0 @@
-[module CppTemplates('http://www.eclipse.org/uml2/5.0.0/UML')/]
-[import org::eclipse::papyrus::acceleo::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::CppGenUtils/]
-
-
-[query public CppTemplateBindingParameter(tps : TemplateParameterSubstitution) : String =
-if (tps.actual.oclIsKindOf(LiteralInteger)) then
-	tps.actual.oclAsType(LiteralInteger).value
-else
-	tps.actual.oclAsType(NamedElement).name
-endif
-/]
-
-[query public isTemplate(class : Classifier) : Boolean =
-	getTemplateParameters()->size() > 0
-/]
-
-
-[template public templateSignature(class : Classifier)]
-[if isTemplate()]
-template<[for (getTemplateParameters()) separator(', ')][getTemplateTypeName()/][/for]>
-[/if]
-[/template]
-
-
-[template public templateShortSignature(class : Classifier)]
-[if isTemplate()]
-<[for (getTemplateParameters()) separator(', ')][getTemplateName()/][/for]> [/if]
-[/template]
-
-
-[template public templateSignature(operation : Operation)]
-[owner.oclAsType(Classifier).templateSignature()/]
-[/template]
-
-
-[template public templateShortSignature(operation : Operation)]
-[owner.oclAsType(Classifier).templateShortSignature()/]
-[/template]
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassAttributesDeclaration.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassAttributesDeclaration.emtl
deleted file mode 100644
index cc99b6c77b0..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassAttributesDeclaration.emtl
+++ /dev/null
@@ -1,259 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppClassAttributesDeclaration" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassAttributesDeclaration" endHeaderPosition="78">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <imports href="../CppAttribute.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppClassAttributesDeclaration" visibility="Public">
-      <body xsi:type="mtl:ForBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#x9;"/>
-        <body xsi:type="mtl:TemplateInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="../CppAttribute.emtl#/0/CppAttributeDeclaration"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/9">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-          </argument>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-        <iterSet xsi:type="ocl.ecore:IteratorExp" name="select" eType="/6/Sequence(Property)">
-          <source xsi:type="mtl:QueryInvocation" eType="/6/Sequence(Property)">
-            <definition href="../CppAttribute.emtl#/0/getOwnedAttributes"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </argument>
-          </source>
-          <body xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppClassAttributesDeclaration/%/select/temp1">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-              </source>
-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
-            </source>
-            <argument xsi:type="ocl.ecore:VariableExp" name="visibilityFilter" referredVariable="/0/CppClassAttributesDeclaration/visibilityFilter">
-              <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/>
-          </body>
-          <iterator xsi:type="ocl.ecore:Variable" name="temp1">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-          </iterator>
-        </iterSet>
-      </body>
-      <parameter name="class">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <parameter name="visibilityFilter">
-        <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="CppClassAttributesDeclaration">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppClassAttributesDeclaration"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-        <eParameters name="visibilityFilter">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppAttributeDeclaration">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../CppAttribute.emtl#/0/CppAttributeDeclaration"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="attribute">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getOwnedAttributes">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../CppAttribute.emtl#/0/getOwnedAttributes"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:SequenceType" href="../CppAttribute.emtl#/3/Sequence(Property)"/>
-        <eParameters name="cl">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Property_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Property)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/CppClassAttributesDeclaration">
-      <details key="start" value="158"/>
-      <details key="end" value="378"/>
-      <details key="line" value="5"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/CppClassAttributesDeclaration/%">
-      <details key="start" value="261"/>
-      <details key="end" value="366"/>
-      <details key="line" value="6"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/CppClassAttributesDeclaration/%/%">
-      <details key="start" value="329"/>
-      <details key="end" value="331"/>
-      <details key="line" value="7"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/CppClassAttributesDeclaration/%/%.1">
-      <details key="start" value="332"/>
-      <details key="end" value="357"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/CppClassAttributesDeclaration/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/CppClassAttributesDeclaration/%/%.2">
-      <details key="start" value="359"/>
-      <details key="end" value="360"/>
-      <details key="line" value="9"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/CppClassAttributesDeclaration/%/select">
-      <details key="start" value="267"/>
-      <details key="end" value="326"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/CppClassAttributesDeclaration/%/select/%">
-      <details key="start" value="267"/>
-      <details key="end" value="287"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/CppClassAttributesDeclaration/%/select/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/CppClassAttributesDeclaration/%/select/%.1">
-      <details key="start" value="296"/>
-      <details key="end" value="325"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/CppClassAttributesDeclaration/%/select/%.1/%">
-      <details key="start" value="296"/>
-      <details key="end" value="306"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/CppClassAttributesDeclaration/%/select/%.1/%/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/CppClassAttributesDeclaration/%/select/%.1/visibilityFilter">
-      <details key="start" value="309"/>
-      <details key="end" value="325"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/CppClassAttributesDeclaration/%/select/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/CppClassAttributesDeclaration/class">
-      <details key="start" value="205"/>
-      <details key="end" value="223"/>
-      <details key="line" value="5"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/CppClassAttributesDeclaration/visibilityFilter">
-      <details key="start" value="225"/>
-      <details key="end" value="258"/>
-      <details key="line" value="5"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassAttributesDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassAttributesDeclaration.mtl
deleted file mode 100644
index bb217ae9c3a..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassAttributesDeclaration.mtl
+++ /dev/null
@@ -1,10 +0,0 @@
-[module CppClassAttributesDeclaration('http://www.eclipse.org/uml2/5.0.0/UML')/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppAttribute/]
-
-
-[template public CppClassAttributesDeclaration(class : Classifier, visibilityFilter : VisibilityKind)]
-[for (getOwnedAttributes()->select(visibility = visibilityFilter))]
-
-	[CppAttributeDeclaration()/]
-[/for]
-[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.emtl
deleted file mode 100644
index f500b4d11f5..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.emtl
+++ /dev/null
@@ -1,417 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppClassFriendDeclaration" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassFriendDeclaration" endHeaderPosition="116">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
-    </input>
-    <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="../../../utils/CppGenUtils.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppClassFriendDeclaration" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="friend class "/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="friend" referredVariable="/0/CppClassFriendDeclaration/friend">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=";"/>
-      <parameter name="friend">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppClassIncludeFriendDeclaration" visibility="Public">
-      <body xsi:type="mtl:ForBlock">
-        <body xsi:type="mtl:IfBlock">
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#x9;&#x9;"/>
-          <body xsi:type="mtl:TemplateInvocation" definition="/0/CppClassFriendDeclaration">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/16">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </argument>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-          <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/15">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-              </argument>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/14/Friend">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Friend"/>
-              </argument>
-            </source>
-            <argument xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="mtl:QueryInvocation">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-                <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/15">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                </argument>
-                <argument xsi:type="ocl.ecore:TypeExp" eType="/14/NoCodeGen">
-                  <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//NoCodeGen"/>
-                </argument>
-              </source>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/not"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
-          </ifExpr>
-        </body>
-        <iterSet xsi:type="mtl:QueryInvocation" eType="/11/Sequence(Classifier)">
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getUsedClassifiers"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/12">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-        </iterSet>
-      </body>
-      <parameter name="class">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="CppClassFriendDeclaration">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppClassFriendDeclaration"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="friend">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassIncludeFriendDeclaration">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppClassIncludeFriendDeclaration"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getUsedClassifiers">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getUsedClassifiers"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:SequenceType" href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/3/Sequence(Classifier)"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="hasStereotype">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="definition">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="cppQualifiedName">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="VisibilityKind_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Classifier)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="types">
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Friend">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Friend"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="NoCodeGen">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//NoCodeGen"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/CppClassFriendDeclaration">
-      <details key="start" value="238"/>
-      <details key="end" value="357"/>
-      <details key="line" value="6"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/CppClassFriendDeclaration/%">
-      <details key="start" value="303"/>
-      <details key="end" value="316"/>
-      <details key="line" value="7"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/CppClassFriendDeclaration/%.1">
-      <details key="start" value="317"/>
-      <details key="end" value="342"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/CppClassFriendDeclaration/%.1/friend">
-      <details key="start" value="317"/>
-      <details key="end" value="323"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/CppClassFriendDeclaration/%.2">
-      <details key="start" value="344"/>
-      <details key="end" value="345"/>
-      <details key="line" value="7"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/CppClassFriendDeclaration/friend">
-      <details key="start" value="281"/>
-      <details key="end" value="300"/>
-      <details key="line" value="6"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/CppClassIncludeFriendDeclaration">
-      <details key="start" value="359"/>
-      <details key="end" value="594"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/CppClassIncludeFriendDeclaration/%">
-      <details key="start" value="430"/>
-      <details key="end" value="582"/>
-      <details key="line" value="11"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/CppClassIncludeFriendDeclaration/%/%">
-      <details key="start" value="460"/>
-      <details key="end" value="575"/>
-      <details key="line" value="12"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/CppClassIncludeFriendDeclaration/%/%/%">
-      <details key="start" value="536"/>
-      <details key="end" value="538"/>
-      <details key="line" value="13"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/CppClassIncludeFriendDeclaration/%/%/%.1">
-      <details key="start" value="539"/>
-      <details key="end" value="566"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/CppClassIncludeFriendDeclaration/%/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/CppClassIncludeFriendDeclaration/%/%/%.2">
-      <details key="start" value="568"/>
-      <details key="end" value="569"/>
-      <details key="line" value="14"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/CppClassIncludeFriendDeclaration/%/%/%.3">
-      <details key="start" value="464"/>
-      <details key="end" value="534"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/CppClassIncludeFriendDeclaration/%/%/%.3/%">
-      <details key="start" value="464"/>
-      <details key="end" value="492"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/CppClassIncludeFriendDeclaration/%/%/%.3/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/CppClassIncludeFriendDeclaration/%/%/%.3/%/%">
-      <details key="start" value="478"/>
-      <details key="end" value="491"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/CppClassIncludeFriendDeclaration/%/%/%.3/%.1">
-      <details key="start" value="497"/>
-      <details key="end" value="534"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/CppClassIncludeFriendDeclaration/%/%/%.3/%.1/%">
-      <details key="start" value="502"/>
-      <details key="end" value="533"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/CppClassIncludeFriendDeclaration/%/%/%.3/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/CppClassIncludeFriendDeclaration/%/%/%.3/%.1/%/%">
-      <details key="start" value="516"/>
-      <details key="end" value="532"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/CppClassIncludeFriendDeclaration/%/%.1">
-      <details key="start" value="436"/>
-      <details key="end" value="456"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/CppClassIncludeFriendDeclaration/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/CppClassIncludeFriendDeclaration/class">
-      <details key="start" value="409"/>
-      <details key="end" value="427"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.mtl
deleted file mode 100644
index 362e4924037..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.mtl
+++ /dev/null
@@ -1,16 +0,0 @@
-[module CppClassFriendDeclaration('http://www.eclipse.org/uml2/5.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/]
-[import org::eclipse::papyrus::acceleo::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::CppGenUtils/]
-
-
-[template public CppClassFriendDeclaration(friend : Classifier)]
-friend class [friend.cppQualifiedName()/];
-[/template]
-
-[template public CppClassIncludeFriendDeclaration(class : Classifier)]
-[for (getUsedClassifiers())]
-	[if hasStereotype(C_Cpp::Friend) and (not hasStereotype(C_Cpp::NoCodeGen))]
-		[CppClassFriendDeclaration()/]
-	[/if]
-[/for]
-[/template]
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.emtl
deleted file mode 100644
index a6f29b07b66..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.emtl
+++ /dev/null
@@ -1,985 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppClassIncludeClassDeclaration" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassIncludeClassDeclaration" endHeaderPosition="122">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
-    </input>
-    <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="../../../utils/CppGenUtils.emtl#/0"/>
-    <imports href="../../../utils/ClassUtils.emtl#/0"/>
-    <imports href="../../CppIncludeUtils.emtl#/0"/>
-    <imports href="CppClassIncludeDeclaration.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Query" name="cppOwnerPackageIncludePath" visibility="Public">
-      <parameter name="pkg">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:IfExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <condition xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="pkg" referredVariable="/0/cppOwnerPackageIncludePath/pkg">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-            </source>
-            <argument xsi:type="ocl.ecore:NullLiteralExp">
-              <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/%3C%3E"/>
-          </source>
-          <argument xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-              </argument>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/5/CppRoot">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//CppRoot"/>
-              </argument>
-            </source>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/not"/>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
-        </condition>
-        <thenExpression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <source xsi:type="mtl:QueryInvocation">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullPath"/>
-                <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-                </argument>
-              </source>
-              <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="/Pkg_">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              </argument>
-            </source>
-            <argument xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="pkg" referredVariable="/0/cppOwnerPackageIncludePath/pkg">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-              </source>
-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-            </argument>
-          </source>
-          <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".h">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          </argument>
-        </thenExpression>
-        <elseExpression xsi:type="ocl.ecore:NullLiteralExp">
-          <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-        </elseExpression>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="CppClassAllIncludes" visibility="Public" type="/3/Sequence(String)">
-      <parameter name="class">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <expression xsi:type="mtl:QueryInvocation" eType="/3/Sequence(String)" definition="/0/cppClassAllIncludes">
-        <argument xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/CppClassAllIncludes/class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-        <argument xsi:type="mtl:QueryInvocation" eType="/3/Sequence(Classifier)">
-          <definition href="../../../utils/ClassUtils.emtl#/0/includedClassifiers"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/9">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-        </argument>
-      </expression>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="CppClassAllIncludesDeclarationBody" visibility="Public" type="/3/Sequence(String)">
-      <parameter name="class">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <expression xsi:type="mtl:QueryInvocation" eType="/3/Sequence(String)" definition="/0/cppClassAllIncludes">
-        <argument xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/CppClassAllIncludesDeclarationBody/class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </argument>
-        <argument xsi:type="mtl:QueryInvocation" eType="/3/Sequence(Classifier)">
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getTypesViaDependencies"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/12">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-        </argument>
-      </expression>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="cppClassAllIncludes" type="/3/Sequence(String)">
-      <parameter name="class">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <parameter name="list" eType="/3/Sequence(Classifier)"/>
-      <expression xsi:type="ocl.ecore:IteratorExp" name="reject" eType="/3/Sequence(OclAny)">
-        <source xsi:type="ocl.ecore:OperationCallExp" eType="/3/Sequence(OclAny)">
-          <source xsi:type="ocl.ecore:IteratorExp" name="collect" eType="/3/Sequence(OclAny)">
-            <source xsi:type="ocl.ecore:VariableExp" name="list" eType="/3/Sequence(Classifier)" referredVariable="/0/cppClassAllIncludes/list"/>
-            <body xsi:type="ocl.ecore:IfExp">
-              <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-              <condition xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                <source xsi:type="ocl.ecore:OperationCallExp">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                  <source xsi:type="ocl.ecore:OperationCallExp">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                    <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/cppClassAllIncludes/reject/%/collect/cl">
-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                    </source>
-                    <argument xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/cppClassAllIncludes/class">
-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                    </argument>
-                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/%3C%3E"/>
-                  </source>
-                  <argument xsi:type="ocl.ecore:OperationCallExp">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                    <source xsi:type="mtl:QueryInvocation">
-                      <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                      <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-                      <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/15">
-                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                      </argument>
-                      <argument xsi:type="ocl.ecore:TypeExp" eType="/5/NoCodeGen">
-                        <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//NoCodeGen"/>
-                      </argument>
-                    </source>
-                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/not"/>
-                  </argument>
-                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
-                </source>
-                <argument xsi:type="mtl:QueryInvocation">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                  <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-                  <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/15">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                  </argument>
-                  <argument xsi:type="ocl.ecore:TypeExp" eType="/5/External">
-                    <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//External"/>
-                  </argument>
-                </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/or"/>
-              </condition>
-              <thenExpression xsi:type="ocl.ecore:IfExp">
-                <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-                <condition xsi:type="ocl.ecore:OperationCallExp">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                  <source xsi:type="ocl.ecore:OperationCallExp">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                    <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/cppClassAllIncludes/reject/%/collect/cl">
-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                    </source>
-                    <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Enumeration">
-                      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-                    </argument>
-                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
-                  </source>
-                  <argument xsi:type="ocl.ecore:OperationCallExp">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                    <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/cppClassAllIncludes/reject/%/collect/cl">
-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                    </source>
-                    <argument xsi:type="ocl.ecore:TypeExp" eType="/5/PrimitiveType">
-                      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-                    </argument>
-                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
-                  </argument>
-                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/or"/>
-                </condition>
-                <thenExpression xsi:type="ocl.ecore:IfExp">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                  <condition xsi:type="ocl.ecore:OperationCallExp">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                    <source xsi:type="ocl.ecore:OperationCallExp">
-                      <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                      <source xsi:type="ocl.ecore:PropertyCallExp">
-                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-                        <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/cppClassAllIncludes/reject/%/collect/cl">
-                          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                        </source>
-                        <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>
-                      </source>
-                      <argument xsi:type="ocl.ecore:NullLiteralExp">
-                        <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-                      </argument>
-                      <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/%3C%3E"/>
-                    </source>
-                    <argument xsi:type="ocl.ecore:OperationCallExp">
-                      <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                      <source xsi:type="ocl.ecore:PropertyCallExp">
-                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-                        <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/cppClassAllIncludes/reject/%/collect/cl">
-                          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                        </source>
-                        <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>
-                      </source>
-                      <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Package">
-                        <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-                      </argument>
-                      <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
-                    </argument>
-                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
-                  </condition>
-                  <thenExpression xsi:type="mtl:QueryInvocation" definition="/0/cppOwnerPackageIncludePath">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                    <argument xsi:type="ocl.ecore:OperationCallExp">
-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-                      <source xsi:type="ocl.ecore:PropertyCallExp">
-                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-                        <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/cppClassAllIncludes/reject/%/collect/cl">
-                          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                        </source>
-                        <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>
-                      </source>
-                      <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Package">
-                        <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-                      </argument>
-                      <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-                    </argument>
-                  </thenExpression>
-                  <elseExpression xsi:type="ocl.ecore:NullLiteralExp">
-                    <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-                  </elseExpression>
-                </thenExpression>
-                <elseExpression xsi:type="mtl:QueryInvocation" eType="/3/Sequence(String)">
-                  <definition href="CppClassIncludeDeclaration.emtl#/0/cppClassIncludes"/>
-                  <argument xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/cppClassAllIncludes/reject/%/collect/cl">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                  </argument>
-                </elseExpression>
-              </thenExpression>
-              <elseExpression xsi:type="ocl.ecore:NullLiteralExp">
-                <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-              </elseExpression>
-            </body>
-            <iterator xsi:type="ocl.ecore:Variable" name="cl">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </iterator>
-          </source>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)_Class/flatten"/>
-        </source>
-        <body xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:VariableExp" name="str" referredVariable="/0/cppClassAllIncludes/reject/str">
-            <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-          </source>
-          <argument xsi:type="ocl.ecore:NullLiteralExp">
-            <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/>
-        </body>
-        <iterator xsi:type="ocl.ecore:Variable" name="str">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </iterator>
-      </expression>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-      <eOperations name="+">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="other">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="cppOwnerPackageIncludePath">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/cppOwnerPackageIncludePath"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="pkg">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassAllIncludes" eType="/3/Sequence(String)">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppClassAllIncludes"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassAllIncludesDeclarationBody" eType="/3/Sequence(String)">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppClassAllIncludesDeclarationBody"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="cppClassAllIncludes" eType="/3/Sequence(String)">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/cppClassAllIncludes"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-        <eParameters name="list" eType="/3/Sequence(Classifier)"/>
-      </eOperations>
-      <eOperations name="getTypesViaDependencies">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getTypesViaDependencies"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:SequenceType" href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/3/Sequence(Classifier)"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getFullPath">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullPath"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="hasStereotype">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="definition">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="includedClassifiers">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../../utils/ClassUtils.emtl#/0/includedClassifiers"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:SequenceType" href="../../../utils/ClassUtils.emtl#/3/Sequence(Classifier)"/>
-        <eParameters name="cl">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="cppClassIncludes">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="CppClassIncludeDeclaration.emtl#/0/cppClassIncludes"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:SequenceType" href="CppClassIncludeDeclaration.emtl#/3/Sequence(String)"/>
-        <eParameters name="ne">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="VisibilityKind_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(String)" instanceClassName="java.util.List">
-      <elementType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Classifier)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OclAny)" instanceClassName="java.util.List">
-      <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="types">
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="CppRoot">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//CppRoot"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="NoCodeGen">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//NoCodeGen"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="External">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//External"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Enumeration">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="PrimitiveType">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Package">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/cppOwnerPackageIncludePath">
-      <details key="start" value="476"/>
-      <details key="end" value="662"/>
-      <details key="line" value="8"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/cppOwnerPackageIncludePath/pkg">
-      <details key="start" value="517"/>
-      <details key="end" value="530"/>
-      <details key="line" value="8"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/cppOwnerPackageIncludePath/%">
-      <details key="start" value="543"/>
-      <details key="end" value="659"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/cppOwnerPackageIncludePath/%/%">
-      <details key="start" value="546"/>
-      <details key="end" value="594"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/cppOwnerPackageIncludePath/%/%/%">
-      <details key="start" value="547"/>
-      <details key="end" value="560"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/cppOwnerPackageIncludePath/%/%/%/pkg">
-      <details key="start" value="548"/>
-      <details key="end" value="551"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/cppOwnerPackageIncludePath/%/%/%/%">
-      <details key="start" value="555"/>
-      <details key="end" value="559"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/cppOwnerPackageIncludePath/%/%/%.1">
-      <details key="start" value="565"/>
-      <details key="end" value="593"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/cppOwnerPackageIncludePath/%/%/%.1/%">
-      <details key="start" value="570"/>
-      <details key="end" value="592"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/cppOwnerPackageIncludePath/%/%/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/cppOwnerPackageIncludePath/%/%/%.1/%/%">
-      <details key="start" value="584"/>
-      <details key="end" value="591"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/cppOwnerPackageIncludePath/%/%.1">
-      <details key="start" value="601"/>
-      <details key="end" value="642"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/cppOwnerPackageIncludePath/%/%.1/%">
-      <details key="start" value="601"/>
-      <details key="end" value="635"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/cppOwnerPackageIncludePath/%/%.1/%/%">
-      <details key="start" value="601"/>
-      <details key="end" value="624"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/cppOwnerPackageIncludePath/%/%.1/%/%/%">
-      <details key="start" value="601"/>
-      <details key="end" value="614"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/cppOwnerPackageIncludePath/%/%.1/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/cppOwnerPackageIncludePath/%/%.1/%/%/%.1">
-      <details key="start" value="617"/>
-      <details key="end" value="624"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/cppOwnerPackageIncludePath/%/%.1/%/%.1">
-      <details key="start" value="627"/>
-      <details key="end" value="635"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/cppOwnerPackageIncludePath/%/%.1/%/%.1/pkg">
-      <details key="start" value="627"/>
-      <details key="end" value="630"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/cppOwnerPackageIncludePath/%/%.1/%.1">
-      <details key="start" value="638"/>
-      <details key="end" value="642"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/cppOwnerPackageIncludePath/%/%.2">
-      <details key="start" value="649"/>
-      <details key="end" value="653"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/CppClassAllIncludes">
-      <details key="start" value="664"/>
-      <details key="end" value="794"/>
-      <details key="line" value="16"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/CppClassAllIncludes/class">
-      <details key="start" value="698"/>
-      <details key="end" value="716"/>
-      <details key="line" value="16"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/CppClassAllIncludes/%">
-      <details key="start" value="740"/>
-      <details key="end" value="791"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/CppClassAllIncludes/%/class">
-      <details key="start" value="761"/>
-      <details key="end" value="766"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/CppClassAllIncludes/%/%">
-      <details key="start" value="768"/>
-      <details key="end" value="789"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/CppClassAllIncludes/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/CppClassAllIncludesDeclarationBody">
-      <details key="start" value="796"/>
-      <details key="end" value="945"/>
-      <details key="line" value="20"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/CppClassAllIncludesDeclarationBody/class">
-      <details key="start" value="845"/>
-      <details key="end" value="863"/>
-      <details key="line" value="20"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/CppClassAllIncludesDeclarationBody/%">
-      <details key="start" value="887"/>
-      <details key="end" value="942"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/CppClassAllIncludesDeclarationBody/%/class">
-      <details key="start" value="908"/>
-      <details key="end" value="913"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/CppClassAllIncludesDeclarationBody/%/%">
-      <details key="start" value="915"/>
-      <details key="end" value="940"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/CppClassAllIncludesDeclarationBody/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/cppClassAllIncludes">
-      <details key="start" value="947"/>
-      <details key="end" value="1484"/>
-      <details key="line" value="24"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/cppClassAllIncludes/class">
-      <details key="start" value="982"/>
-      <details key="end" value="1000"/>
-      <details key="line" value="24"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/cppClassAllIncludes/list">
-      <details key="start" value="1002"/>
-      <details key="end" value="1029"/>
-      <details key="line" value="24"/>
-    </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/cppClassAllIncludes/reject">
-      <details key="start" value="1052"/>
-      <details key="end" value="1481"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/cppClassAllIncludes/reject/%">
-      <details key="start" value="1052"/>
-      <details key="end" value="1453"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/cppClassAllIncludes/reject/%/collect">
-      <details key="start" value="1052"/>
-      <details key="end" value="1442"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/cppClassAllIncludes/reject/%/collect/list">
-      <details key="start" value="1052"/>
-      <details key="end" value="1056"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/cppClassAllIncludes/reject/%/collect/%">
-      <details key="start" value="1073"/>
-      <details key="end" value="1440"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/cppClassAllIncludes/reject/%/collect/%/%">
-      <details key="start" value="1075"/>
-      <details key="end" value="1152"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/cppClassAllIncludes/reject/%/collect/%/%/%">
-      <details key="start" value="1076"/>
-      <details key="end" value="1124"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.43" references="/0/cppClassAllIncludes/reject/%/collect/%/%/%/%">
-      <details key="start" value="1076"/>
-      <details key="end" value="1089"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.44" references="/0/cppClassAllIncludes/reject/%/collect/%/%/%/%/cl">
-      <details key="start" value="1077"/>
-      <details key="end" value="1079"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.45" references="/0/cppClassAllIncludes/reject/%/collect/%/%/%/%/class">
-      <details key="start" value="1083"/>
-      <details key="end" value="1088"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.46" references="/0/cppClassAllIncludes/reject/%/collect/%/%/%/%.1">
-      <details key="start" value="1094"/>
-      <details key="end" value="1124"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.47" references="/0/cppClassAllIncludes/reject/%/collect/%/%/%/%.1/%">
-      <details key="start" value="1099"/>
-      <details key="end" value="1123"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.48" references="/0/cppClassAllIncludes/reject/%/collect/%/%/%/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.49" references="/0/cppClassAllIncludes/reject/%/collect/%/%/%/%.1/%/%">
-      <details key="start" value="1113"/>
-      <details key="end" value="1122"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.50" references="/0/cppClassAllIncludes/reject/%/collect/%/%/%.1">
-      <details key="start" value="1128"/>
-      <details key="end" value="1151"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.51" references="/0/cppClassAllIncludes/reject/%/collect/%/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.52" references="/0/cppClassAllIncludes/reject/%/collect/%/%/%.1/%">
-      <details key="start" value="1142"/>
-      <details key="end" value="1150"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.53" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1">
-      <details key="start" value="1160"/>
-      <details key="end" value="1420"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.54" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%">
-      <details key="start" value="1162"/>
-      <details key="end" value="1224"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.55" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%/%">
-      <details key="start" value="1163"/>
-      <details key="end" value="1190"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.56" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%/%/cl">
-      <details key="start" value="1163"/>
-      <details key="end" value="1165"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.57" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%/%/%">
-      <details key="start" value="1178"/>
-      <details key="end" value="1189"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.58" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%/%.1">
-      <details key="start" value="1194"/>
-      <details key="end" value="1223"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.59" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%/%.1/cl">
-      <details key="start" value="1194"/>
-      <details key="end" value="1196"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.60" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%/%.1/%">
-      <details key="start" value="1209"/>
-      <details key="end" value="1222"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.61" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%.1">
-      <details key="start" value="1233"/>
-      <details key="end" value="1380"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.62" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%.1/%">
-      <details key="start" value="1236"/>
-      <details key="end" value="1288"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.63" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%.1/%/%">
-      <details key="start" value="1237"/>
-      <details key="end" value="1253"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.64" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%.1/%/%/%">
-      <details key="start" value="1237"/>
-      <details key="end" value="1245"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.65" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%.1/%/%/%/cl">
-      <details key="start" value="1237"/>
-      <details key="end" value="1239"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.66" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%.1/%/%/%.1">
-      <details key="start" value="1249"/>
-      <details key="end" value="1253"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.67" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%.1/%/%.1">
-      <details key="start" value="1258"/>
-      <details key="end" value="1287"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.68" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%.1/%/%.1/%">
-      <details key="start" value="1258"/>
-      <details key="end" value="1266"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.69" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%.1/%/%.1/%/cl">
-      <details key="start" value="1258"/>
-      <details key="end" value="1260"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.70" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%.1/%/%.1/%.1">
-      <details key="start" value="1279"/>
-      <details key="end" value="1286"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.71" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%.1/%.1">
-      <details key="start" value="1298"/>
-      <details key="end" value="1354"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.72" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%.1/%.1/%">
-      <details key="start" value="1298"/>
-      <details key="end" value="1325"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.73" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%.1/%.1/%/%">
-      <details key="start" value="1298"/>
-      <details key="end" value="1306"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.74" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%.1/%.1/%/%/cl">
-      <details key="start" value="1298"/>
-      <details key="end" value="1300"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.75" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%.1/%.1/%/%.1">
-      <details key="start" value="1317"/>
-      <details key="end" value="1324"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.76" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%.1/%.2">
-      <details key="start" value="1367"/>
-      <details key="end" value="1371"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.77" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%.2">
-      <details key="start" value="1391"/>
-      <details key="end" value="1412"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.78" references="/0/cppClassAllIncludes/reject/%/collect/%/%.1/%.2/cl">
-      <details key="start" value="1391"/>
-      <details key="end" value="1393"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.79" references="/0/cppClassAllIncludes/reject/%/collect/%/%.2">
-      <details key="start" value="1429"/>
-      <details key="end" value="1433"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.80" references="/0/cppClassAllIncludes/reject/%/collect/cl">
-      <details key="start" value="1067"/>
-      <details key="end" value="1069"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.81" references="/0/cppClassAllIncludes/reject/%.1">
-      <details key="start" value="1469"/>
-      <details key="end" value="1479"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.82" references="/0/cppClassAllIncludes/reject/%.1/str">
-      <details key="start" value="1469"/>
-      <details key="end" value="1472"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.83" references="/0/cppClassAllIncludes/reject/%.1/%">
-      <details key="start" value="1475"/>
-      <details key="end" value="1479"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.84" references="/0/cppClassAllIncludes/reject/str">
-      <details key="start" value="1463"/>
-      <details key="end" value="1466"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl
deleted file mode 100644
index e94ed0680fc..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl
+++ /dev/null
@@ -1,40 +0,0 @@
-[module CppClassIncludeClassDeclaration('http://www.eclipse.org/uml2/5.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/]
-[import org::eclipse::papyrus::acceleo::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::CppGenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::ClassUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::CppIncludeUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassIncludeDeclaration/]
-
-[query public cppOwnerPackageIncludePath(pkg : Package) : String =
-if ((pkg <> null) and (not hasStereotype(CppRoot))) then
-	getFullPath() + '/Pkg_' + pkg.name + '.h'
-else
-	null
-endif
-/]
-
-[query public CppClassAllIncludes(class : Classifier) : Sequence(String) =
-	cppClassAllIncludes( class, includedClassifiers() )
-/]
-
-[query public CppClassAllIncludesDeclarationBody(class : Classifier) : Sequence(String) =
-	cppClassAllIncludes( class, getTypesViaDependencies() )
-/]
-
-[query private cppClassAllIncludes(class : Classifier, list : Sequence(Classifier)) : Sequence(String) =
-list->collect( cl |
-	if((cl <> class) and (not hasStereotype(NoCodeGen)) or hasStereotype(External)) then
-		if(cl.oclIsKindOf(Enumeration) or cl.oclIsKindOf(PrimitiveType)) then
-			if (cl.owner <> null and cl.owner.oclIsKindOf(Package)) then
-				cl.owner.oclAsType(Package).cppOwnerPackageIncludePath()
-			else
-				null
-			endif
-		else
-			cl.cppClassIncludes()
-		endif
-	else
-		null
-	endif
-)->flatten()->reject( str | str = null )
-/]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl
deleted file mode 100644
index 8684b1dd875..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl
+++ /dev/null
@@ -1,763 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppClassIncludeDeclaration" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassIncludeDeclaration" endHeaderPosition="117">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
-    </input>
-    <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="../../CppIncludeUtils.emtl#/0"/>
-    <imports href="../../../preferences/CppCodeGenUtils.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Query" name="includeName" visibility="Public">
-      <parameter name="ne">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:IfExp">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <condition xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Template">
-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Template"/>
-          </argument>
-        </condition>
-        <thenExpression xsi:type="ocl.ecore:PropertyCallExp">
-          <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/>
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Template"/>
-            <source xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-              <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-              </argument>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Template">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Template"/>
-              </argument>
-            </source>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Template">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Template"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-          </source>
-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Template/declaration"/>
-        </thenExpression>
-        <elseExpression xsi:type="ocl.ecore:IfExp">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-          <condition xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-            </argument>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/5/External">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//External"/>
-            </argument>
-          </condition>
-          <thenExpression xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/>
-            <source xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//External"/>
-              <source xsi:type="mtl:QueryInvocation">
-                <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-                <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
-                <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-                </argument>
-                <argument xsi:type="ocl.ecore:TypeExp" eType="/5/External">
-                  <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//External"/>
-                </argument>
-              </source>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/5/External">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//External"/>
-              </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-            </source>
-            <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/papyrus/C_Cpp/1#//External/name"/>
-          </thenExpression>
-          <elseExpression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                  <source xsi:type="mtl:QueryInvocation">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                    <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullPath"/>
-                    <argument xsi:type="ocl.ecore:OperationCallExp">
-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-                      <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-                      </source>
-                      <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/getNearestPackage"/>
-                    </argument>
-                  </source>
-                  <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="/">
-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                  </argument>
-                </source>
-                <argument xsi:type="ocl.ecore:PropertyCallExp">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                  <source xsi:type="ocl.ecore:VariableExp" name="ne" referredVariable="/0/includeName/ne">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-                  </source>
-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-                </argument>
-              </source>
-              <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              </argument>
-            </source>
-            <argument xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="../../../preferences/CppCodeGenUtils.emtl#/0/getHeaderSuffix"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-              </argument>
-            </argument>
-          </elseExpression>
-        </elseExpression>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Comment">
-      <body startPosition="716" endPosition="799" value=" TODO: original code did not use nearest package, if stereotype CppRoot was applied"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="cppClassIncludes" visibility="Public" type="/3/Sequence(String)">
-      <parameter name="ne">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:IfExp">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <condition xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotypeTree"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/9">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:TypeExp" eType="/5/ExternLibrary">
-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ExternLibrary"/>
-          </argument>
-        </condition>
-        <thenExpression xsi:type="ocl.ecore:PropertyCallExp" eType="/3/Set(null)">
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ExternLibrary"/>
-            <source xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-              <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplicationTree"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/9">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-              </argument>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/5/ExternLibrary">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ExternLibrary"/>
-              </argument>
-            </source>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/5/ExternLibrary">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ExternLibrary"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-          </source>
-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ExternLibrary/includes"/>
-        </thenExpression>
-        <elseExpression xsi:type="mtl:QueryInvocation" definition="/0/includeName">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="ne" referredVariable="/0/cppClassIncludes/ne">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-          </argument>
-        </elseExpression>
-      </expression>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppClassIncludeDeclaration" visibility="Public">
-      <body xsi:type="ocl.ecore:IteratorExp" name="collect" eType="/3/Sequence(String)">
-        <source xsi:type="mtl:QueryInvocation" eType="/3/Sequence(String)" definition="/0/cppClassIncludes">
-          <argument xsi:type="ocl.ecore:VariableExp" name="ne" referredVariable="/0/CppClassIncludeDeclaration/ne">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-          </argument>
-        </source>
-        <body xsi:type="mtl:TemplateInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="../../CppIncludeUtils.emtl#/0/IncludeDirective"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppClassIncludeDeclaration/collect/temp1">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          </argument>
-        </body>
-        <iterator xsi:type="ocl.ecore:Variable" name="temp1">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </iterator>
-      </body>
-      <parameter name="ne">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-      <eOperations name="+">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="other">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="includeName">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/includeName"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="ne">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="cppClassIncludes" eType="/3/Sequence(String)">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/cppClassIncludes"/>
-        <eParameters name="ne">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassIncludeDeclaration">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppClassIncludeDeclaration"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="ne">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getFullPath">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullPath"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="hasStereotype">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="definition">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="hasStereotypeTree">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotypeTree"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="definition">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getApplication">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="arg1">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getApplicationTree">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplicationTree"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="arg1">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="IncludeDirective">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../CppIncludeUtils.emtl#/0/IncludeDirective"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="path">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getHeaderSuffix">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../../preferences/CppCodeGenUtils.emtl#/0/getHeaderSuffix"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(String)" instanceClassName="java.util.List">
-      <elementType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(null)" instanceClassName="java.util.Set">
-      <elementType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="types">
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Template">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Template"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="External">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//External"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="ExternLibrary">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ExternLibrary"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/includeName">
-      <details key="start" value="321"/>
-      <details key="end" value="706"/>
-      <details key="line" value="7"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/includeName/ne">
-      <details key="start" value="347"/>
-      <details key="end" value="364"/>
-      <details key="line" value="7"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/includeName/%">
-      <details key="start" value="377"/>
-      <details key="end" value="703"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/includeName/%/%">
-      <details key="start" value="380"/>
-      <details key="end" value="405"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/includeName/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/includeName/%/%/%">
-      <details key="start" value="395"/>
-      <details key="end" value="403"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/includeName/%/%.1">
-      <details key="start" value="412"/>
-      <details key="end" value="468"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/includeName/%/%.1/%">
-      <details key="start" value="412"/>
-      <details key="end" value="456"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/includeName/%/%.1/%/%">
-      <details key="start" value="412"/>
-      <details key="end" value="436"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/includeName/%/%.1/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/includeName/%/%.1/%/%/%">
-      <details key="start" value="427"/>
-      <details key="end" value="435"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/includeName/%/%.1/%/%.1">
-      <details key="start" value="447"/>
-      <details key="end" value="455"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/includeName/%/%.2">
-      <details key="start" value="475"/>
-      <details key="end" value="697"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/includeName/%/%.2/%">
-      <details key="start" value="478"/>
-      <details key="end" value="503"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/includeName/%/%.2/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/includeName/%/%.2/%/%">
-      <details key="start" value="493"/>
-      <details key="end" value="501"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/includeName/%/%.2/%.1">
-      <details key="start" value="509"/>
-      <details key="end" value="558"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/includeName/%/%.2/%.1/%">
-      <details key="start" value="509"/>
-      <details key="end" value="553"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/includeName/%/%.2/%.1/%/%">
-      <details key="start" value="509"/>
-      <details key="end" value="533"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/includeName/%/%.2/%.1/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/includeName/%/%.2/%.1/%/%/%">
-      <details key="start" value="524"/>
-      <details key="end" value="532"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/includeName/%/%.2/%.1/%/%.1">
-      <details key="start" value="544"/>
-      <details key="end" value="552"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/includeName/%/%.2/%.2">
-      <details key="start" value="615"/>
-      <details key="end" value="690"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/includeName/%/%.2/%.2/%">
-      <details key="start" value="615"/>
-      <details key="end" value="670"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/includeName/%/%.2/%.2/%/%">
-      <details key="start" value="615"/>
-      <details key="end" value="664"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/includeName/%/%.2/%.2/%/%/%">
-      <details key="start" value="615"/>
-      <details key="end" value="654"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/includeName/%/%.2/%.2/%/%/%/%">
-      <details key="start" value="615"/>
-      <details key="end" value="648"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/includeName/%/%.2/%.2/%/%/%/%/%">
-      <details key="start" value="615"/>
-      <details key="end" value="634"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/includeName/%/%.2/%.2/%/%/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/includeName/%/%.2/%.2/%/%/%/%.1">
-      <details key="start" value="651"/>
-      <details key="end" value="654"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/includeName/%/%.2/%.2/%/%/%.1">
-      <details key="start" value="657"/>
-      <details key="end" value="664"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/includeName/%/%.2/%.2/%/%/%.1/ne">
-      <details key="start" value="657"/>
-      <details key="end" value="659"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/includeName/%/%.2/%.2/%/%.1">
-      <details key="start" value="667"/>
-      <details key="end" value="670"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/includeName/%/%.2/%.2/%.1">
-      <details key="start" value="673"/>
-      <details key="end" value="690"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/includeName/%/%.2/%.2/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/%">
-      <details key="start" value="708"/>
-      <details key="end" value="801"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/cppClassIncludes">
-      <details key="start" value="802"/>
-      <details key="end" value="1016"/>
-      <details key="line" value="20"/>
-    </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/cppClassIncludes/ne">
-      <details key="start" value="833"/>
-      <details key="end" value="850"/>
-      <details key="line" value="20"/>
-    </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/cppClassIncludes/%">
-      <details key="start" value="873"/>
-      <details key="end" value="1013"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/cppClassIncludes/%/%">
-      <details key="start" value="876"/>
-      <details key="end" value="910"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/cppClassIncludes/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/cppClassIncludes/%/%/%">
-      <details key="start" value="895"/>
-      <details key="end" value="908"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/cppClassIncludes/%/%.1">
-      <details key="start" value="917"/>
-      <details key="end" value="984"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.43" references="/0/cppClassIncludes/%/%.1/%">
-      <details key="start" value="917"/>
-      <details key="end" value="975"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.44" references="/0/cppClassIncludes/%/%.1/%/%">
-      <details key="start" value="917"/>
-      <details key="end" value="950"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.45" references="/0/cppClassIncludes/%/%.1/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.46" references="/0/cppClassIncludes/%/%.1/%/%/%">
-      <details key="start" value="936"/>
-      <details key="end" value="949"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.47" references="/0/cppClassIncludes/%/%.1/%/%.1">
-      <details key="start" value="961"/>
-      <details key="end" value="974"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.48" references="/0/cppClassIncludes/%/%.2">
-      <details key="start" value="991"/>
-      <details key="end" value="1007"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.49" references="/0/cppClassIncludes/%/%.2/ne">
-      <details key="start" value="991"/>
-      <details key="end" value="993"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.50" references="/0/CppClassIncludeDeclaration">
-      <details key="start" value="1018"/>
-      <details key="end" value="1137"/>
-      <details key="line" value="28"/>
-    </eAnnotations>
-    <eAnnotations source="positions.51" references="/0/CppClassIncludeDeclaration/collect">
-      <details key="start" value="1083"/>
-      <details key="end" value="1123"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.52" references="/0/CppClassIncludeDeclaration/collect/%">
-      <details key="start" value="1083"/>
-      <details key="end" value="1104"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.53" references="/0/CppClassIncludeDeclaration/collect/%/ne">
-      <details key="start" value="1083"/>
-      <details key="end" value="1085"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.54" references="/0/CppClassIncludeDeclaration/collect/%.1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.55" references="/0/CppClassIncludeDeclaration/collect/%.1/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.56" references="/0/CppClassIncludeDeclaration/collect/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.57" references="/0/CppClassIncludeDeclaration/ne">
-      <details key="start" value="1062"/>
-      <details key="end" value="1079"/>
-      <details key="line" value="28"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl
deleted file mode 100644
index 71b8d63792c..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl
+++ /dev/null
@@ -1,30 +0,0 @@
-[module CppClassIncludeDeclaration('http://www.eclipse.org/uml2/5.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/]
-[import org::eclipse::papyrus::acceleo::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::CppIncludeUtils/]
-[import org::eclipse::papyrus::cpp::codegen::preferences::CppCodeGenUtils/]
-
-
-[query public includeName(ne : NamedElement) : String =
-if (hasStereotype(Template)) then
-	getApplication(Template).oclAsType(Template).declaration
-else
-	if (hasStereotype(External)) then getApplication(External).oclAsType(External).name
-	else
-		-- standard case (no stereotypes are applied)
-		getNearestPackage().getFullPath() + '/' + ne.name + '.' + getHeaderSuffix()
-	endif
-endif
-/]
-
-[comment TODO: original code did not use nearest package, if stereotype CppRoot was applied/]
-[query public cppClassIncludes(ne : NamedElement) : Sequence(String) =
-if (hasStereotypeTree(ExternLibrary)) then
-	getApplicationTree(ExternLibrary).oclAsType(ExternLibrary).includes
-else
-	ne.includeName()
-endif
-/]
-
-[template public CppClassIncludeDeclaration(ne : NamedElement)]
-[ne.cppClassIncludes().IncludeDirective()/]
-[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.emtl
deleted file mode 100644
index 065063e27cd..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.emtl
+++ /dev/null
@@ -1,754 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppClassInheritedDeclarations" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassInheritedDeclarations" endHeaderPosition="120">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
-    </input>
-    <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="../../../utils/CppGenUtils.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Comment">
-      <body startPosition="249" endPosition="516" value="&#xA;Return a list of relationships that are either Generalizations or InterfaceRealiazations&#xA;and the target does not point to a classifier that has the no-code-gen Stereotype&#xA;TODO: not sure if it makes sense NOT to declare an inheritance, since we do not generate code.&#xA;"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="filteredRelationships" visibility="Public" type="/3/Set(DirectedRelationship)">
-      <parameter name="class">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:IteratorExp" name="select" eType="/3/Set(DirectedRelationship)">
-        <source xsi:type="ocl.ecore:OperationCallExp" eType="/3/Set(DirectedRelationship)">
-          <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </source>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/getSourceDirectedRelationships"/>
-        </source>
-        <body xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/filteredRelationships/select/temp1">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/>
-              </source>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Generalization">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Generalization"/>
-              </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
-            </source>
-            <argument xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/filteredRelationships/select/temp1">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/>
-              </source>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/5/InterfaceRealization">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//InterfaceRealization"/>
-              </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/or"/>
-          </source>
-          <argument xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-              <argument xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-                <source xsi:type="ocl.ecore:OperationCallExp" eType="/3/Sequence(Element)">
-                  <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/Set(Element)">
-                    <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/filteredRelationships/select/temp1">
-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/>
-                    </source>
-                    <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship/target"/>
-                  </source>
-                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Set(T)_Class/asSequence"/>
-                </source>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)_Class/first"/>
-              </argument>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/5/NoCodeGen">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//NoCodeGen"/>
-              </argument>
-            </source>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/not"/>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
-        </body>
-        <iterator xsi:type="ocl.ecore:Variable" name="temp1">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/>
-        </iterator>
-      </expression>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getCppVisibility" visibility="Public">
-      <parameter name="relationship">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Relationship"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:IfExp">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <condition xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/9">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Relationship"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Visibility">
-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Visibility"/>
-          </argument>
-        </condition>
-        <thenExpression xsi:type="ocl.ecore:PropertyCallExp">
-          <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/>
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Visibility"/>
-            <source xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-              <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/9">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Relationship"/>
-              </argument>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Visibility">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Visibility"/>
-              </argument>
-            </source>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Visibility">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Visibility"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-          </source>
-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Visibility/value"/>
-        </thenExpression>
-        <elseExpression xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="public">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </elseExpression>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppClassInheritedDeclarations" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" : "/>
-        <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-            <source xsi:type="mtl:QueryInvocation" eType="/3/Set(DirectedRelationship)" definition="/0/filteredRelationships">
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/14">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-              </argument>
-            </source>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Set(T)_Class/size"/>
-          </source>
-          <argument xsi:type="ocl.ecore:IntegerLiteralExp" integerSymbol="0">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer_Class/%3E"/>
-        </ifExpr>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:ForBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#x9;"/>
-        <body xsi:type="mtl:QueryInvocation" definition="/0/getCppVisibility">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/18">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/>
-          </argument>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
-        <body xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
-          <argument xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            <source xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-              <source xsi:type="ocl.ecore:OperationCallExp" eType="/3/Sequence(Element)">
-                <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/Set(Element)">
-                  <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/19">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/>
-                  </source>
-                  <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship/target"/>
-                </source>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Set(T)_Class/asSequence"/>
-              </source>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)_Class/first"/>
-            </source>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Classifier">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-          </argument>
-        </body>
-        <iterSet xsi:type="mtl:QueryInvocation" eType="/3/Set(DirectedRelationship)" definition="/0/filteredRelationships">
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/15">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-        </iterSet>
-        <each xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=", &#xA;">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </each>
-      </body>
-      <parameter name="class">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="filteredRelationships" eType="/3/Set(DirectedRelationship)">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/filteredRelationships"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getCppVisibility">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getCppVisibility"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="relationship">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Relationship"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassInheritedDeclarations">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppClassInheritedDeclarations"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="hasStereotype">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="definition">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getApplication">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="arg1">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="cppQualifiedName">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Relationship_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Relationship"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="VisibilityKind_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(DirectedRelationship)" instanceClassName="java.util.Set">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(Element)" instanceClassName="java.util.Set">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Element)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="types">
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Generalization">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Generalization"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="InterfaceRealization">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//InterfaceRealization"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="NoCodeGen">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//NoCodeGen"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Visibility">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Visibility"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Classifier">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Relationship"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Relationship"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/%">
-      <details key="start" value="241"/>
-      <details key="end" value="518"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/filteredRelationships">
-      <details key="start" value="519"/>
-      <details key="end" value="790"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/filteredRelationships/class">
-      <details key="start" value="555"/>
-      <details key="end" value="573"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/filteredRelationships/select">
-      <details key="start" value="606"/>
-      <details key="end" value="786"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/filteredRelationships/select/%">
-      <details key="start" value="606"/>
-      <details key="end" value="638"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/filteredRelationships/select/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/filteredRelationships/select/%.1">
-      <details key="start" value="650"/>
-      <details key="end" value="783"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/filteredRelationships/select/%.1/%">
-      <details key="start" value="650"/>
-      <details key="end" value="716"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/filteredRelationships/select/%.1/%/%">
-      <details key="start" value="651"/>
-      <details key="end" value="678"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/filteredRelationships/select/%.1/%/%/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/filteredRelationships/select/%.1/%/%/%">
-      <details key="start" value="663"/>
-      <details key="end" value="677"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/filteredRelationships/select/%.1/%/%.1">
-      <details key="start" value="682"/>
-      <details key="end" value="715"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/filteredRelationships/select/%.1/%/%.1/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/filteredRelationships/select/%.1/%/%.1/%">
-      <details key="start" value="694"/>
-      <details key="end" value="714"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/filteredRelationships/select/%.1/%.1">
-      <details key="start" value="723"/>
-      <details key="end" value="783"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/filteredRelationships/select/%.1/%.1/%">
-      <details key="start" value="728"/>
-      <details key="end" value="782"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/filteredRelationships/select/%.1/%.1/%/%">
-      <details key="start" value="728"/>
-      <details key="end" value="757"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/filteredRelationships/select/%.1/%.1/%/%/%">
-      <details key="start" value="728"/>
-      <details key="end" value="748"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/filteredRelationships/select/%.1/%.1/%/%/%/%">
-      <details key="start" value="728"/>
-      <details key="end" value="734"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/filteredRelationships/select/%.1/%.1/%/%/%/%/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/filteredRelationships/select/%.1/%.1/%/%.1">
-      <details key="start" value="772"/>
-      <details key="end" value="781"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/filteredRelationships/select/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/getCppVisibility">
-      <details key="start" value="792"/>
-      <details key="end" value="976"/>
-      <details key="line" value="17"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/getCppVisibility/relationship">
-      <details key="start" value="823"/>
-      <details key="end" value="850"/>
-      <details key="line" value="17"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/getCppVisibility/%">
-      <details key="start" value="863"/>
-      <details key="end" value="973"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/getCppVisibility/%/%">
-      <details key="start" value="866"/>
-      <details key="end" value="893"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/getCppVisibility/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/getCppVisibility/%/%/%">
-      <details key="start" value="881"/>
-      <details key="end" value="891"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/getCppVisibility/%/%.1">
-      <details key="start" value="899"/>
-      <details key="end" value="953"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/getCppVisibility/%/%.1/%">
-      <details key="start" value="899"/>
-      <details key="end" value="947"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/getCppVisibility/%/%.1/%/%">
-      <details key="start" value="899"/>
-      <details key="end" value="925"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/getCppVisibility/%/%.1/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/getCppVisibility/%/%.1/%/%/%">
-      <details key="start" value="914"/>
-      <details key="end" value="924"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/getCppVisibility/%/%.1/%/%.1">
-      <details key="start" value="936"/>
-      <details key="end" value="946"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/getCppVisibility/%/%.2">
-      <details key="start" value="959"/>
-      <details key="end" value="967"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/CppClassInheritedDeclarations">
-      <details key="start" value="978"/>
-      <details key="end" value="1262"/>
-      <details key="line" value="21"/>
-    </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/CppClassInheritedDeclarations/%">
-      <details key="start" value="1046"/>
-      <details key="end" value="1096"/>
-      <details key="line" value="22"/>
-    </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/CppClassInheritedDeclarations/%/%">
-      <details key="start" value="1088"/>
-      <details key="end" value="1091"/>
-      <details key="line" value="22"/>
-    </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/CppClassInheritedDeclarations/%/%.1">
-      <details key="start" value="1050"/>
-      <details key="end" value="1087"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/CppClassInheritedDeclarations/%/%.1/%">
-      <details key="start" value="1051"/>
-      <details key="end" value="1082"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/CppClassInheritedDeclarations/%/%.1/%/%">
-      <details key="start" value="1051"/>
-      <details key="end" value="1074"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/CppClassInheritedDeclarations/%/%.1/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/CppClassInheritedDeclarations/%/%.1/%.1">
-      <details key="start" value="1085"/>
-      <details key="end" value="1086"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.43" references="/0/CppClassInheritedDeclarations/%.1">
-      <details key="start" value="1096"/>
-      <details key="end" value="1097"/>
-      <details key="line" value="23"/>
-    </eAnnotations>
-    <eAnnotations source="positions.44" references="/0/CppClassInheritedDeclarations/%.2">
-      <details key="start" value="1097"/>
-      <details key="end" value="1249"/>
-      <details key="line" value="23"/>
-    </eAnnotations>
-    <eAnnotations source="positions.45" references="/0/CppClassInheritedDeclarations/%.2/%">
-      <details key="start" value="1147"/>
-      <details key="end" value="1148"/>
-      <details key="line" value="24"/>
-    </eAnnotations>
-    <eAnnotations source="positions.46" references="/0/CppClassInheritedDeclarations/%.2/%.1">
-      <details key="start" value="1149"/>
-      <details key="end" value="1167"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.47" references="/0/CppClassInheritedDeclarations/%.2/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.48" references="/0/CppClassInheritedDeclarations/%.2/%.2">
-      <details key="start" value="1169"/>
-      <details key="end" value="1170"/>
-      <details key="line" value="24"/>
-    </eAnnotations>
-    <eAnnotations source="positions.49" references="/0/CppClassInheritedDeclarations/%.2/%.3">
-      <details key="start" value="1171"/>
-      <details key="end" value="1241"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.50" references="/0/CppClassInheritedDeclarations/%.2/%.3/%">
-      <details key="start" value="1171"/>
-      <details key="end" value="1222"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.51" references="/0/CppClassInheritedDeclarations/%.2/%.3/%/%">
-      <details key="start" value="1171"/>
-      <details key="end" value="1200"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.52" references="/0/CppClassInheritedDeclarations/%.2/%.3/%/%/%">
-      <details key="start" value="1171"/>
-      <details key="end" value="1191"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.53" references="/0/CppClassInheritedDeclarations/%.2/%.3/%/%/%/%">
-      <details key="start" value="1171"/>
-      <details key="end" value="1177"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.54" references="/0/CppClassInheritedDeclarations/%.2/%.3/%/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.55" references="/0/CppClassInheritedDeclarations/%.2/%.3/%/%.1">
-      <details key="start" value="1211"/>
-      <details key="end" value="1221"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.56" references="/0/CppClassInheritedDeclarations/%.2/%.4">
-      <details key="start" value="1103"/>
-      <details key="end" value="1126"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.57" references="/0/CppClassInheritedDeclarations/%.2/%.4/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.58" references="/0/CppClassInheritedDeclarations/%.2/%.5">
-      <details key="start" value="1138"/>
-      <details key="end" value="1144"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.59" references="/0/CppClassInheritedDeclarations/class">
-      <details key="start" value="1025"/>
-      <details key="end" value="1043"/>
-      <details key="line" value="21"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.mtl
deleted file mode 100644
index 66a0c4d223d..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.mtl
+++ /dev/null
@@ -1,25 +0,0 @@
-[module CppClassInheritedDeclarations('http://www.eclipse.org/uml2/5.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/]
-[import org::eclipse::papyrus::acceleo::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::CppGenUtils/]
-
-[comment
-Return a list of relationships that are either Generalizations or InterfaceRealiazations
-and the target does not point to a classifier that has the no-code-gen Stereotype
-TODO: not sure if it makes sense NOT to declare an inheritance, since we do not generate code.
-/]
-[query public filteredRelationships(class : Classifier) : Set(DirectedRelationship) =
-	getSourceDirectedRelationships()->select(
-		(oclIsKindOf(Generalization) or oclIsKindOf(InterfaceRealization)) and
-		(not target->asSequence()->first().hasStereotype(NoCodeGen))
-	)	
-/]
-
-[query public getCppVisibility(relationship : Relationship) : String =
-if (hasStereotype(Visibility)) then getApplication(Visibility).oclAsType(Visibility).value else 'public' endif
-/]
-
-[template public CppClassInheritedDeclarations(class : Classifier)]
-[if (filteredRelationships()->size() > 0)] : [/if]
-[for (filteredRelationships()) separator(', \n')]
-	[getCppVisibility()/] [target->asSequence()->first().oclAsType(Classifier).cppQualifiedName()/][/for]	
-[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsDeclaration.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsDeclaration.emtl
deleted file mode 100644
index 482c027da43..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsDeclaration.emtl
+++ /dev/null
@@ -1,479 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppClassOperationsDeclaration" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassOperationsDeclaration" endHeaderPosition="78">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <imports href="../operation/CppOperations.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppClassOperationsDeclaration" visibility="Public">
-      <body xsi:type="mtl:ForBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA; &#x9;"/>
-        <body xsi:type="mtl:TemplateInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="../operation/CppOperations.emtl#/0/CppOperationDeclaration"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/9">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-          </argument>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-        <iterSet xsi:type="ocl.ecore:IteratorExp" name="select" eType="/6/Sequence(Operation)">
-          <source xsi:type="mtl:QueryInvocation" eType="/6/Sequence(Operation)">
-            <definition href="../operation/CppOperations.emtl#/0/getOwnedOperations"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </argument>
-          </source>
-          <body xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppClassOperationsDeclaration/%/select/temp1">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-              </source>
-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
-            </source>
-            <argument xsi:type="ocl.ecore:VariableExp" name="visibilityFilter" referredVariable="/0/CppClassOperationsDeclaration/visibilityFilter">
-              <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/>
-          </body>
-          <iterator xsi:type="ocl.ecore:Variable" name="temp1">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-          </iterator>
-        </iterSet>
-      </body>
-      <body xsi:type="mtl:ForBlock">
-        <body xsi:type="mtl:IfBlock">
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#x9;// opaque behavior without specification (typically from state machine)&#xA;&#x9;"/>
-          <body xsi:type="mtl:TemplateInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="../operation/CppOperations.emtl#/0/CppBehaviorDeclaration"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/16">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-            </argument>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-          <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/CppClassOperationsDeclaration/%.1/b">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-              </source>
-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/specification"/>
-            </source>
-            <argument xsi:type="ocl.ecore:NullLiteralExp">
-              <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/>
-          </ifExpr>
-        </body>
-        <loopVariable name="b">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-        </loopVariable>
-        <iterSet xsi:type="ocl.ecore:IteratorExp" name="select" eType="/6/Sequence(OpaqueBehavior)">
-          <source xsi:type="ocl.ecore:OperationCallExp" eType="/6/Sequence(OpaqueBehavior)" referredOperation="/1/EObject_Class/eAllContents">
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/13">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </source>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/12/OpaqueBehavior">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-            </argument>
-          </source>
-          <body xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppClassOperationsDeclaration/%.1/select/temp2">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-              </source>
-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
-            </source>
-            <argument xsi:type="ocl.ecore:VariableExp" name="visibilityFilter" referredVariable="/0/CppClassOperationsDeclaration/visibilityFilter">
-              <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/>
-          </body>
-          <iterator xsi:type="ocl.ecore:Variable" name="temp2">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-          </iterator>
-        </iterSet>
-      </body>
-      <parameter name="class">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <parameter name="visibilityFilter">
-        <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="eAllContents">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
-        <eParameters name="filter">
-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassOperationsDeclaration">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppClassOperationsDeclaration"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-        <eParameters name="visibilityFilter">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getOwnedOperations">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../operation/CppOperations.emtl#/0/getOwnedOperations"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:SequenceType" href="../operation/CppOperations.emtl#/3/Sequence(Operation)"/>
-        <eParameters name="cl">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppOperationDeclaration">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../operation/CppOperations.emtl#/0/CppOperationDeclaration"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppBehaviorDeclaration">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../operation/CppOperations.emtl#/0/CppBehaviorDeclaration"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="behavior">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Operation)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OclAny)" instanceClassName="java.util.List">
-      <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OpaqueBehavior)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="types">
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="OpaqueBehavior">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/CppClassOperationsDeclaration">
-      <details key="start" value="170"/>
-      <details key="end" value="630"/>
-      <details key="line" value="5"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/CppClassOperationsDeclaration/%">
-      <details key="start" value="273"/>
-      <details key="end" value="379"/>
-      <details key="line" value="6"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/CppClassOperationsDeclaration/%/%">
-      <details key="start" value="341"/>
-      <details key="end" value="344"/>
-      <details key="line" value="7"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/CppClassOperationsDeclaration/%/%.1">
-      <details key="start" value="345"/>
-      <details key="end" value="370"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/CppClassOperationsDeclaration/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/CppClassOperationsDeclaration/%/%.2">
-      <details key="start" value="372"/>
-      <details key="end" value="373"/>
-      <details key="line" value="9"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/CppClassOperationsDeclaration/%/select">
-      <details key="start" value="279"/>
-      <details key="end" value="338"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/CppClassOperationsDeclaration/%/select/%">
-      <details key="start" value="279"/>
-      <details key="end" value="299"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/CppClassOperationsDeclaration/%/select/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/CppClassOperationsDeclaration/%/select/%.1">
-      <details key="start" value="308"/>
-      <details key="end" value="337"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/CppClassOperationsDeclaration/%/select/%.1/%">
-      <details key="start" value="308"/>
-      <details key="end" value="318"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/CppClassOperationsDeclaration/%/select/%.1/%/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/CppClassOperationsDeclaration/%/select/%.1/visibilityFilter">
-      <details key="start" value="321"/>
-      <details key="end" value="337"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/CppClassOperationsDeclaration/%/select/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/CppClassOperationsDeclaration/%.1">
-      <details key="start" value="380"/>
-      <details key="end" value="618"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/CppClassOperationsDeclaration/%.1/%">
-      <details key="start" value="472"/>
-      <details key="end" value="611"/>
-      <details key="line" value="11"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/CppClassOperationsDeclaration/%.1/%/%">
-      <details key="start" value="502"/>
-      <details key="end" value="577"/>
-      <details key="line" value="12"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/CppClassOperationsDeclaration/%.1/%/%.1">
-      <details key="start" value="578"/>
-      <details key="end" value="602"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/CppClassOperationsDeclaration/%.1/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/CppClassOperationsDeclaration/%.1/%/%.2">
-      <details key="start" value="604"/>
-      <details key="end" value="605"/>
-      <details key="line" value="15"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/CppClassOperationsDeclaration/%.1/%/%.3">
-      <details key="start" value="476"/>
-      <details key="end" value="500"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/CppClassOperationsDeclaration/%.1/%/%.3/%">
-      <details key="start" value="477"/>
-      <details key="end" value="492"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/CppClassOperationsDeclaration/%.1/%/%.3/%/b">
-      <details key="start" value="477"/>
-      <details key="end" value="478"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/CppClassOperationsDeclaration/%.1/%/%.3/%.1">
-      <details key="start" value="495"/>
-      <details key="end" value="499"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/CppClassOperationsDeclaration/%.1/b">
-      <details key="start" value="386"/>
-      <details key="end" value="398"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/CppClassOperationsDeclaration/%.1/select">
-      <details key="start" value="401"/>
-      <details key="end" value="468"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/CppClassOperationsDeclaration/%.1/select/%">
-      <details key="start" value="401"/>
-      <details key="end" value="429"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/CppClassOperationsDeclaration/%.1/select/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/CppClassOperationsDeclaration/%.1/select/%/%">
-      <details key="start" value="414"/>
-      <details key="end" value="428"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/CppClassOperationsDeclaration/%.1/select/%.1">
-      <details key="start" value="438"/>
-      <details key="end" value="467"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/CppClassOperationsDeclaration/%.1/select/%.1/%">
-      <details key="start" value="438"/>
-      <details key="end" value="448"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/CppClassOperationsDeclaration/%.1/select/%.1/%/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/CppClassOperationsDeclaration/%.1/select/%.1/visibilityFilter">
-      <details key="start" value="451"/>
-      <details key="end" value="467"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/CppClassOperationsDeclaration/%.1/select/temp2">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/CppClassOperationsDeclaration/class">
-      <details key="start" value="217"/>
-      <details key="end" value="235"/>
-      <details key="line" value="5"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/CppClassOperationsDeclaration/visibilityFilter">
-      <details key="start" value="237"/>
-      <details key="end" value="270"/>
-      <details key="line" value="5"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsDeclaration.mtl
deleted file mode 100644
index 513dd1ed446..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsDeclaration.mtl
+++ /dev/null
@@ -1,17 +0,0 @@
-[module CppClassOperationsDeclaration('http://www.eclipse.org/uml2/5.0.0/UML')/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::operation::CppOperations/]
-
-
-[template public CppClassOperationsDeclaration(class : Classifier, visibilityFilter : VisibilityKind)]
-[for (getOwnedOperations()->select(visibility = visibilityFilter))]
-
- 	[CppOperationDeclaration()/]
-[/for]
-[for (b : Behavior | eAllContents(OpaqueBehavior)->select(visibility = visibilityFilter))]
-	[if (b.specification = null)]
-
-	// opaque behavior without specification (typically from state machine)
-	[CppBehaviorDeclaration()/]
-	[/if]
-[/for]
-[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsImplementation.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsImplementation.emtl
deleted file mode 100644
index d81f2c6d816..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsImplementation.emtl
+++ /dev/null
@@ -1,617 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppClassOperationsImplementation" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassOperationsImplementation" endHeaderPosition="123">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
-    </input>
-    <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="../operation/CppOperations.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Comment">
-      <body startPosition="274" endPosition="393" value=" implementations of a classifier, parameter controls whether only inline (or only not inline) operations&#xA;  are produced"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppClassOperationsImplementation" visibility="Public">
-      <body xsi:type="mtl:ForBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-        <body xsi:type="mtl:TemplateInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="../operation/CppOperations.emtl#/0/CppOperationImplementation"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/10">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-          </argument>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-        <iterSet xsi:type="ocl.ecore:IteratorExp" name="select" eType="/6/Sequence(Operation)">
-          <source xsi:type="mtl:QueryInvocation" eType="/6/Sequence(Operation)">
-            <definition href="../operation/CppOperations.emtl#/0/getOwnedOperations"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/8">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </argument>
-          </source>
-          <body xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                <source xsi:type="mtl:QueryInvocation">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                  <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-                  <argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppClassOperationsImplementation/%/select/temp1">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-                  </argument>
-                  <argument xsi:type="ocl.ecore:TypeExp" eType="/7/NoCodeGen">
-                    <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//NoCodeGen"/>
-                  </argument>
-                </source>
-                <argument xsi:type="ocl.ecore:PropertyCallExp">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                  <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppClassOperationsImplementation/%/select/temp1">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-                  </source>
-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/isAbstract"/>
-                </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/or"/>
-              </source>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/not"/>
-            </source>
-            <argument xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="mtl:QueryInvocation">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-                <argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppClassOperationsImplementation/%/select/temp1">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-                </argument>
-                <argument xsi:type="ocl.ecore:TypeExp" eType="/7/Inline">
-                  <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Inline"/>
-                </argument>
-              </source>
-              <argument xsi:type="ocl.ecore:VariableExp" name="inline" referredVariable="/0/CppClassOperationsImplementation/inline">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/="/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
-          </body>
-          <iterator xsi:type="ocl.ecore:Variable" name="temp1">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-          </iterator>
-        </iterSet>
-      </body>
-      <body xsi:type="mtl:ForBlock">
-        <body xsi:type="mtl:IfBlock">
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;// opaque behavior without specification (typically from state machine)&#xA;"/>
-          <body xsi:type="mtl:TemplateInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="../operation/CppOperations.emtl#/0/CppBehaviorImplementation"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/16">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-            </argument>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-          <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/CppClassOperationsImplementation/%.1/b">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-              </source>
-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/specification"/>
-            </source>
-            <argument xsi:type="ocl.ecore:NullLiteralExp">
-              <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/>
-          </ifExpr>
-        </body>
-        <loopVariable name="b">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-        </loopVariable>
-        <iterSet xsi:type="ocl.ecore:IteratorExp" name="select" eType="/6/Sequence(OpaqueBehavior)">
-          <source xsi:type="ocl.ecore:OperationCallExp" eType="/6/Sequence(OpaqueBehavior)" referredOperation="/1/EObject_Class/eAllContents">
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/13">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </source>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/7/OpaqueBehavior">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-            </argument>
-          </source>
-          <body xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppClassOperationsImplementation/%.1/select/temp2">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-              </argument>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/7/Inline">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Inline"/>
-              </argument>
-            </source>
-            <argument xsi:type="ocl.ecore:VariableExp" name="inline" referredVariable="/0/CppClassOperationsImplementation/inline">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/="/>
-          </body>
-          <iterator xsi:type="ocl.ecore:Variable" name="temp2">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-          </iterator>
-        </iterSet>
-      </body>
-      <parameter name="class">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <parameter name="inline">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="eAllContents">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
-        <eParameters name="filter">
-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassOperationsImplementation">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppClassOperationsImplementation"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-        <eParameters name="inline">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="hasStereotype">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="definition">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getOwnedOperations">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../operation/CppOperations.emtl#/0/getOwnedOperations"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:SequenceType" href="../operation/CppOperations.emtl#/3/Sequence(Operation)"/>
-        <eParameters name="cl">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppOperationImplementation">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../operation/CppOperations.emtl#/0/CppOperationImplementation"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppBehaviorImplementation">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../operation/CppOperations.emtl#/0/CppBehaviorImplementation"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="behavior">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Operation)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OclAny)" instanceClassName="java.util.List">
-      <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OpaqueBehavior)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ecore:EPackage name="types">
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="NoCodeGen">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//NoCodeGen"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Inline">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Inline"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="OpaqueBehavior">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/%">
-      <details key="start" value="266"/>
-      <details key="end" value="395"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/CppClassOperationsImplementation">
-      <details key="start" value="396"/>
-      <details key="end" value="929"/>
-      <details key="line" value="8"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/CppClassOperationsImplementation/%">
-      <details key="start" value="485"/>
-      <details key="end" value="658"/>
-      <details key="line" value="9"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/CppClassOperationsImplementation/%/%">
-      <details key="start" value="619"/>
-      <details key="end" value="620"/>
-      <details key="line" value="12"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/CppClassOperationsImplementation/%/%.1">
-      <details key="start" value="621"/>
-      <details key="end" value="649"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/CppClassOperationsImplementation/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/CppClassOperationsImplementation/%/%.2">
-      <details key="start" value="651"/>
-      <details key="end" value="652"/>
-      <details key="line" value="14"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/CppClassOperationsImplementation/%/select">
-      <details key="start" value="491"/>
-      <details key="end" value="616"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/CppClassOperationsImplementation/%/select/%">
-      <details key="start" value="491"/>
-      <details key="end" value="511"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/CppClassOperationsImplementation/%/select/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/CppClassOperationsImplementation/%/select/%.1">
-      <details key="start" value="523"/>
-      <details key="end" value="615"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/CppClassOperationsImplementation/%/select/%.1/%">
-      <details key="start" value="523"/>
-      <details key="end" value="569"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/CppClassOperationsImplementation/%/select/%.1/%/%">
-      <details key="start" value="528"/>
-      <details key="end" value="568"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/CppClassOperationsImplementation/%/select/%.1/%/%/%">
-      <details key="start" value="529"/>
-      <details key="end" value="553"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/CppClassOperationsImplementation/%/select/%.1/%/%/%/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/CppClassOperationsImplementation/%/select/%.1/%/%/%/%">
-      <details key="start" value="543"/>
-      <details key="end" value="552"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/CppClassOperationsImplementation/%/select/%.1/%/%/%.1">
-      <details key="start" value="557"/>
-      <details key="end" value="567"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/CppClassOperationsImplementation/%/select/%.1/%/%/%.1/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/CppClassOperationsImplementation/%/select/%.1/%.1">
-      <details key="start" value="576"/>
-      <details key="end" value="615"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/CppClassOperationsImplementation/%/select/%.1/%.1/%">
-      <details key="start" value="577"/>
-      <details key="end" value="605"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/CppClassOperationsImplementation/%/select/%.1/%.1/%/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/CppClassOperationsImplementation/%/select/%.1/%.1/%/%">
-      <details key="start" value="591"/>
-      <details key="end" value="604"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/CppClassOperationsImplementation/%/select/%.1/%.1/inline">
-      <details key="start" value="608"/>
-      <details key="end" value="614"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/CppClassOperationsImplementation/%/select/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/CppClassOperationsImplementation/%.1">
-      <details key="start" value="659"/>
-      <details key="end" value="917"/>
-      <details key="line" value="15"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/CppClassOperationsImplementation/%.1/%">
-      <details key="start" value="770"/>
-      <details key="end" value="910"/>
-      <details key="line" value="17"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/CppClassOperationsImplementation/%.1/%/%">
-      <details key="start" value="800"/>
-      <details key="end" value="873"/>
-      <details key="line" value="18"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/CppClassOperationsImplementation/%.1/%/%.1">
-      <details key="start" value="874"/>
-      <details key="end" value="901"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/CppClassOperationsImplementation/%.1/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/CppClassOperationsImplementation/%.1/%/%.2">
-      <details key="start" value="903"/>
-      <details key="end" value="904"/>
-      <details key="line" value="21"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/CppClassOperationsImplementation/%.1/%/%.3">
-      <details key="start" value="774"/>
-      <details key="end" value="798"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/CppClassOperationsImplementation/%.1/%/%.3/%">
-      <details key="start" value="775"/>
-      <details key="end" value="790"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/CppClassOperationsImplementation/%.1/%/%.3/%/b">
-      <details key="start" value="775"/>
-      <details key="end" value="776"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/CppClassOperationsImplementation/%.1/%/%.3/%.1">
-      <details key="start" value="793"/>
-      <details key="end" value="797"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/CppClassOperationsImplementation/%.1/b">
-      <details key="start" value="665"/>
-      <details key="end" value="683"/>
-      <details key="line" value="15"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/CppClassOperationsImplementation/%.1/select">
-      <details key="start" value="686"/>
-      <details key="end" value="766"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/CppClassOperationsImplementation/%.1/select/%">
-      <details key="start" value="686"/>
-      <details key="end" value="714"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/CppClassOperationsImplementation/%.1/select/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/CppClassOperationsImplementation/%.1/select/%/%">
-      <details key="start" value="699"/>
-      <details key="end" value="713"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/CppClassOperationsImplementation/%.1/select/%.1">
-      <details key="start" value="726"/>
-      <details key="end" value="765"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/CppClassOperationsImplementation/%.1/select/%.1/%">
-      <details key="start" value="727"/>
-      <details key="end" value="755"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/CppClassOperationsImplementation/%.1/select/%.1/%/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/CppClassOperationsImplementation/%.1/select/%.1/%/%">
-      <details key="start" value="741"/>
-      <details key="end" value="754"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.43" references="/0/CppClassOperationsImplementation/%.1/select/%.1/inline">
-      <details key="start" value="758"/>
-      <details key="end" value="764"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.44" references="/0/CppClassOperationsImplementation/%.1/select/temp2">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.45" references="/0/CppClassOperationsImplementation/class">
-      <details key="start" value="446"/>
-      <details key="end" value="464"/>
-      <details key="line" value="8"/>
-    </eAnnotations>
-    <eAnnotations source="positions.46" references="/0/CppClassOperationsImplementation/inline">
-      <details key="start" value="466"/>
-      <details key="end" value="482"/>
-      <details key="line" value="8"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsImplementation.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsImplementation.mtl
deleted file mode 100644
index 33716ef6e61..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsImplementation.mtl
+++ /dev/null
@@ -1,23 +0,0 @@
-[module CppClassOperationsImplementation('http://www.eclipse.org/uml2/5.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/]
-[import org::eclipse::papyrus::acceleo::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::operation::CppOperations/]
-
-
-[comment implementations of a classifier, parameter controls whether only inline (or only not inline) operations
-  are produced/]
-[template public CppClassOperationsImplementation(class : Classifier, inline : Boolean)]
-[for (getOwnedOperations()->select(
-		(not (hasStereotype(NoCodeGen) or isAbstract)) and
-		(hasStereotype(C_Cpp::Inline) = inline)))]
-
-[CppOperationImplementation()/]
-[/for]
-[for (b : OpaqueBehavior | eAllContents(OpaqueBehavior)->select(
-		(hasStereotype(C_Cpp::Inline) = inline)))]
-	[if (b.specification = null)]
-
-// opaque behavior without specification (typically from state machine)
-[CppBehaviorImplementation()/]
-	[/if]
-[/for]
-[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl
deleted file mode 100644
index 1b7e59c0a31..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl
+++ /dev/null
@@ -1,944 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppClassTypeAndEnum" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassTypeAndEnum" endHeaderPosition="110">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
-    </input>
-    <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="../../../utils/CppGenUtils.emtl#/0"/>
-    <imports href="../CppPrimitiveTypes.emtl#/0"/>
-    <imports href="../CppEnumerations.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Template" name="TypeAndEnumForVisibility" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="mtl:IfBlock">
-          <body xsi:type="mtl:TemplateInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="../CppEnumerations.emtl#/0/CppEnumerationDefinition"/>
-            <argument xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/9">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-              </source>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Enumeration">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-              </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-            </argument>
-          </body>
-          <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/8">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            </source>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Enumeration">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
-          </ifExpr>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-        <body xsi:type="mtl:IfBlock">
-          <body xsi:type="mtl:TemplateInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="../CppPrimitiveTypes.emtl#/0/CppPrimitiveTypeDefinition"/>
-            <argument xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/11">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-              </source>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/6/PrimitiveType">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-              </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-            </argument>
-          </body>
-          <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/10">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-            </source>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/6/PrimitiveType">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
-          </ifExpr>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-        <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="mtl:QueryInvocation">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-                <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-                </argument>
-                <argument xsi:type="ocl.ecore:TypeExp" eType="/6/NoCodeGen">
-                  <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//NoCodeGen"/>
-                </argument>
-              </source>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/not"/>
-            </source>
-            <argument xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-              </source>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Classifier">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-              </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
-          </source>
-          <argument xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-              <source xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-                </source>
-                <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Classifier">
-                  <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-              </source>
-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
-            </source>
-            <argument xsi:type="ocl.ecore:VariableExp" name="visibilityFilter" referredVariable="/0/TypeAndEnumForVisibility/visibilityFilter">
-              <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
-        </ifExpr>
-      </body>
-      <parameter name="element">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-      <parameter name="visibilityFilter">
-        <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="TypesAndEnumsForVisibility" visibility="Public">
-      <body xsi:type="mtl:ForBlock">
-        <body xsi:type="mtl:TemplateInvocation" definition="/0/TypeAndEnumForVisibility">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/19">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:VariableExp" name="visibilityFilter" referredVariable="/0/TypesAndEnumsForVisibility/visibilityFilter">
-            <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-          </argument>
-        </body>
-        <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/16/Set(Element)">
-          <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/17">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/>
-          </source>
-          <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>
-        </iterSet>
-      </body>
-      <parameter name="ne">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/>
-      </parameter>
-      <parameter name="visibilityFilter">
-        <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppClassTypeAndEnum" visibility="Public">
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="    "/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../../utils/CppGenUtils.emtl#/0/getSection"/>
-        <argument xsi:type="ocl.ecore:EnumLiteralExp">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-          <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/public"/>
-        </argument>
-        <argument xsi:type="mtl:TemplateInvocation" definition="/0/TypesAndEnumsForVisibility">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/26">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:EnumLiteralExp">
-            <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-            <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/public"/>
-          </argument>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;    "/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../../utils/CppGenUtils.emtl#/0/getSection"/>
-        <argument xsi:type="ocl.ecore:EnumLiteralExp">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-          <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/protected"/>
-        </argument>
-        <argument xsi:type="mtl:TemplateInvocation" definition="/0/TypesAndEnumsForVisibility">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/27">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:EnumLiteralExp">
-            <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-            <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/protected"/>
-          </argument>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;    "/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../../utils/CppGenUtils.emtl#/0/getSection"/>
-        <argument xsi:type="ocl.ecore:EnumLiteralExp">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-          <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/private"/>
-        </argument>
-        <argument xsi:type="mtl:TemplateInvocation" definition="/0/TypesAndEnumsForVisibility">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/28">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:EnumLiteralExp">
-            <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-            <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/private"/>
-          </argument>
-        </argument>
-      </body>
-      <parameter name="class">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppClassTypeAndEnumPackage" visibility="Public">
-      <body xsi:type="mtl:TemplateInvocation" definition="/0/TypesAndEnumsForVisibility">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/33">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:EnumLiteralExp">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-          <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/package"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation" definition="/0/TypesAndEnumsForVisibility">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/34">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:EnumLiteralExp">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-          <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/public"/>
-        </argument>
-      </body>
-      <parameter name="pkg">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="TypeAndEnumForVisibility">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/TypeAndEnumForVisibility"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="element">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="visibilityFilter">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="TypesAndEnumsForVisibility">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/TypesAndEnumsForVisibility"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="ne">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/>
-        </eParameters>
-        <eParameters name="visibilityFilter">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassTypeAndEnum">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppClassTypeAndEnum"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="class">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppClassTypeAndEnumPackage">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppClassTypeAndEnumPackage"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="pkg">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="hasStereotype">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="definition">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getSection">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../../utils/CppGenUtils.emtl#/0/getSection"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-        </eParameters>
-        <eParameters name="arg1">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppPrimitiveTypeDefinition">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../CppPrimitiveTypes.emtl#/0/CppPrimitiveTypeDefinition"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="primitiveType">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppEnumerationDefinition">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../CppEnumerations.emtl#/0/CppEnumerationDefinition"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="enum">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Namespace_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="VisibilityKind_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Enumeration_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="types">
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="NoCodeGen">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//NoCodeGen"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Classifier">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Enumeration">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="PrimitiveType">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(Element)" instanceClassName="java.util.Set">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/TypeAndEnumForVisibility">
-      <details key="start" value="389"/>
-      <details key="end" value="811"/>
-      <details key="line" value="7"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/TypeAndEnumForVisibility/%">
-      <details key="start" value="486"/>
-      <details key="end" value="799"/>
-      <details key="line" value="8"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/TypeAndEnumForVisibility/%/%">
-      <details key="start" value="606"/>
-      <details key="end" value="696"/>
-      <details key="line" value="9"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/TypeAndEnumForVisibility/%/%/%">
-      <details key="start" value="640"/>
-      <details key="end" value="689"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/TypeAndEnumForVisibility/%/%/%/%">
-      <details key="start" value="640"/>
-      <details key="end" value="662"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/TypeAndEnumForVisibility/%/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/TypeAndEnumForVisibility/%/%/%/%/%">
-      <details key="start" value="650"/>
-      <details key="end" value="661"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/TypeAndEnumForVisibility/%/%/%.1">
-      <details key="start" value="612"/>
-      <details key="end" value="638"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/TypeAndEnumForVisibility/%/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/TypeAndEnumForVisibility/%/%/%.1/%">
-      <details key="start" value="625"/>
-      <details key="end" value="636"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/TypeAndEnumForVisibility/%/%.1">
-      <details key="start" value="696"/>
-      <details key="end" value="697"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/TypeAndEnumForVisibility/%/%.2">
-      <details key="start" value="697"/>
-      <details key="end" value="793"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/TypeAndEnumForVisibility/%/%.2/%">
-      <details key="start" value="733"/>
-      <details key="end" value="786"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/TypeAndEnumForVisibility/%/%.2/%/%">
-      <details key="start" value="733"/>
-      <details key="end" value="757"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/TypeAndEnumForVisibility/%/%.2/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/TypeAndEnumForVisibility/%/%.2/%/%/%">
-      <details key="start" value="743"/>
-      <details key="end" value="756"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/TypeAndEnumForVisibility/%/%.2/%.1">
-      <details key="start" value="703"/>
-      <details key="end" value="731"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/TypeAndEnumForVisibility/%/%.2/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/TypeAndEnumForVisibility/%/%.2/%.1/%">
-      <details key="start" value="716"/>
-      <details key="end" value="729"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/TypeAndEnumForVisibility/%/%.3">
-      <details key="start" value="793"/>
-      <details key="end" value="794"/>
-      <details key="line" value="11"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/TypeAndEnumForVisibility/%/%.4">
-      <details key="start" value="490"/>
-      <details key="end" value="604"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/TypeAndEnumForVisibility/%/%.4/%">
-      <details key="start" value="491"/>
-      <details key="end" value="547"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/TypeAndEnumForVisibility/%/%.4/%/%">
-      <details key="start" value="491"/>
-      <details key="end" value="519"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/TypeAndEnumForVisibility/%/%.4/%/%/%">
-      <details key="start" value="495"/>
-      <details key="end" value="519"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/TypeAndEnumForVisibility/%/%.4/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/TypeAndEnumForVisibility/%/%.4/%/%/%/%">
-      <details key="start" value="509"/>
-      <details key="end" value="518"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/TypeAndEnumForVisibility/%/%.4/%/%.1">
-      <details key="start" value="524"/>
-      <details key="end" value="547"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/TypeAndEnumForVisibility/%/%.4/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/TypeAndEnumForVisibility/%/%.4/%/%.1/%">
-      <details key="start" value="536"/>
-      <details key="end" value="546"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/TypeAndEnumForVisibility/%/%.4/%.1">
-      <details key="start" value="552"/>
-      <details key="end" value="603"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/TypeAndEnumForVisibility/%/%.4/%.1/%">
-      <details key="start" value="552"/>
-      <details key="end" value="584"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/TypeAndEnumForVisibility/%/%.4/%.1/%/%">
-      <details key="start" value="552"/>
-      <details key="end" value="573"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/TypeAndEnumForVisibility/%/%.4/%.1/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/TypeAndEnumForVisibility/%/%.4/%.1/%/%/%">
-      <details key="start" value="562"/>
-      <details key="end" value="572"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/TypeAndEnumForVisibility/%/%.4/%.1/visibilityFilter">
-      <details key="start" value="587"/>
-      <details key="end" value="603"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/TypeAndEnumForVisibility/element">
-      <details key="start" value="431"/>
-      <details key="end" value="448"/>
-      <details key="line" value="7"/>
-    </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/TypeAndEnumForVisibility/visibilityFilter">
-      <details key="start" value="450"/>
-      <details key="end" value="483"/>
-      <details key="line" value="7"/>
-    </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/TypesAndEnumsForVisibility">
-      <details key="start" value="813"/>
-      <details key="end" value="992"/>
-      <details key="line" value="14"/>
-    </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/TypesAndEnumsForVisibility/%">
-      <details key="start" value="909"/>
-      <details key="end" value="980"/>
-      <details key="line" value="15"/>
-    </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/TypesAndEnumsForVisibility/%/%">
-      <details key="start" value="930"/>
-      <details key="end" value="972"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/TypesAndEnumsForVisibility/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/TypesAndEnumsForVisibility/%/%/visibilityFilter">
-      <details key="start" value="955"/>
-      <details key="end" value="971"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/TypesAndEnumsForVisibility/%/%.1">
-      <details key="start" value="915"/>
-      <details key="end" value="927"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.43" references="/0/TypesAndEnumsForVisibility/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.44" references="/0/TypesAndEnumsForVisibility/ne">
-      <details key="start" value="857"/>
-      <details key="end" value="871"/>
-      <details key="line" value="14"/>
-    </eAnnotations>
-    <eAnnotations source="positions.45" references="/0/TypesAndEnumsForVisibility/visibilityFilter">
-      <details key="start" value="873"/>
-      <details key="end" value="906"/>
-      <details key="line" value="14"/>
-    </eAnnotations>
-    <eAnnotations source="positions.46" references="/0/CppClassTypeAndEnum">
-      <details key="start" value="994"/>
-      <details key="end" value="1350"/>
-      <details key="line" value="18"/>
-    </eAnnotations>
-    <eAnnotations source="positions.47" references="/0/CppClassTypeAndEnum/%">
-      <details key="start" value="1052"/>
-      <details key="end" value="1056"/>
-      <details key="line" value="19"/>
-    </eAnnotations>
-    <eAnnotations source="positions.48" references="/0/CppClassTypeAndEnum/%.1">
-      <details key="start" value="1057"/>
-      <details key="end" value="1142"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.49" references="/0/CppClassTypeAndEnum/%.1/%">
-      <details key="start" value="1057"/>
-      <details key="end" value="1079"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.50" references="/0/CppClassTypeAndEnum/%.1/%.1">
-      <details key="start" value="1091"/>
-      <details key="end" value="1141"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.51" references="/0/CppClassTypeAndEnum/%.1/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.52" references="/0/CppClassTypeAndEnum/%.1/%.1/%">
-      <details key="start" value="1118"/>
-      <details key="end" value="1140"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.53" references="/0/CppClassTypeAndEnum/%.2">
-      <details key="start" value="1144"/>
-      <details key="end" value="1149"/>
-      <details key="line" value="20"/>
-    </eAnnotations>
-    <eAnnotations source="positions.54" references="/0/CppClassTypeAndEnum/%.3">
-      <details key="start" value="1150"/>
-      <details key="end" value="1241"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.55" references="/0/CppClassTypeAndEnum/%.3/%">
-      <details key="start" value="1150"/>
-      <details key="end" value="1175"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.56" references="/0/CppClassTypeAndEnum/%.3/%.1">
-      <details key="start" value="1187"/>
-      <details key="end" value="1240"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.57" references="/0/CppClassTypeAndEnum/%.3/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.58" references="/0/CppClassTypeAndEnum/%.3/%.1/%">
-      <details key="start" value="1214"/>
-      <details key="end" value="1239"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.59" references="/0/CppClassTypeAndEnum/%.4">
-      <details key="start" value="1243"/>
-      <details key="end" value="1248"/>
-      <details key="line" value="21"/>
-    </eAnnotations>
-    <eAnnotations source="positions.60" references="/0/CppClassTypeAndEnum/%.5">
-      <details key="start" value="1249"/>
-      <details key="end" value="1336"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.61" references="/0/CppClassTypeAndEnum/%.5/%">
-      <details key="start" value="1249"/>
-      <details key="end" value="1272"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.62" references="/0/CppClassTypeAndEnum/%.5/%.1">
-      <details key="start" value="1284"/>
-      <details key="end" value="1335"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.63" references="/0/CppClassTypeAndEnum/%.5/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.64" references="/0/CppClassTypeAndEnum/%.5/%.1/%">
-      <details key="start" value="1311"/>
-      <details key="end" value="1334"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.65" references="/0/CppClassTypeAndEnum/class">
-      <details key="start" value="1031"/>
-      <details key="end" value="1049"/>
-      <details key="line" value="18"/>
-    </eAnnotations>
-    <eAnnotations source="positions.66" references="/0/CppClassTypeAndEnumPackage">
-      <details key="start" value="1352"/>
-      <details key="end" value="1533"/>
-      <details key="line" value="24"/>
-    </eAnnotations>
-    <eAnnotations source="positions.67" references="/0/CppClassTypeAndEnumPackage/%">
-      <details key="start" value="1413"/>
-      <details key="end" value="1465"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.68" references="/0/CppClassTypeAndEnumPackage/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.69" references="/0/CppClassTypeAndEnumPackage/%/%">
-      <details key="start" value="1440"/>
-      <details key="end" value="1464"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.70" references="/0/CppClassTypeAndEnumPackage/%.1">
-      <details key="start" value="1467"/>
-      <details key="end" value="1468"/>
-      <details key="line" value="26"/>
-    </eAnnotations>
-    <eAnnotations source="positions.71" references="/0/CppClassTypeAndEnumPackage/%.2">
-      <details key="start" value="1469"/>
-      <details key="end" value="1519"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.72" references="/0/CppClassTypeAndEnumPackage/%.2/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.73" references="/0/CppClassTypeAndEnumPackage/%.2/%">
-      <details key="start" value="1496"/>
-      <details key="end" value="1518"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.74" references="/0/CppClassTypeAndEnumPackage/pkg">
-      <details key="start" value="1396"/>
-      <details key="end" value="1409"/>
-      <details key="line" value="24"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.mtl
deleted file mode 100644
index d90230149a4..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.mtl
+++ /dev/null
@@ -1,27 +0,0 @@
-[module CppClassTypeAndEnum('http://www.eclipse.org/uml2/5.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/]
-[import org::eclipse::papyrus::acceleo::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::CppGenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppPrimitiveTypes/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppEnumerations/]
-
-[template public TypeAndEnumForVisibility(element : Element, visibilityFilter : VisibilityKind)]
-[if (not hasStereotype(NoCodeGen) and oclIsKindOf(Classifier) and oclAsType(Classifier).visibility = visibilityFilter)]
-[  if (oclIsKindOf(Enumeration))][oclAsType(Enumeration).CppEnumerationDefinition()/][/if]
-[  if (oclIsKindOf(PrimitiveType))][oclAsType(PrimitiveType).CppPrimitiveTypeDefinition()/][/if]
-[/if]
-[/template]
-
-[template public TypesAndEnumsForVisibility(ne : Namespace, visibilityFilter : VisibilityKind)]
-[for (ownedElement)][TypeAndEnumForVisibility(visibilityFilter)/][/for]
-[/template]
-
-[template public CppClassTypeAndEnum(class : Classifier)]
-    [VisibilityKind::public.getSection(TypesAndEnumsForVisibility(VisibilityKind::public))/]
-    [VisibilityKind::protected.getSection(TypesAndEnumsForVisibility(VisibilityKind::protected))/]
-    [VisibilityKind::private.getSection(TypesAndEnumsForVisibility(VisibilityKind::private))/]
-[/template]
-
-[template public CppClassTypeAndEnumPackage(pkg : Package)]
-[TypesAndEnumsForVisibility(VisibilityKind::_package)/]
-[TypesAndEnumsForVisibility(VisibilityKind::public)/]
-[/template]
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
deleted file mode 100644
index 151d49fa366..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
+++ /dev/null
@@ -1,3554 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppOperations" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::operation::CppOperations" endHeaderPosition="162">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
-    </input>
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard#/"/>
-    </input>
-    <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="../../../utils/CppGenUtils.emtl#/0"/>
-    <imports href="../../../utils/Modifier.emtl#/0"/>
-    <imports href="../CppDocumentation.emtl#/0"/>
-    <imports href="CppParameter.emtl#/0"/>
-    <imports href="../CppTemplates.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Comment">
-      <body startPosition="595" endPosition="683" value="&#xA;return a list of owned operations, since this is not supported directly on a classifier"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getOwnedOperations" visibility="Public" type="/3/Sequence(Operation)">
-      <parameter name="cl">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:IfExp" eType="/3/Collection(Operation)">
-        <condition xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/getOwnedOperations/cl">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-          </source>
-          <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Class">
-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
-        </condition>
-        <thenExpression xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(Operation)">
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </source>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Class">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-          </source>
-          <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
-        </thenExpression>
-        <elseExpression xsi:type="ocl.ecore:IfExp" eType="/3/Collection(Operation)">
-          <condition xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/getOwnedOperations/cl">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </source>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/5/DataType">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
-          </condition>
-          <thenExpression xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(Operation)">
-            <source xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-              </source>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/5/DataType">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType"/>
-              </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-            </source>
-            <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType/ownedOperation"/>
-          </thenExpression>
-          <elseExpression xsi:type="ocl.ecore:IfExp" eType="/3/Collection(Operation)">
-            <condition xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/getOwnedOperations/cl">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-              </source>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Interface">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>
-              </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
-            </condition>
-            <thenExpression xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(Operation)">
-              <source xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>
-                <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-                </source>
-                <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Interface">
-                  <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>
-                </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-              </source>
-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface/ownedOperation"/>
-            </thenExpression>
-            <elseExpression xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(OclVoid)" kind="Sequence"/>
-          </elseExpression>
-        </elseExpression>
-      </expression>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="virtualTxt" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="virtual "/>
-        <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="ocl.ecore:PropertyCallExp">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>
-                <source xsi:type="ocl.ecore:VariableExp" name="operation" referredVariable="/0/virtualTxt/operation">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-                </source>
-                <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation/interface"/>
-              </source>
-              <argument xsi:type="ocl.ecore:NullLiteralExp">
-                <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-              </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/%3C%3E"/>
-            </source>
-            <argument xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="operation" referredVariable="/0/virtualTxt/operation">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-              </source>
-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/isAbstract"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/or"/>
-          </source>
-          <argument xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="operation" referredVariable="/0/virtualTxt/operation">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </argument>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Virtual">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Virtual"/>
-            </argument>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/or"/>
-        </ifExpr>
-      </body>
-      <parameter name="operation">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="virtualSuffix" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" = 0"/>
-        <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="operation" referredVariable="/0/virtualSuffix/operation">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-              </source>
-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation/interface"/>
-            </source>
-            <argument xsi:type="ocl.ecore:NullLiteralExp">
-              <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/%3C%3E"/>
-          </source>
-          <argument xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="operation" referredVariable="/0/virtualSuffix/operation">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </source>
-            <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/isAbstract"/>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/or"/>
-        </ifExpr>
-      </body>
-      <parameter name="operation">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="isConsOrDestructor" visibility="Public">
-      <parameter name="operation">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <source xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/19">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Create">
-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard#//Create"/>
-          </argument>
-        </source>
-        <argument xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/19">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Destroy">
-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard#//Destroy"/>
-          </argument>
-        </argument>
-        <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/or"/>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="ConsDestructorOrVoid" visibility="Public">
-      <parameter name="operation">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:IfExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <condition xsi:type="mtl:QueryInvocation" definition="/0/isConsOrDestructor">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/22">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-          </argument>
-        </condition>
-        <thenExpression xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </thenExpression>
-        <elseExpression xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="void ">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </elseExpression>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="destructor" visibility="Public">
-      <parameter name="operation">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:IfExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <condition xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/25">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </argument>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Destroy">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard#//Destroy"/>
-            </argument>
-          </source>
-          <argument xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/startsWith">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="ocl.ecore:PropertyCallExp">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                <source xsi:type="ocl.ecore:VariableExp" name="operation" referredVariable="/0/destructor/operation">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-                </source>
-                <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-              </source>
-              <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="~">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              </argument>
-            </source>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/not"/>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
-        </condition>
-        <thenExpression xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="~">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </thenExpression>
-        <elseExpression xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </elseExpression>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppReturnSpec" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="mtl:QueryInvocation" definition="/0/ConsDestructorOrVoid">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/31">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-          </argument>
-        </body>
-        <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/30">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-              </source>
-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation/type"/>
-            </source>
-            <argument xsi:type="ocl.ecore:NullLiteralExp">
-              <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/>
-          </source>
-          <argument xsi:type="mtl:QueryInvocation" definition="/0/isConsOrDestructor">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/30">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </argument>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/or"/>
-        </ifExpr>
-        <else>
-          <body xsi:type="ocl.ecore:IteratorExp" name="collect" eType="/3/Bag(String)">
-            <source xsi:type="ocl.ecore:OperationCallExp" eType="/3/Set(Parameter)">
-              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-              </source>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation/returnResult"/>
-            </source>
-            <body xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppReturnSpec/%/%.2/collect/temp1">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-              </argument>
-            </body>
-            <iterator xsi:type="ocl.ecore:Variable" name="temp1">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-            </iterator>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
-          <body xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
-            <argument xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/33">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-              </source>
-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation/type"/>
-            </argument>
-          </body>
-          <body xsi:type="ocl.ecore:IteratorExp" name="collect" eType="/3/Bag(String)">
-            <source xsi:type="ocl.ecore:OperationCallExp" eType="/3/Set(Parameter)">
-              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/34">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-              </source>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation/returnResult"/>
-            </source>
-            <body xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="../../../utils/Modifier.emtl#/0/modPtr"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppReturnSpec/%/%.2/collect.1/temp2">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-              </argument>
-            </body>
-            <iterator xsi:type="ocl.ecore:Variable" name="temp2">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-            </iterator>
-          </body>
-          <body xsi:type="ocl.ecore:IteratorExp" name="collect" eType="/3/Bag(String)">
-            <source xsi:type="ocl.ecore:OperationCallExp" eType="/3/Set(Parameter)">
-              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/35">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-              </source>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation/returnResult"/>
-            </source>
-            <body xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="../../../utils/Modifier.emtl#/0/modRef"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppReturnSpec/%/%.2/collect.2/temp3">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-              </argument>
-            </body>
-            <iterator xsi:type="ocl.ecore:Variable" name="temp3">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-            </iterator>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
-        </else>
-      </body>
-      <parameter name="operation">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppReturnSpec" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="void "/>
-        <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-            <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/returnResult"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/40">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-            </argument>
-          </source>
-          <argument xsi:type="ocl.ecore:NullLiteralExp">
-            <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/>
-        </ifExpr>
-        <else>
-          <body xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/>
-            <argument xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-              <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/returnResult"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/41">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-              </argument>
-            </argument>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
-          <body xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
-            <argument xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type"/>
-              <source xsi:type="mtl:QueryInvocation">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-                <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/returnResult"/>
-                <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/42">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-                </argument>
-              </source>
-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TypedElement/type"/>
-            </argument>
-          </body>
-          <body xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="../../../utils/Modifier.emtl#/0/modPtr"/>
-            <argument xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-              <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/returnResult"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/43">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-              </argument>
-            </argument>
-          </body>
-          <body xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="../../../utils/Modifier.emtl#/0/modRef"/>
-            <argument xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-              <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/returnResult"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/44">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-              </argument>
-            </argument>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
-        </else>
-      </body>
-      <parameter name="behavior">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="InlineTxt" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="inline "/>
-        <ifExpr xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/49">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Inline">
-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Inline"/>
-          </argument>
-        </ifExpr>
-      </body>
-      <parameter name="element">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="staticTxt" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="static "/>
-        <ifExpr xsi:type="ocl.ecore:PropertyCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/54">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-          </source>
-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Feature/isStatic"/>
-        </ifExpr>
-      </body>
-      <parameter name="operation">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppOperationDeclaration" visibility="Public">
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../CppDocumentation.emtl#/0/CppOperationDoc"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/59">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation" definition="/0/InlineTxt">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/60">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:TemplateInvocation" definition="/0/virtualTxt">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/61">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:TemplateInvocation" definition="/0/staticTxt">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/62">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:TemplateInvocation" definition="/0/CppReturnSpec">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/63">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:QueryInvocation" definition="/0/destructor">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/64">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="operation" referredVariable="/0/CppOperationDeclaration/operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="("/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="CppParameter.emtl#/0/CppOperationParameters"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/66">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="true">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/67">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:TemplateInvocation" definition="/0/virtualSuffix">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/68">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=";"/>
-      <parameter name="operation">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppBehaviorDeclaration" visibility="Public">
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../CppDocumentation.emtl#/0/CppBehaviorDoc"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/73">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation" definition="/0/InlineTxt">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/74">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:TemplateInvocation" definition="/0/CppReturnSpec.1">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/75">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="behavior" referredVariable="/0/CppBehaviorDeclaration/behavior">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="("/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="CppParameter.emtl#/0/CppBehaviorParameters"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/77">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="true">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/78">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=";"/>
-      <parameter name="behavior">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppConstInit" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" : "/>
-        <body xsi:type="ocl.ecore:PropertyCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ConstInit"/>
-            <source xsi:type="mtl:QueryInvocation">
-              <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-              <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/84">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-              </argument>
-              <argument xsi:type="ocl.ecore:TypeExp" eType="/5/ConstInit">
-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ConstInit"/>
-              </argument>
-            </source>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/5/ConstInit">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ConstInit"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
-          </source>
-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ConstInit/initialisation"/>
-        </body>
-        <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/83">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </argument>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/5/ConstInit">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ConstInit"/>
-            </argument>
-          </source>
-          <argument xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/83">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </argument>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Create">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard#//Create"/>
-            </argument>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
-        </ifExpr>
-      </body>
-      <parameter name="operation">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Comment">
-      <body startPosition="3165" endPosition="3235" value=" wrapper for native query (otherwise Acceleo does not indent properly)"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="getBodyInTemplate" visibility="Public">
-      <body xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/trim">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getBody"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/89">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:VariableExp" name="language" referredVariable="/0/getBodyInTemplate/language">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          </argument>
-        </source>
-      </body>
-      <parameter name="operation">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </parameter>
-      <parameter name="language">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="throws" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="throws "/>
-        <body xsi:type="mtl:ForBlock">
-          <body xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/98">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type"/>
-            </source>
-            <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-          </body>
-          <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/3/Set(Type)">
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/95">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </source>
-            <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/raisedException"/>
-          </iterSet>
-          <each xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=",">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          </each>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-        <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-            <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/Set(Type)">
-              <source xsi:type="ocl.ecore:VariableExp" name="operation" referredVariable="/0/throws/operation">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-              </source>
-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/raisedException"/>
-            </source>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Set(T)_Class/size"/>
-          </source>
-          <argument xsi:type="ocl.ecore:IntegerLiteralExp" integerSymbol="0">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer_Class/%3E"/>
-        </ifExpr>
-      </body>
-      <parameter name="operation">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppOperationImplementation" visibility="Public">
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../CppDocumentation.emtl#/0/CppOperationDoc"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/105">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="mtl:TemplateInvocation" definition="/0/CppReturnSpec">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/107">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-          </argument>
-        </body>
-        <body xsi:type="ocl.ecore:PropertyCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <source xsi:type="ocl.ecore:VariableExp" name="operation" referredVariable="/0/CppOperationImplementation/operation">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-          </source>
-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="("/>
-        <body xsi:type="mtl:TemplateInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="CppParameter.emtl#/0/CppOperationParameters"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/109">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="false">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          </argument>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=") {&#xA;&#x9;"/>
-        <body xsi:type="mtl:QueryInvocation">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getBody"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/110">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="C/C++">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          </argument>
-        </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;}&#xA;"/>
-        <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="operation" referredVariable="/0/CppOperationImplementation/operation">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </source>
-            <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-          </source>
-          <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="main">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/="/>
-        </ifExpr>
-        <else>
-          <body xsi:type="mtl:TemplateInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="../CppTemplates.emtl#/0/templateSignature.1"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/111">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </argument>
-          </body>
-          <body xsi:type="mtl:TemplateInvocation" definition="/0/InlineTxt">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/112">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </argument>
-          </body>
-          <body xsi:type="mtl:TemplateInvocation" definition="/0/CppReturnSpec">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/113">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </argument>
-          </body>
-          <body xsi:type="ocl.ecore:IteratorExp" name="collect" eType="/3/Bag(String)">
-            <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/Set(Classifier)">
-              <source xsi:type="ocl.ecore:VariableExp" name="operation" referredVariable="/0/CppOperationImplementation/operation">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-              </source>
-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Feature/featuringClassifier"/>
-            </source>
-            <body xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppOperationImplementation/%.2/%.8/collect/temp4">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-              </source>
-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-            </body>
-            <iterator xsi:type="ocl.ecore:Variable" name="temp4">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </iterator>
-          </body>
-          <body xsi:type="mtl:TemplateInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="../CppTemplates.emtl#/0/templateShortSignature.1"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/115">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </argument>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="::"/>
-          <body xsi:type="mtl:QueryInvocation" definition="/0/destructor">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/116">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </argument>
-          </body>
-          <body xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="operation" referredVariable="/0/CppOperationImplementation/operation">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </source>
-            <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="("/>
-          <body xsi:type="mtl:TemplateInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="CppParameter.emtl#/0/CppOperationParameters"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/118">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </argument>
-            <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="false">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            </argument>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
-          <body xsi:type="mtl:TemplateInvocation" definition="/0/throws">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/119">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </argument>
-          </body>
-          <body xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/120">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </argument>
-          </body>
-          <body xsi:type="mtl:TemplateInvocation" definition="/0/CppConstInit">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/121">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </argument>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" {&#xA;&#x9;"/>
-          <body xsi:type="mtl:TemplateInvocation" definition="/0/getBodyInTemplate">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/122">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </argument>
-            <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="C/C++">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            </argument>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;}&#xA;"/>
-        </else>
-      </body>
-      <parameter name="operation">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppBehaviorImplementation" visibility="Public">
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../CppDocumentation.emtl#/0/CppBehaviorDoc"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/127">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
-      <body xsi:type="mtl:TemplateInvocation" definition="/0/CppReturnSpec.1">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/128">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:PropertyCallExp">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-          <source xsi:type="ocl.ecore:VariableExp" name="behavior" referredVariable="/0/CppBehaviorImplementation/behavior">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-          </source>
-          <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/context"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="::"/>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="behavior" referredVariable="/0/CppBehaviorImplementation/behavior">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="("/>
-      <body xsi:type="mtl:TemplateInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="CppParameter.emtl#/0/CppBehaviorParameters"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/131">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="false">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/132">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" {&#xA;&#x9;"/>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getBodyFromOB"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/133">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="C/C++">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;}"/>
-      <parameter name="behavior">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-      <eOperations name="startsWith">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="substring">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="trim">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="getOwnedOperations" eType="/3/Sequence(Operation)">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getOwnedOperations"/>
-        <eParameters name="cl">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="virtualTxt">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/virtualTxt"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="virtualSuffix">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/virtualSuffix"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="isConsOrDestructor">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/isConsOrDestructor"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="ConsDestructorOrVoid">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/ConsDestructorOrVoid"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="destructor">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/destructor"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppReturnSpec">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppReturnSpec"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppReturnSpec">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppReturnSpec.1"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="behavior">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="InlineTxt">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/InlineTxt"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="element">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="staticTxt">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/staticTxt"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppOperationDeclaration">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppOperationDeclaration"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppBehaviorDeclaration">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppBehaviorDeclaration"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="behavior">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppConstInit">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppConstInit"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getBodyInTemplate">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getBodyInTemplate"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-        <eParameters name="language">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="throws">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/throws"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppOperationImplementation">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppOperationImplementation"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppBehaviorImplementation">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppBehaviorImplementation"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="behavior">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="hasStereotype">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="definition">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getApplication">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-        <eParameters name="arg1">
-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getBody">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getBody"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-        <eParameters name="arg1">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="getBodyFromOB">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getBodyFromOB"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-        </eParameters>
-        <eParameters name="arg1">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="returnResult">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/returnResult"/>
-        </eAnnotations>
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-        <eParameters name="behavior">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="cppQualifiedName">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="modPtr">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../../utils/Modifier.emtl#/0/modPtr"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="propertyOrParameter">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="modRef">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../../utils/Modifier.emtl#/0/modRef"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="propertyOrParameter">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="modCVQualifier">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../../utils/Modifier.emtl#/0/modCVQualifier"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="propertyOrParameter">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppOperationDoc">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../CppDocumentation.emtl#/0/CppOperationDoc"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppBehaviorDoc">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../CppDocumentation.emtl#/0/CppBehaviorDoc"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="behavior">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppOperationParameters">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="CppParameter.emtl#/0/CppOperationParameters"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-        <eParameters name="showDefault">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppBehaviorParameters">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="CppParameter.emtl#/0/CppBehaviorParameters"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="behavior">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-        </eParameters>
-        <eParameters name="showDefault">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="templateSignature">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../CppTemplates.emtl#/0/templateSignature.1"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="templateShortSignature">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../CppTemplates.emtl#/0/templateShortSignature.1"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="VisibilityKind_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Parameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameterSubstitution_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Operation)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(Operation)" instanceClassName="java.util.LinkedHashSet">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OclVoid)" instanceClassName="java.util.List">
-      <elementType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:CollectionType" name="Collection(Operation)">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(Parameter)" instanceClassName="java.util.Set">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:BagType" name="Bag(String)" instanceClassName="org.eclipse.ocl.util.Bag">
-      <elementType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(Type)" instanceClassName="java.util.Set">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(Classifier)" instanceClassName="java.util.Set">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="types">
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Class">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="DataType">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Interface">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Virtual">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Virtual"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Create">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard#//Create"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Destroy">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard#//Destroy"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Inline">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Inline"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="ConstInit">
-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ConstInit"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/%">
-      <details key="start" value="587"/>
-      <details key="end" value="685"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/getOwnedOperations">
-      <details key="start" value="686"/>
-      <details key="end" value="1043"/>
-      <details key="line" value="12"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/getOwnedOperations/cl">
-      <details key="start" value="719"/>
-      <details key="end" value="734"/>
-      <details key="line" value="12"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/getOwnedOperations/%">
-      <details key="start" value="761"/>
-      <details key="end" value="1040"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/getOwnedOperations/%/%">
-      <details key="start" value="764"/>
-      <details key="end" value="787"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/getOwnedOperations/%/%/cl">
-      <details key="start" value="765"/>
-      <details key="end" value="767"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/getOwnedOperations/%/%/%">
-      <details key="start" value="780"/>
-      <details key="end" value="785"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/getOwnedOperations/%/%.1">
-      <details key="start" value="795"/>
-      <details key="end" value="826"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/getOwnedOperations/%/%.1/%">
-      <details key="start" value="795"/>
-      <details key="end" value="811"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/getOwnedOperations/%/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/getOwnedOperations/%/%.1/%/%">
-      <details key="start" value="805"/>
-      <details key="end" value="810"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/getOwnedOperations/%/%.2">
-      <details key="start" value="835"/>
-      <details key="end" value="1033"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/getOwnedOperations/%/%.2/%">
-      <details key="start" value="838"/>
-      <details key="end" value="864"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/getOwnedOperations/%/%.2/%/cl">
-      <details key="start" value="839"/>
-      <details key="end" value="841"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/getOwnedOperations/%/%.2/%/%">
-      <details key="start" value="854"/>
-      <details key="end" value="862"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/getOwnedOperations/%/%.2/%.1">
-      <details key="start" value="873"/>
-      <details key="end" value="907"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/getOwnedOperations/%/%.2/%.1/%">
-      <details key="start" value="873"/>
-      <details key="end" value="892"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/getOwnedOperations/%/%.2/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/getOwnedOperations/%/%.2/%.1/%/%">
-      <details key="start" value="883"/>
-      <details key="end" value="891"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/getOwnedOperations/%/%.2/%.2">
-      <details key="start" value="918"/>
-      <details key="end" value="1025"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/getOwnedOperations/%/%.2/%.2/%">
-      <details key="start" value="921"/>
-      <details key="end" value="948"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/getOwnedOperations/%/%.2/%.2/%/cl">
-      <details key="start" value="922"/>
-      <details key="end" value="924"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/getOwnedOperations/%/%.2/%.2/%/%">
-      <details key="start" value="937"/>
-      <details key="end" value="946"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/getOwnedOperations/%/%.2/%.2/%.1">
-      <details key="start" value="958"/>
-      <details key="end" value="993"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/getOwnedOperations/%/%.2/%.2/%.1/%">
-      <details key="start" value="958"/>
-      <details key="end" value="978"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/getOwnedOperations/%/%.2/%.2/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/getOwnedOperations/%/%.2/%.2/%.1/%/%">
-      <details key="start" value="968"/>
-      <details key="end" value="977"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/getOwnedOperations/%/%.2/%.2/%.2">
-      <details key="start" value="1006"/>
-      <details key="end" value="1016"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/virtualTxt">
-      <details key="start" value="1045"/>
-      <details key="end" value="1221"/>
-      <details key="line" value="28"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/virtualTxt/%">
-      <details key="start" value="1097"/>
-      <details key="end" value="1209"/>
-      <details key="line" value="29"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/virtualTxt/%/%">
-      <details key="start" value="1196"/>
-      <details key="end" value="1204"/>
-      <details key="line" value="29"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/virtualTxt/%/%.1">
-      <details key="start" value="1100"/>
-      <details key="end" value="1195"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/virtualTxt/%/%.1/%">
-      <details key="start" value="1101"/>
-      <details key="end" value="1156"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/virtualTxt/%/%.1/%/%">
-      <details key="start" value="1101"/>
-      <details key="end" value="1130"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/virtualTxt/%/%.1/%/%/%">
-      <details key="start" value="1102"/>
-      <details key="end" value="1121"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/virtualTxt/%/%.1/%/%/%/operation">
-      <details key="start" value="1102"/>
-      <details key="end" value="1111"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/virtualTxt/%/%.1/%/%/%.1">
-      <details key="start" value="1125"/>
-      <details key="end" value="1129"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/virtualTxt/%/%.1/%/%.1">
-      <details key="start" value="1134"/>
-      <details key="end" value="1156"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/virtualTxt/%/%.1/%/%.1/operation">
-      <details key="start" value="1135"/>
-      <details key="end" value="1144"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/virtualTxt/%/%.1/%.1">
-      <details key="start" value="1160"/>
-      <details key="end" value="1194"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/virtualTxt/%/%.1/%.1/operation">
-      <details key="start" value="1161"/>
-      <details key="end" value="1170"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/virtualTxt/%/%.1/%.1/%">
-      <details key="start" value="1185"/>
-      <details key="end" value="1192"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/virtualTxt/operation">
-      <details key="start" value="1073"/>
-      <details key="end" value="1094"/>
-      <details key="line" value="28"/>
-    </eAnnotations>
-    <eAnnotations source="positions.43" references="/0/virtualSuffix">
-      <details key="start" value="1224"/>
-      <details key="end" value="1361"/>
-      <details key="line" value="33"/>
-    </eAnnotations>
-    <eAnnotations source="positions.44" references="/0/virtualSuffix/%">
-      <details key="start" value="1279"/>
-      <details key="end" value="1349"/>
-      <details key="line" value="34"/>
-    </eAnnotations>
-    <eAnnotations source="positions.45" references="/0/virtualSuffix/%/%">
-      <details key="start" value="1340"/>
-      <details key="end" value="1344"/>
-      <details key="line" value="34"/>
-    </eAnnotations>
-    <eAnnotations source="positions.46" references="/0/virtualSuffix/%/%.1">
-      <details key="start" value="1282"/>
-      <details key="end" value="1339"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.47" references="/0/virtualSuffix/%/%.1/%">
-      <details key="start" value="1283"/>
-      <details key="end" value="1312"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.48" references="/0/virtualSuffix/%/%.1/%/%">
-      <details key="start" value="1284"/>
-      <details key="end" value="1303"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.49" references="/0/virtualSuffix/%/%.1/%/%/operation">
-      <details key="start" value="1284"/>
-      <details key="end" value="1293"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.50" references="/0/virtualSuffix/%/%.1/%/%.1">
-      <details key="start" value="1307"/>
-      <details key="end" value="1311"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.51" references="/0/virtualSuffix/%/%.1/%.1">
-      <details key="start" value="1316"/>
-      <details key="end" value="1338"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.52" references="/0/virtualSuffix/%/%.1/%.1/operation">
-      <details key="start" value="1317"/>
-      <details key="end" value="1326"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.53" references="/0/virtualSuffix/operation">
-      <details key="start" value="1255"/>
-      <details key="end" value="1276"/>
-      <details key="line" value="33"/>
-    </eAnnotations>
-    <eAnnotations source="positions.54" references="/0/isConsOrDestructor">
-      <details key="start" value="1364"/>
-      <details key="end" value="1502"/>
-      <details key="line" value="38"/>
-    </eAnnotations>
-    <eAnnotations source="positions.55" references="/0/isConsOrDestructor/operation">
-      <details key="start" value="1397"/>
-      <details key="end" value="1418"/>
-      <details key="line" value="38"/>
-    </eAnnotations>
-    <eAnnotations source="positions.56" references="/0/isConsOrDestructor/%">
-      <details key="start" value="1432"/>
-      <details key="end" value="1499"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.57" references="/0/isConsOrDestructor/%/%">
-      <details key="start" value="1432"/>
-      <details key="end" value="1463"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.58" references="/0/isConsOrDestructor/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.59" references="/0/isConsOrDestructor/%/%/%">
-      <details key="start" value="1446"/>
-      <details key="end" value="1462"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.60" references="/0/isConsOrDestructor/%/%.1">
-      <details key="start" value="1467"/>
-      <details key="end" value="1499"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.61" references="/0/isConsOrDestructor/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.62" references="/0/isConsOrDestructor/%/%.1/%">
-      <details key="start" value="1481"/>
-      <details key="end" value="1498"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.63" references="/0/ConsDestructorOrVoid">
-      <details key="start" value="1504"/>
-      <details key="end" value="1627"/>
-      <details key="line" value="42"/>
-    </eAnnotations>
-    <eAnnotations source="positions.64" references="/0/ConsDestructorOrVoid/operation">
-      <details key="start" value="1539"/>
-      <details key="end" value="1560"/>
-      <details key="line" value="42"/>
-    </eAnnotations>
-    <eAnnotations source="positions.65" references="/0/ConsDestructorOrVoid/%">
-      <details key="start" value="1573"/>
-      <details key="end" value="1625"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.66" references="/0/ConsDestructorOrVoid/%/%">
-      <details key="start" value="1576"/>
-      <details key="end" value="1596"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.67" references="/0/ConsDestructorOrVoid/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.68" references="/0/ConsDestructorOrVoid/%/%.1">
-      <details key="start" value="1603"/>
-      <details key="end" value="1605"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.69" references="/0/ConsDestructorOrVoid/%/%.2">
-      <details key="start" value="1612"/>
-      <details key="end" value="1619"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.70" references="/0/destructor">
-      <details key="start" value="1630"/>
-      <details key="end" value="1790"/>
-      <details key="line" value="50"/>
-    </eAnnotations>
-    <eAnnotations source="positions.71" references="/0/destructor/operation">
-      <details key="start" value="1655"/>
-      <details key="end" value="1676"/>
-      <details key="line" value="50"/>
-    </eAnnotations>
-    <eAnnotations source="positions.72" references="/0/destructor/%">
-      <details key="start" value="1689"/>
-      <details key="end" value="1788"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.73" references="/0/destructor/%/%">
-      <details key="start" value="1692"/>
-      <details key="end" value="1763"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.74" references="/0/destructor/%/%/%">
-      <details key="start" value="1692"/>
-      <details key="end" value="1724"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.75" references="/0/destructor/%/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.76" references="/0/destructor/%/%/%/%">
-      <details key="start" value="1706"/>
-      <details key="end" value="1723"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.77" references="/0/destructor/%/%/%.1">
-      <details key="start" value="1729"/>
-      <details key="end" value="1763"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.78" references="/0/destructor/%/%/%.1/%">
-      <details key="start" value="1733"/>
-      <details key="end" value="1763"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.79" references="/0/destructor/%/%/%.1/%/%">
-      <details key="start" value="1733"/>
-      <details key="end" value="1747"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.80" references="/0/destructor/%/%/%.1/%/%/operation">
-      <details key="start" value="1733"/>
-      <details key="end" value="1742"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.81" references="/0/destructor/%/%/%.1/%/%.1">
-      <details key="start" value="1759"/>
-      <details key="end" value="1762"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.82" references="/0/destructor/%/%.1">
-      <details key="start" value="1770"/>
-      <details key="end" value="1773"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.83" references="/0/destructor/%/%.2">
-      <details key="start" value="1780"/>
-      <details key="end" value="1782"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.84" references="/0/CppReturnSpec">
-      <details key="start" value="1792"/>
-      <details key="end" value="2051"/>
-      <details key="line" value="57"/>
-    </eAnnotations>
-    <eAnnotations source="positions.85" references="/0/CppReturnSpec/%">
-      <details key="start" value="1847"/>
-      <details key="end" value="2039"/>
-      <details key="line" value="58"/>
-    </eAnnotations>
-    <eAnnotations source="positions.86" references="/0/CppReturnSpec/%/%">
-      <details key="start" value="1890"/>
-      <details key="end" value="1912"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.87" references="/0/CppReturnSpec/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.88" references="/0/CppReturnSpec/%/%.1">
-      <details key="start" value="1851"/>
-      <details key="end" value="1888"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.89" references="/0/CppReturnSpec/%/%.1/%">
-      <details key="start" value="1851"/>
-      <details key="end" value="1864"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.90" references="/0/CppReturnSpec/%/%.1/%/%">
-      <details key="start" value="1852"/>
-      <details key="end" value="1856"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.91" references="/0/CppReturnSpec/%/%.1/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.92" references="/0/CppReturnSpec/%/%.1/%/%.1">
-      <details key="start" value="1859"/>
-      <details key="end" value="1863"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.93" references="/0/CppReturnSpec/%/%.1/%.1">
-      <details key="start" value="1868"/>
-      <details key="end" value="1888"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.94" references="/0/CppReturnSpec/%/%.1/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.95" references="/0/CppReturnSpec/%/%.2">
-      <details key="start" value="1914"/>
-      <details key="end" value="2034"/>
-      <details key="line" value="58"/>
-    </eAnnotations>
-    <eAnnotations source="positions.96" references="/0/CppReturnSpec/%/%.2/collect">
-      <details key="start" value="1921"/>
-      <details key="end" value="1952"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.97" references="/0/CppReturnSpec/%/%.2/collect/%">
-      <details key="start" value="1921"/>
-      <details key="end" value="1935"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.98" references="/0/CppReturnSpec/%/%.2/collect/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.99" references="/0/CppReturnSpec/%/%.2/collect/%.1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.100" references="/0/CppReturnSpec/%/%.2/collect/%.1/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.101" references="/0/CppReturnSpec/%/%.2/collect/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.102" references="/0/CppReturnSpec/%/%.2/%">
-      <details key="start" value="1954"/>
-      <details key="end" value="1955"/>
-      <details key="line" value="58"/>
-    </eAnnotations>
-    <eAnnotations source="positions.103" references="/0/CppReturnSpec/%/%.2/%.1">
-      <details key="start" value="1956"/>
-      <details key="end" value="1979"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.104" references="/0/CppReturnSpec/%/%.2/%.1/%">
-      <details key="start" value="1956"/>
-      <details key="end" value="1960"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.105" references="/0/CppReturnSpec/%/%.2/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.106" references="/0/CppReturnSpec/%/%.2/collect.1">
-      <details key="start" value="1982"/>
-      <details key="end" value="2005"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.107" references="/0/CppReturnSpec/%/%.2/collect.1/%">
-      <details key="start" value="1982"/>
-      <details key="end" value="1996"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.108" references="/0/CppReturnSpec/%/%.2/collect.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.109" references="/0/CppReturnSpec/%/%.2/collect.1/%.1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.110" references="/0/CppReturnSpec/%/%.2/collect.1/%.1/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.111" references="/0/CppReturnSpec/%/%.2/collect.1/temp2">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.112" references="/0/CppReturnSpec/%/%.2/collect.2">
-      <details key="start" value="2008"/>
-      <details key="end" value="2031"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.113" references="/0/CppReturnSpec/%/%.2/collect.2/%">
-      <details key="start" value="2008"/>
-      <details key="end" value="2022"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.114" references="/0/CppReturnSpec/%/%.2/collect.2/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.115" references="/0/CppReturnSpec/%/%.2/collect.2/%.1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.116" references="/0/CppReturnSpec/%/%.2/collect.2/%.1/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.117" references="/0/CppReturnSpec/%/%.2/collect.2/temp3">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.118" references="/0/CppReturnSpec/%/%.2/%.2">
-      <details key="start" value="2033"/>
-      <details key="end" value="2034"/>
-      <details key="line" value="58"/>
-    </eAnnotations>
-    <eAnnotations source="positions.119" references="/0/CppReturnSpec/operation">
-      <details key="start" value="1823"/>
-      <details key="end" value="1844"/>
-      <details key="line" value="57"/>
-    </eAnnotations>
-    <eAnnotations source="positions.120" references="/0/CppReturnSpec.1">
-      <details key="start" value="2054"/>
-      <details key="end" value="2292"/>
-      <details key="line" value="62"/>
-    </eAnnotations>
-    <eAnnotations source="positions.121" references="/0/CppReturnSpec.1/%">
-      <details key="start" value="2107"/>
-      <details key="end" value="2280"/>
-      <details key="line" value="63"/>
-    </eAnnotations>
-    <eAnnotations source="positions.122" references="/0/CppReturnSpec.1/%/%">
-      <details key="start" value="2135"/>
-      <details key="end" value="2140"/>
-      <details key="line" value="63"/>
-    </eAnnotations>
-    <eAnnotations source="positions.123" references="/0/CppReturnSpec.1/%/%.1">
-      <details key="start" value="2111"/>
-      <details key="end" value="2134"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.124" references="/0/CppReturnSpec.1/%/%.1/%">
-      <details key="start" value="2112"/>
-      <details key="end" value="2126"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.125" references="/0/CppReturnSpec.1/%/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.126" references="/0/CppReturnSpec.1/%/%.1/%.1">
-      <details key="start" value="2129"/>
-      <details key="end" value="2133"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.127" references="/0/CppReturnSpec.1/%/%.2">
-      <details key="start" value="2140"/>
-      <details key="end" value="2275"/>
-      <details key="line" value="63"/>
-    </eAnnotations>
-    <eAnnotations source="positions.128" references="/0/CppReturnSpec.1/%/%.2/%">
-      <details key="start" value="2147"/>
-      <details key="end" value="2178"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.129" references="/0/CppReturnSpec.1/%/%.2/%/%">
-      <details key="start" value="2147"/>
-      <details key="end" value="2161"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.130" references="/0/CppReturnSpec.1/%/%.2/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.131" references="/0/CppReturnSpec.1/%/%.2/%.1">
-      <details key="start" value="2180"/>
-      <details key="end" value="2181"/>
-      <details key="line" value="63"/>
-    </eAnnotations>
-    <eAnnotations source="positions.132" references="/0/CppReturnSpec.1/%/%.2/%.2">
-      <details key="start" value="2182"/>
-      <details key="end" value="2220"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.133" references="/0/CppReturnSpec.1/%/%.2/%.2/%">
-      <details key="start" value="2182"/>
-      <details key="end" value="2201"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.134" references="/0/CppReturnSpec.1/%/%.2/%.2/%/%">
-      <details key="start" value="2182"/>
-      <details key="end" value="2196"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.135" references="/0/CppReturnSpec.1/%/%.2/%.2/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.136" references="/0/CppReturnSpec.1/%/%.2/%.3">
-      <details key="start" value="2223"/>
-      <details key="end" value="2246"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.137" references="/0/CppReturnSpec.1/%/%.2/%.3/%">
-      <details key="start" value="2223"/>
-      <details key="end" value="2237"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.138" references="/0/CppReturnSpec.1/%/%.2/%.3/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.139" references="/0/CppReturnSpec.1/%/%.2/%.4">
-      <details key="start" value="2249"/>
-      <details key="end" value="2272"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.140" references="/0/CppReturnSpec.1/%/%.2/%.4/%">
-      <details key="start" value="2249"/>
-      <details key="end" value="2263"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.141" references="/0/CppReturnSpec.1/%/%.2/%.4/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.142" references="/0/CppReturnSpec.1/%/%.2/%.5">
-      <details key="start" value="2274"/>
-      <details key="end" value="2275"/>
-      <details key="line" value="63"/>
-    </eAnnotations>
-    <eAnnotations source="positions.143" references="/0/CppReturnSpec.1/behavior">
-      <details key="start" value="2085"/>
-      <details key="end" value="2104"/>
-      <details key="line" value="62"/>
-    </eAnnotations>
-    <eAnnotations source="positions.144" references="/0/InlineTxt">
-      <details key="start" value="2295"/>
-      <details key="end" value="2394"/>
-      <details key="line" value="67"/>
-    </eAnnotations>
-    <eAnnotations source="positions.145" references="/0/InlineTxt/%">
-      <details key="start" value="2342"/>
-      <details key="end" value="2382"/>
-      <details key="line" value="68"/>
-    </eAnnotations>
-    <eAnnotations source="positions.146" references="/0/InlineTxt/%/%">
-      <details key="start" value="2370"/>
-      <details key="end" value="2377"/>
-      <details key="line" value="68"/>
-    </eAnnotations>
-    <eAnnotations source="positions.147" references="/0/InlineTxt/%/%.1">
-      <details key="start" value="2346"/>
-      <details key="end" value="2369"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.148" references="/0/InlineTxt/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.149" references="/0/InlineTxt/%/%.1/%">
-      <details key="start" value="2361"/>
-      <details key="end" value="2367"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.150" references="/0/InlineTxt/element">
-      <details key="start" value="2322"/>
-      <details key="end" value="2339"/>
-      <details key="line" value="67"/>
-    </eAnnotations>
-    <eAnnotations source="positions.151" references="/0/staticTxt">
-      <details key="start" value="2397"/>
-      <details key="end" value="2487"/>
-      <details key="line" value="72"/>
-    </eAnnotations>
-    <eAnnotations source="positions.152" references="/0/staticTxt/%">
-      <details key="start" value="2448"/>
-      <details key="end" value="2475"/>
-      <details key="line" value="73"/>
-    </eAnnotations>
-    <eAnnotations source="positions.153" references="/0/staticTxt/%/%">
-      <details key="start" value="2463"/>
-      <details key="end" value="2470"/>
-      <details key="line" value="73"/>
-    </eAnnotations>
-    <eAnnotations source="positions.154" references="/0/staticTxt/%/%.1">
-      <details key="start" value="2452"/>
-      <details key="end" value="2462"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.155" references="/0/staticTxt/%/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.156" references="/0/staticTxt/operation">
-      <details key="start" value="2424"/>
-      <details key="end" value="2445"/>
-      <details key="line" value="72"/>
-    </eAnnotations>
-    <eAnnotations source="positions.157" references="/0/CppOperationDeclaration">
-      <details key="start" value="2489"/>
-      <details key="end" value="2751"/>
-      <details key="line" value="76"/>
-    </eAnnotations>
-    <eAnnotations source="positions.158" references="/0/CppOperationDeclaration/%">
-      <details key="start" value="2555"/>
-      <details key="end" value="2572"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.159" references="/0/CppOperationDeclaration/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.160" references="/0/CppOperationDeclaration/%.1">
-      <details key="start" value="2574"/>
-      <details key="end" value="2575"/>
-      <details key="line" value="78"/>
-    </eAnnotations>
-    <eAnnotations source="positions.161" references="/0/CppOperationDeclaration/%.2">
-      <details key="start" value="2576"/>
-      <details key="end" value="2587"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.162" references="/0/CppOperationDeclaration/%.2/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.163" references="/0/CppOperationDeclaration/%.3">
-      <details key="start" value="2590"/>
-      <details key="end" value="2602"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.164" references="/0/CppOperationDeclaration/%.3/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.165" references="/0/CppOperationDeclaration/%.4">
-      <details key="start" value="2605"/>
-      <details key="end" value="2616"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.166" references="/0/CppOperationDeclaration/%.4/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.167" references="/0/CppOperationDeclaration/%.5">
-      <details key="start" value="2619"/>
-      <details key="end" value="2634"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.168" references="/0/CppOperationDeclaration/%.5/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.169" references="/0/CppOperationDeclaration/%.6">
-      <details key="start" value="2637"/>
-      <details key="end" value="2649"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.170" references="/0/CppOperationDeclaration/%.6/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.171" references="/0/CppOperationDeclaration/%.7">
-      <details key="start" value="2652"/>
-      <details key="end" value="2666"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.172" references="/0/CppOperationDeclaration/%.7/operation">
-      <details key="start" value="2652"/>
-      <details key="end" value="2661"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.173" references="/0/CppOperationDeclaration/%.8">
-      <details key="start" value="2668"/>
-      <details key="end" value="2669"/>
-      <details key="line" value="78"/>
-    </eAnnotations>
-    <eAnnotations source="positions.174" references="/0/CppOperationDeclaration/%.9">
-      <details key="start" value="2670"/>
-      <details key="end" value="2698"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.175" references="/0/CppOperationDeclaration/%.9/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.176" references="/0/CppOperationDeclaration/%.9/%">
-      <details key="start" value="2693"/>
-      <details key="end" value="2697"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.177" references="/0/CppOperationDeclaration/%.10">
-      <details key="start" value="2700"/>
-      <details key="end" value="2701"/>
-      <details key="line" value="78"/>
-    </eAnnotations>
-    <eAnnotations source="positions.178" references="/0/CppOperationDeclaration/%.11">
-      <details key="start" value="2702"/>
-      <details key="end" value="2718"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.179" references="/0/CppOperationDeclaration/%.11/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.180" references="/0/CppOperationDeclaration/%.12">
-      <details key="start" value="2721"/>
-      <details key="end" value="2736"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.181" references="/0/CppOperationDeclaration/%.12/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.182" references="/0/CppOperationDeclaration/%.13">
-      <details key="start" value="2738"/>
-      <details key="end" value="2739"/>
-      <details key="line" value="78"/>
-    </eAnnotations>
-    <eAnnotations source="positions.183" references="/0/CppOperationDeclaration/operation">
-      <details key="start" value="2530"/>
-      <details key="end" value="2551"/>
-      <details key="line" value="76"/>
-    </eAnnotations>
-    <eAnnotations source="positions.184" references="/0/CppBehaviorDeclaration">
-      <details key="start" value="2753"/>
-      <details key="end" value="2947"/>
-      <details key="line" value="81"/>
-    </eAnnotations>
-    <eAnnotations source="positions.185" references="/0/CppBehaviorDeclaration/%">
-      <details key="start" value="2816"/>
-      <details key="end" value="2832"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.186" references="/0/CppBehaviorDeclaration/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.187" references="/0/CppBehaviorDeclaration/%.1">
-      <details key="start" value="2834"/>
-      <details key="end" value="2835"/>
-      <details key="line" value="83"/>
-    </eAnnotations>
-    <eAnnotations source="positions.188" references="/0/CppBehaviorDeclaration/%.2">
-      <details key="start" value="2836"/>
-      <details key="end" value="2847"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.189" references="/0/CppBehaviorDeclaration/%.2/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.190" references="/0/CppBehaviorDeclaration/%.3">
-      <details key="start" value="2850"/>
-      <details key="end" value="2865"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.191" references="/0/CppBehaviorDeclaration/%.3/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.192" references="/0/CppBehaviorDeclaration/%.4">
-      <details key="start" value="2868"/>
-      <details key="end" value="2881"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.193" references="/0/CppBehaviorDeclaration/%.4/behavior">
-      <details key="start" value="2868"/>
-      <details key="end" value="2876"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.194" references="/0/CppBehaviorDeclaration/%.5">
-      <details key="start" value="2883"/>
-      <details key="end" value="2884"/>
-      <details key="line" value="83"/>
-    </eAnnotations>
-    <eAnnotations source="positions.195" references="/0/CppBehaviorDeclaration/%.6">
-      <details key="start" value="2885"/>
-      <details key="end" value="2912"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.196" references="/0/CppBehaviorDeclaration/%.6/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.197" references="/0/CppBehaviorDeclaration/%.6/%">
-      <details key="start" value="2907"/>
-      <details key="end" value="2911"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.198" references="/0/CppBehaviorDeclaration/%.7">
-      <details key="start" value="2914"/>
-      <details key="end" value="2915"/>
-      <details key="line" value="83"/>
-    </eAnnotations>
-    <eAnnotations source="positions.199" references="/0/CppBehaviorDeclaration/%.8">
-      <details key="start" value="2916"/>
-      <details key="end" value="2932"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.200" references="/0/CppBehaviorDeclaration/%.8/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.201" references="/0/CppBehaviorDeclaration/%.9">
-      <details key="start" value="2934"/>
-      <details key="end" value="2935"/>
-      <details key="line" value="83"/>
-    </eAnnotations>
-    <eAnnotations source="positions.202" references="/0/CppBehaviorDeclaration/behavior">
-      <details key="start" value="2793"/>
-      <details key="end" value="2812"/>
-      <details key="line" value="81"/>
-    </eAnnotations>
-    <eAnnotations source="positions.203" references="/0/CppConstInit">
-      <details key="start" value="2949"/>
-      <details key="end" value="3154"/>
-      <details key="line" value="86"/>
-    </eAnnotations>
-    <eAnnotations source="positions.204" references="/0/CppConstInit/%">
-      <details key="start" value="3003"/>
-      <details key="end" value="3142"/>
-      <details key="line" value="87"/>
-    </eAnnotations>
-    <eAnnotations source="positions.205" references="/0/CppConstInit/%/%">
-      <details key="start" value="3070"/>
-      <details key="end" value="3073"/>
-      <details key="line" value="87"/>
-    </eAnnotations>
-    <eAnnotations source="positions.206" references="/0/CppConstInit/%/%.1">
-      <details key="start" value="3074"/>
-      <details key="end" value="3135"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.207" references="/0/CppConstInit/%/%.1/%">
-      <details key="start" value="3074"/>
-      <details key="end" value="3120"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.208" references="/0/CppConstInit/%/%.1/%/%">
-      <details key="start" value="3074"/>
-      <details key="end" value="3099"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.209" references="/0/CppConstInit/%/%.1/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.210" references="/0/CppConstInit/%/%.1/%/%/%">
-      <details key="start" value="3089"/>
-      <details key="end" value="3098"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.211" references="/0/CppConstInit/%/%.1/%/%.1">
-      <details key="start" value="3110"/>
-      <details key="end" value="3119"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.212" references="/0/CppConstInit/%/%.2">
-      <details key="start" value="3007"/>
-      <details key="end" value="3069"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.213" references="/0/CppConstInit/%/%.2/%">
-      <details key="start" value="3008"/>
-      <details key="end" value="3032"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.214" references="/0/CppConstInit/%/%.2/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.215" references="/0/CppConstInit/%/%.2/%/%">
-      <details key="start" value="3022"/>
-      <details key="end" value="3031"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.216" references="/0/CppConstInit/%/%.2/%.1">
-      <details key="start" value="3037"/>
-      <details key="end" value="3068"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.217" references="/0/CppConstInit/%/%.2/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.218" references="/0/CppConstInit/%/%.2/%.1/%">
-      <details key="start" value="3051"/>
-      <details key="end" value="3067"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.219" references="/0/CppConstInit/operation">
-      <details key="start" value="2979"/>
-      <details key="end" value="3000"/>
-      <details key="line" value="86"/>
-    </eAnnotations>
-    <eAnnotations source="positions.220" references="/0/%.1">
-      <details key="start" value="3157"/>
-      <details key="end" value="3237"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.221" references="/0/getBodyInTemplate">
-      <details key="start" value="3238"/>
-      <details key="end" value="3355"/>
-      <details key="line" value="92"/>
-    </eAnnotations>
-    <eAnnotations source="positions.222" references="/0/getBodyInTemplate/%">
-      <details key="start" value="3317"/>
-      <details key="end" value="3341"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.223" references="/0/getBodyInTemplate/%/%">
-      <details key="start" value="3317"/>
-      <details key="end" value="3334"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.224" references="/0/getBodyInTemplate/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.225" references="/0/getBodyInTemplate/%/%/language">
-      <details key="start" value="3325"/>
-      <details key="end" value="3333"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.226" references="/0/getBodyInTemplate/operation">
-      <details key="start" value="3273"/>
-      <details key="end" value="3294"/>
-      <details key="line" value="92"/>
-    </eAnnotations>
-    <eAnnotations source="positions.227" references="/0/getBodyInTemplate/language">
-      <details key="start" value="3296"/>
-      <details key="end" value="3313"/>
-      <details key="line" value="92"/>
-    </eAnnotations>
-    <eAnnotations source="positions.228" references="/0/throws">
-      <details key="start" value="3358"/>
-      <details key="end" value="3526"/>
-      <details key="line" value="97"/>
-    </eAnnotations>
-    <eAnnotations source="positions.229" references="/0/throws/%">
-      <details key="start" value="3405"/>
-      <details key="end" value="3514"/>
-      <details key="line" value="98"/>
-    </eAnnotations>
-    <eAnnotations source="positions.230" references="/0/throws/%/%">
-      <details key="start" value="3450"/>
-      <details key="end" value="3457"/>
-      <details key="line" value="99"/>
-    </eAnnotations>
-    <eAnnotations source="positions.231" references="/0/throws/%/%.1">
-      <details key="start" value="3457"/>
-      <details key="end" value="3508"/>
-      <details key="line" value="99"/>
-    </eAnnotations>
-    <eAnnotations source="positions.232" references="/0/throws/%/%.1/%">
-      <details key="start" value="3496"/>
-      <details key="end" value="3500"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.233" references="/0/throws/%/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.234" references="/0/throws/%/%.1/%.1">
-      <details key="start" value="3463"/>
-      <details key="end" value="3478"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.235" references="/0/throws/%/%.1/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.236" references="/0/throws/%/%.1/%.2">
-      <details key="start" value="3490"/>
-      <details key="end" value="3493"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.237" references="/0/throws/%/%.2">
-      <details key="start" value="3508"/>
-      <details key="end" value="3509"/>
-      <details key="line" value="100"/>
-    </eAnnotations>
-    <eAnnotations source="positions.238" references="/0/throws/%/%.3">
-      <details key="start" value="3409"/>
-      <details key="end" value="3448"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.239" references="/0/throws/%/%.3/%">
-      <details key="start" value="3410"/>
-      <details key="end" value="3443"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.240" references="/0/throws/%/%.3/%/%">
-      <details key="start" value="3410"/>
-      <details key="end" value="3435"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.241" references="/0/throws/%/%.3/%/%/operation">
-      <details key="start" value="3410"/>
-      <details key="end" value="3419"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.242" references="/0/throws/%/%.3/%.1">
-      <details key="start" value="3446"/>
-      <details key="end" value="3447"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.243" references="/0/throws/operation">
-      <details key="start" value="3382"/>
-      <details key="end" value="3402"/>
-      <details key="line" value="97"/>
-    </eAnnotations>
-    <eAnnotations source="positions.244" references="/0/CppOperationImplementation">
-      <details key="start" value="3529"/>
-      <details key="end" value="4037"/>
-      <details key="line" value="104"/>
-    </eAnnotations>
-    <eAnnotations source="positions.245" references="/0/CppOperationImplementation/%">
-      <details key="start" value="3598"/>
-      <details key="end" value="3615"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.246" references="/0/CppOperationImplementation/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.247" references="/0/CppOperationImplementation/%.1">
-      <details key="start" value="3617"/>
-      <details key="end" value="3618"/>
-      <details key="line" value="106"/>
-    </eAnnotations>
-    <eAnnotations source="positions.248" references="/0/CppOperationImplementation/%.2">
-      <details key="start" value="3618"/>
-      <details key="end" value="4025"/>
-      <details key="line" value="106"/>
-    </eAnnotations>
-    <eAnnotations source="positions.249" references="/0/CppOperationImplementation/%.2/%">
-      <details key="start" value="3650"/>
-      <details key="end" value="3665"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.250" references="/0/CppOperationImplementation/%.2/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.251" references="/0/CppOperationImplementation/%.2/%.1">
-      <details key="start" value="3668"/>
-      <details key="end" value="3682"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.252" references="/0/CppOperationImplementation/%.2/%.1/operation">
-      <details key="start" value="3668"/>
-      <details key="end" value="3677"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.253" references="/0/CppOperationImplementation/%.2/%.2">
-      <details key="start" value="3684"/>
-      <details key="end" value="3685"/>
-      <details key="line" value="107"/>
-    </eAnnotations>
-    <eAnnotations source="positions.254" references="/0/CppOperationImplementation/%.2/%.3">
-      <details key="start" value="3686"/>
-      <details key="end" value="3715"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.255" references="/0/CppOperationImplementation/%.2/%.3/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.256" references="/0/CppOperationImplementation/%.2/%.3/%">
-      <details key="start" value="3709"/>
-      <details key="end" value="3714"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.257" references="/0/CppOperationImplementation/%.2/%.4">
-      <details key="start" value="3717"/>
-      <details key="end" value="3722"/>
-      <details key="line" value="107"/>
-    </eAnnotations>
-    <eAnnotations source="positions.258" references="/0/CppOperationImplementation/%.2/%.5">
-      <details key="start" value="3723"/>
-      <details key="end" value="3739"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.259" references="/0/CppOperationImplementation/%.2/%.5/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.260" references="/0/CppOperationImplementation/%.2/%.5/%">
-      <details key="start" value="3731"/>
-      <details key="end" value="3738"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.261" references="/0/CppOperationImplementation/%.2/%.6">
-      <details key="start" value="3741"/>
-      <details key="end" value="3744"/>
-      <details key="line" value="109"/>
-    </eAnnotations>
-    <eAnnotations source="positions.262" references="/0/CppOperationImplementation/%.2/%.7">
-      <details key="start" value="3622"/>
-      <details key="end" value="3647"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.263" references="/0/CppOperationImplementation/%.2/%.7/%">
-      <details key="start" value="3623"/>
-      <details key="end" value="3637"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.264" references="/0/CppOperationImplementation/%.2/%.7/%/operation">
-      <details key="start" value="3623"/>
-      <details key="end" value="3632"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.265" references="/0/CppOperationImplementation/%.2/%.7/%.1">
-      <details key="start" value="3640"/>
-      <details key="end" value="3646"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.266" references="/0/CppOperationImplementation/%.2/%.8">
-      <details key="start" value="3744"/>
-      <details key="end" value="4020"/>
-      <details key="line" value="110"/>
-    </eAnnotations>
-    <eAnnotations source="positions.267" references="/0/CppOperationImplementation/%.2/%.8/%">
-      <details key="start" value="3752"/>
-      <details key="end" value="3771"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.268" references="/0/CppOperationImplementation/%.2/%.8/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.269" references="/0/CppOperationImplementation/%.2/%.8/%.1">
-      <details key="start" value="3774"/>
-      <details key="end" value="3785"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.270" references="/0/CppOperationImplementation/%.2/%.8/%.1/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.271" references="/0/CppOperationImplementation/%.2/%.8/%.2">
-      <details key="start" value="3788"/>
-      <details key="end" value="3803"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.272" references="/0/CppOperationImplementation/%.2/%.8/%.2/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.273" references="/0/CppOperationImplementation/%.2/%.8/collect">
-      <details key="start" value="3806"/>
-      <details key="end" value="3840"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.274" references="/0/CppOperationImplementation/%.2/%.8/collect/%">
-      <details key="start" value="3806"/>
-      <details key="end" value="3835"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.275" references="/0/CppOperationImplementation/%.2/%.8/collect/%/operation">
-      <details key="start" value="3806"/>
-      <details key="end" value="3815"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.276" references="/0/CppOperationImplementation/%.2/%.8/collect/%.1">
-      <details key="start" value="3836"/>
-      <details key="end" value="3840"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.277" references="/0/CppOperationImplementation/%.2/%.8/collect/%.1/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.278" references="/0/CppOperationImplementation/%.2/%.8/collect/temp4">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.279" references="/0/CppOperationImplementation/%.2/%.8/%.3">
-      <details key="start" value="3843"/>
-      <details key="end" value="3867"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.280" references="/0/CppOperationImplementation/%.2/%.8/%.3/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.281" references="/0/CppOperationImplementation/%.2/%.8/%.4">
-      <details key="start" value="3869"/>
-      <details key="end" value="3871"/>
-      <details key="line" value="111"/>
-    </eAnnotations>
-    <eAnnotations source="positions.282" references="/0/CppOperationImplementation/%.2/%.8/%.5">
-      <details key="start" value="3872"/>
-      <details key="end" value="3884"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.283" references="/0/CppOperationImplementation/%.2/%.8/%.5/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.284" references="/0/CppOperationImplementation/%.2/%.8/%.6">
-      <details key="start" value="3887"/>
-      <details key="end" value="3901"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.285" references="/0/CppOperationImplementation/%.2/%.8/%.6/operation">
-      <details key="start" value="3887"/>
-      <details key="end" value="3896"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.286" references="/0/CppOperationImplementation/%.2/%.8/%.7">
-      <details key="start" value="3903"/>
-      <details key="end" value="3904"/>
-      <details key="line" value="111"/>
-    </eAnnotations>
-    <eAnnotations source="positions.287" references="/0/CppOperationImplementation/%.2/%.8/%.8">
-      <details key="start" value="3905"/>
-      <details key="end" value="3934"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.288" references="/0/CppOperationImplementation/%.2/%.8/%.8/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.289" references="/0/CppOperationImplementation/%.2/%.8/%.8/%">
-      <details key="start" value="3928"/>
-      <details key="end" value="3933"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.290" references="/0/CppOperationImplementation/%.2/%.8/%.9">
-      <details key="start" value="3936"/>
-      <details key="end" value="3937"/>
-      <details key="line" value="111"/>
-    </eAnnotations>
-    <eAnnotations source="positions.291" references="/0/CppOperationImplementation/%.2/%.8/%.10">
-      <details key="start" value="3938"/>
-      <details key="end" value="3946"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.292" references="/0/CppOperationImplementation/%.2/%.8/%.10/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.293" references="/0/CppOperationImplementation/%.2/%.8/%.11">
-      <details key="start" value="3949"/>
-      <details key="end" value="3965"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.294" references="/0/CppOperationImplementation/%.2/%.8/%.11/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.295" references="/0/CppOperationImplementation/%.2/%.8/%.12">
-      <details key="start" value="3968"/>
-      <details key="end" value="3982"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.296" references="/0/CppOperationImplementation/%.2/%.8/%.12/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.297" references="/0/CppOperationImplementation/%.2/%.8/%.13">
-      <details key="start" value="3984"/>
-      <details key="end" value="3988"/>
-      <details key="line" value="111"/>
-    </eAnnotations>
-    <eAnnotations source="positions.298" references="/0/CppOperationImplementation/%.2/%.8/%.14">
-      <details key="start" value="3989"/>
-      <details key="end" value="4015"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.299" references="/0/CppOperationImplementation/%.2/%.8/%.14/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.300" references="/0/CppOperationImplementation/%.2/%.8/%.14/%">
-      <details key="start" value="4007"/>
-      <details key="end" value="4014"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.301" references="/0/CppOperationImplementation/%.2/%.8/%.15">
-      <details key="start" value="4017"/>
-      <details key="end" value="4020"/>
-      <details key="line" value="113"/>
-    </eAnnotations>
-    <eAnnotations source="positions.302" references="/0/CppOperationImplementation/operation">
-      <details key="start" value="3573"/>
-      <details key="end" value="3594"/>
-      <details key="line" value="104"/>
-    </eAnnotations>
-    <eAnnotations source="positions.303" references="/0/CppBehaviorImplementation">
-      <details key="start" value="4040"/>
-      <details key="end" value="4287"/>
-      <details key="line" value="118"/>
-    </eAnnotations>
-    <eAnnotations source="positions.304" references="/0/CppBehaviorImplementation/%">
-      <details key="start" value="4112"/>
-      <details key="end" value="4128"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.305" references="/0/CppBehaviorImplementation/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.306" references="/0/CppBehaviorImplementation/%.1">
-      <details key="start" value="4130"/>
-      <details key="end" value="4131"/>
-      <details key="line" value="120"/>
-    </eAnnotations>
-    <eAnnotations source="positions.307" references="/0/CppBehaviorImplementation/%.2">
-      <details key="start" value="4132"/>
-      <details key="end" value="4147"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.308" references="/0/CppBehaviorImplementation/%.2/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.309" references="/0/CppBehaviorImplementation/%.3">
-      <details key="start" value="4150"/>
-      <details key="end" value="4172"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.310" references="/0/CppBehaviorImplementation/%.3/%">
-      <details key="start" value="4150"/>
-      <details key="end" value="4167"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.311" references="/0/CppBehaviorImplementation/%.3/%/behavior">
-      <details key="start" value="4150"/>
-      <details key="end" value="4158"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.312" references="/0/CppBehaviorImplementation/%.4">
-      <details key="start" value="4174"/>
-      <details key="end" value="4176"/>
-      <details key="line" value="120"/>
-    </eAnnotations>
-    <eAnnotations source="positions.313" references="/0/CppBehaviorImplementation/%.5">
-      <details key="start" value="4177"/>
-      <details key="end" value="4190"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.314" references="/0/CppBehaviorImplementation/%.5/behavior">
-      <details key="start" value="4177"/>
-      <details key="end" value="4185"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.315" references="/0/CppBehaviorImplementation/%.6">
-      <details key="start" value="4192"/>
-      <details key="end" value="4193"/>
-      <details key="line" value="120"/>
-    </eAnnotations>
-    <eAnnotations source="positions.316" references="/0/CppBehaviorImplementation/%.7">
-      <details key="start" value="4194"/>
-      <details key="end" value="4222"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.317" references="/0/CppBehaviorImplementation/%.7/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.318" references="/0/CppBehaviorImplementation/%.7/%">
-      <details key="start" value="4216"/>
-      <details key="end" value="4221"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.319" references="/0/CppBehaviorImplementation/%.8">
-      <details key="start" value="4224"/>
-      <details key="end" value="4225"/>
-      <details key="line" value="120"/>
-    </eAnnotations>
-    <eAnnotations source="positions.320" references="/0/CppBehaviorImplementation/%.9">
-      <details key="start" value="4226"/>
-      <details key="end" value="4242"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.321" references="/0/CppBehaviorImplementation/%.9/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.322" references="/0/CppBehaviorImplementation/%.10">
-      <details key="start" value="4244"/>
-      <details key="end" value="4248"/>
-      <details key="line" value="120"/>
-    </eAnnotations>
-    <eAnnotations source="positions.323" references="/0/CppBehaviorImplementation/%.11">
-      <details key="start" value="4249"/>
-      <details key="end" value="4271"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.324" references="/0/CppBehaviorImplementation/%.11/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.325" references="/0/CppBehaviorImplementation/%.11/%">
-      <details key="start" value="4263"/>
-      <details key="end" value="4270"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.326" references="/0/CppBehaviorImplementation/%.12">
-      <details key="start" value="4273"/>
-      <details key="end" value="4275"/>
-      <details key="line" value="122"/>
-    </eAnnotations>
-    <eAnnotations source="positions.327" references="/0/CppBehaviorImplementation/behavior">
-      <details key="start" value="4083"/>
-      <details key="end" value="4108"/>
-      <details key="line" value="118"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl
deleted file mode 100644
index 99720c6e618..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl
+++ /dev/null
@@ -1,123 +0,0 @@
-[module CppOperations('http://www.eclipse.org/uml2/5.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1', 'http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard')/]
-[import org::eclipse::papyrus::acceleo::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::CppGenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::Modifier/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppDocumentation/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::operation::CppParameter/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppTemplates/]
-
-
-[comment
-return a list of owned operations, since this is not supported directly on a classifier/]
-[query public getOwnedOperations(cl : Classifier) : Sequence(Operation) =
-	if (cl.oclIsKindOf(Class)) then
-		oclAsType(Class).ownedOperation
-	else
-		if (cl.oclIsKindOf(DataType)) then
-			oclAsType(DataType).ownedOperation
-		else
-			if (cl.oclIsKindOf(Interface)) then
-				oclAsType(Interface).ownedOperation
-			else
-				Sequence{}
-			endif
-		endif
-	endif
-/]
-
-[template public virtualTxt(operation : Operation)]
-[if((operation.interface <> null) or (operation.isAbstract) or (operation.hasStereotype(Virtual)))]virtual [/if]
-[/template]
-
-
-[template public virtualSuffix(operation : Operation)]
-[if((operation.interface <> null) or (operation.isAbstract))] = 0[/if]
-[/template]
-
-
-[query public isConsOrDestructor(operation : Operation) : Boolean =
-hasStereotype(standard::Create) or hasStereotype(standard::Destroy)
-/]
-
-[query public ConsDestructorOrVoid(operation : Operation) : String =
-if isConsOrDestructor() then
-	''
-else
-	'void '
-endif/]
-
-
-[query public destructor(operation : Operation) : String =
-if hasStereotype(standard::Destroy) and not operation.name.startsWith('~') then
-	'~'
-else
-	''
-endif/]
-
-[template public CppReturnSpec(operation : Operation)]
-[if (type = null) or isConsOrDestructor()][ConsDestructorOrVoid()/][else][returnResult().modCVQualifier()/] [type.cppQualifiedName()/][returnResult().modPtr()/][returnResult().modRef()/] [/if]
-[/template]
-
-
-[template public CppReturnSpec(behavior : Behavior)]
-[if (returnResult() = null)]void [else][returnResult().modCVQualifier()/] [returnResult().type.cppQualifiedName()/][returnResult().modPtr()/][returnResult().modRef()/] [/if]
-[/template]
-
-
-[template public InlineTxt(element : Element)]
-[if (hasStereotype(Inline))]inline [/if]
-[/template]
-
-
-[template public staticTxt(operation : Operation)]
-[if (isStatic)]static [/if]
-[/template]
-
-[template public CppOperationDeclaration(operation : Operation)]
-[CppOperationDoc()/]
-[InlineTxt()/][virtualTxt()/][staticTxt()/][CppReturnSpec()/][destructor()/][operation.name/]([CppOperationParameters(true)/])[modCVQualifier()/][virtualSuffix()/];
-[/template]
-
-[template public CppBehaviorDeclaration(behavior : Behavior)]
-[CppBehaviorDoc()/]
-[InlineTxt()/][CppReturnSpec()/][behavior.name/]([CppBehaviorParameters(true)/])[modCVQualifier()/];
-[/template]
-
-[template public CppConstInit(operation : Operation)]
-[if (hasStereotype(ConstInit) and hasStereotype(standard::Create))] : [getApplication(ConstInit).oclAsType(ConstInit).initialisation/][/if]
-[/template]
-
-
-[comment wrapper for native query (otherwise Acceleo does not indent properly)/]
-[template public getBodyInTemplate(operation : Operation, language : String)]
-[getBody(language).trim()/]
-[/template]
-
-
-[template public throws(operation: Operation)]
-[if (operation.raisedException->size() > 0)]
-throws [for (raisedException) separator(',')][name/][/for]
-[/if]
-[/template]
-
-
-[template public CppOperationImplementation(operation : Operation)]
-[CppOperationDoc()/]
-[if (operation.name = 'main')]
-[CppReturnSpec()/][operation.name/]([CppOperationParameters(false)/]) {
-	[getBody('C/C++')/]
-}
-[else]
-[templateSignature()/][InlineTxt()/][CppReturnSpec()/][operation.featuringClassifier.name/][templateShortSignature()/]::[destructor()/][operation.name/]([CppOperationParameters(false)/])[throws()/][modCVQualifier()/][CppConstInit()/] {
-	[getBodyInTemplate('C/C++')/]
-}
-[/if]
-[/template]
-
-
-[template public CppBehaviorImplementation(behavior : OpaqueBehavior)]
-[CppBehaviorDoc()/]
-[CppReturnSpec()/][behavior._context.name/]::[behavior.name/]([CppBehaviorParameters(false)/])[modCVQualifier()/] {
-	[getBodyFromOB('C/C++')/]
-}
-[/template]
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl
deleted file mode 100644
index d02d03ec0ae..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl
+++ /dev/null
@@ -1,880 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppParameter" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::operation::CppParameter" endHeaderPosition="103">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
-    </input>
-    <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="../../../utils/CppGenUtils.emtl#/0"/>
-    <imports href="../../../utils/Modifier.emtl#/0"/>
-    <ownedModuleElement xsi:type="mtl:Template" name="defaultValue" visibility="Public">
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" = "/>
-        <body xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <source xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ValueSpecification"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-            </source>
-            <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/defaultValue"/>
-          </source>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/5.0.0/UML#//ValueSpecification/stringValue"/>
-        </body>
-        <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ValueSpecification"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-            </source>
-            <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/defaultValue"/>
-          </source>
-          <argument xsi:type="ocl.ecore:NullLiteralExp">
-            <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-          </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/%3C%3E"/>
-        </ifExpr>
-      </body>
-      <parameter name="parameter">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Comment">
-      <body startPosition="430" endPosition="561" value=" C++ parameter. Default values are added, if parameter showDefault is true (implementation signature&#xA;&#x9;may not repeat default value)"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppParameter" visibility="Public">
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/12">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
-        <argument xsi:type="ocl.ecore:PropertyCallExp">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type"/>
-          <source xsi:type="ocl.ecore:VariableExp" name="parameter" referredVariable="/0/CppParameter/parameter">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-          </source>
-          <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TypedElement/type"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../../utils/Modifier.emtl#/0/modPtr"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/14">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../../utils/Modifier.emtl#/0/modRef"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/15">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-        </argument>
-      </body>
-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
-      <body xsi:type="ocl.ecore:PropertyCallExp">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="parameter" referredVariable="/0/CppParameter/parameter">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-        </source>
-        <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
-      </body>
-      <body xsi:type="mtl:QueryInvocation">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="../../../utils/Modifier.emtl#/0/modArray"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/17">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-        </argument>
-      </body>
-      <body xsi:type="mtl:IfBlock">
-        <body xsi:type="mtl:TemplateInvocation" definition="/0/defaultValue">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/19">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-          </argument>
-        </body>
-        <ifExpr xsi:type="ocl.ecore:VariableExp" name="showDefault" referredVariable="/0/CppParameter/showDefault">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        </ifExpr>
-      </body>
-      <parameter name="parameter">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-      </parameter>
-      <parameter name="showDefault">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppOperationParameters" visibility="Public">
-      <body xsi:type="mtl:ForBlock">
-        <body xsi:type="mtl:TemplateInvocation" definition="/0/CppParameter">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/28">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:VariableExp" name="showDefault" referredVariable="/0/CppOperationParameters/showDefault">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          </argument>
-        </body>
-        <iterSet xsi:type="ocl.ecore:IteratorExp" name="select" eType="/24/OrderedSet(Parameter)">
-          <source xsi:type="ocl.ecore:PropertyCallExp" eType="/24/OrderedSet(Parameter)">
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/25">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-            </source>
-            <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
-          </source>
-          <body xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterDirectionKind"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppOperationParameters/%/select/temp1">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-              </source>
-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
-            </source>
-            <argument xsi:type="ocl.ecore:EnumLiteralExp">
-              <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterDirectionKind"/>
-              <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterDirectionKind/return"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/%3C%3E"/>
-          </body>
-          <iterator xsi:type="ocl.ecore:Variable" name="temp1">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-          </iterator>
-        </iterSet>
-        <each xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=", ">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </each>
-      </body>
-      <parameter name="operation">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </parameter>
-      <parameter name="showDefault">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-      </parameter>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Comment">
-      <body startPosition="1039" endPosition="1105" value=" signature for a given behavior (e.g. effect within state machine)"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Template" name="CppBehaviorParameters" visibility="Public">
-      <body xsi:type="mtl:ForBlock">
-        <body xsi:type="mtl:TemplateInvocation" definition="/0/CppParameter">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/38">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:VariableExp" name="showDefault" referredVariable="/0/CppBehaviorParameters/showDefault">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          </argument>
-        </body>
-        <iterSet xsi:type="ocl.ecore:IteratorExp" name="select" eType="/24/OrderedSet(Parameter)">
-          <source xsi:type="ocl.ecore:PropertyCallExp" eType="/24/OrderedSet(Parameter)">
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/35">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-            </source>
-            <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/ownedParameter"/>
-          </source>
-          <body xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:PropertyCallExp">
-              <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterDirectionKind"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppBehaviorParameters/%/select/temp2">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-              </source>
-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
-            </source>
-            <argument xsi:type="ocl.ecore:EnumLiteralExp">
-              <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterDirectionKind"/>
-              <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterDirectionKind/return"/>
-            </argument>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/%3C%3E"/>
-          </body>
-          <iterator xsi:type="ocl.ecore:Variable" name="temp2">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-          </iterator>
-        </iterSet>
-        <each xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=", ">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </each>
-      </body>
-      <parameter name="behavior">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </parameter>
-      <parameter name="showDefault">
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-      </parameter>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="defaultValue">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/defaultValue"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="parameter">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppParameter">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppParameter"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="parameter">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-        </eParameters>
-        <eParameters name="showDefault">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppOperationParameters">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppOperationParameters"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="operation">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-        </eParameters>
-        <eParameters name="showDefault">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="CppBehaviorParameters">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/CppBehaviorParameters"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="behavior">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-        </eParameters>
-        <eParameters name="showDefault">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="cppQualifiedName">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="arg0">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="modPtr">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../../utils/Modifier.emtl#/0/modPtr"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="propertyOrParameter">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="modRef">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../../utils/Modifier.emtl#/0/modRef"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="propertyOrParameter">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="modArray">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../../utils/Modifier.emtl#/0/modArray"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="propertyOrParameter">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-      <eOperations name="modCVQualifier">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL">
-          <references href="../../../utils/Modifier.emtl#/0/modCVQualifier"/>
-        </eAnnotations>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <eParameters name="propertyOrParameter">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Parameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Operation_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Class_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Element_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Package_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="VisibilityKind_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(Parameter)" instanceClassName="java.util.LinkedHashSet">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="i">
-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/defaultValue">
-      <details key="start" value="290"/>
-      <details key="end" value="420"/>
-      <details key="line" value="9"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/defaultValue/%">
-      <details key="start" value="344"/>
-      <details key="end" value="408"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/defaultValue/%/%">
-      <details key="start" value="371"/>
-      <details key="end" value="374"/>
-      <details key="line" value="10"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/defaultValue/%/%.1">
-      <details key="start" value="375"/>
-      <details key="end" value="401"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/defaultValue/%/%.1/%">
-      <details key="start" value="375"/>
-      <details key="end" value="387"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/defaultValue/%/%.1/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/defaultValue/%/%.2">
-      <details key="start" value="348"/>
-      <details key="end" value="370"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/defaultValue/%/%.2/%">
-      <details key="start" value="349"/>
-      <details key="end" value="361"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/defaultValue/%/%.2/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/defaultValue/%/%.2/%.1">
-      <details key="start" value="365"/>
-      <details key="end" value="369"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/defaultValue/parameter">
-      <details key="start" value="320"/>
-      <details key="end" value="341"/>
-      <details key="line" value="9"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/%">
-      <details key="start" value="422"/>
-      <details key="end" value="563"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/CppParameter">
-      <details key="start" value="564"/>
-      <details key="end" value="801"/>
-      <details key="line" value="15"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/CppParameter/%">
-      <details key="start" value="642"/>
-      <details key="end" value="658"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/CppParameter/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/CppParameter/%.1">
-      <details key="start" value="661"/>
-      <details key="end" value="694"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/CppParameter/%.1/%">
-      <details key="start" value="661"/>
-      <details key="end" value="675"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/CppParameter/%.1/%/parameter">
-      <details key="start" value="661"/>
-      <details key="end" value="670"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.18" references="/0/CppParameter/%.2">
-      <details key="start" value="697"/>
-      <details key="end" value="705"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.19" references="/0/CppParameter/%.2/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.20" references="/0/CppParameter/%.3">
-      <details key="start" value="708"/>
-      <details key="end" value="716"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.21" references="/0/CppParameter/%.3/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.22" references="/0/CppParameter/%.4">
-      <details key="start" value="718"/>
-      <details key="end" value="719"/>
-      <details key="line" value="16"/>
-    </eAnnotations>
-    <eAnnotations source="positions.23" references="/0/CppParameter/%.5">
-      <details key="start" value="720"/>
-      <details key="end" value="734"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.24" references="/0/CppParameter/%.5/parameter">
-      <details key="start" value="720"/>
-      <details key="end" value="729"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.25" references="/0/CppParameter/%.6">
-      <details key="start" value="737"/>
-      <details key="end" value="747"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/CppParameter/%.6/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/CppParameter/%.7">
-      <details key="start" value="749"/>
-      <details key="end" value="789"/>
-      <details key="line" value="16"/>
-    </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/CppParameter/%.7/%">
-      <details key="start" value="768"/>
-      <details key="end" value="782"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/CppParameter/%.7/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/CppParameter/%.7/showDefault">
-      <details key="start" value="753"/>
-      <details key="end" value="766"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/CppParameter/parameter">
-      <details key="start" value="594"/>
-      <details key="end" value="615"/>
-      <details key="line" value="15"/>
-    </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/CppParameter/showDefault">
-      <details key="start" value="617"/>
-      <details key="end" value="638"/>
-      <details key="line" value="15"/>
-    </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/CppOperationParameters">
-      <details key="start" value="804"/>
-      <details key="end" value="1028"/>
-      <details key="line" value="20"/>
-    </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/CppOperationParameters/%">
-      <details key="start" value="891"/>
-      <details key="end" value="1016"/>
-      <details key="line" value="21"/>
-    </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/CppOperationParameters/%/%">
-      <details key="start" value="983"/>
-      <details key="end" value="1008"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/CppOperationParameters/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/CppOperationParameters/%/%/showDefault">
-      <details key="start" value="996"/>
-      <details key="end" value="1007"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/CppOperationParameters/%/select">
-      <details key="start" value="897"/>
-      <details key="end" value="964"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/CppOperationParameters/%/select/%">
-      <details key="start" value="897"/>
-      <details key="end" value="911"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/CppOperationParameters/%/select/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/CppOperationParameters/%/select/%.1">
-      <details key="start" value="920"/>
-      <details key="end" value="963"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/CppOperationParameters/%/select/%.1/%">
-      <details key="start" value="920"/>
-      <details key="end" value="929"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.43" references="/0/CppOperationParameters/%/select/%.1/%/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.44" references="/0/CppOperationParameters/%/select/%.1/%.1">
-      <details key="start" value="933"/>
-      <details key="end" value="963"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.45" references="/0/CppOperationParameters/%/select/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.46" references="/0/CppOperationParameters/%/%.1">
-      <details key="start" value="976"/>
-      <details key="end" value="980"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.47" references="/0/CppOperationParameters/operation">
-      <details key="start" value="844"/>
-      <details key="end" value="865"/>
-      <details key="line" value="20"/>
-    </eAnnotations>
-    <eAnnotations source="positions.48" references="/0/CppOperationParameters/showDefault">
-      <details key="start" value="867"/>
-      <details key="end" value="888"/>
-      <details key="line" value="20"/>
-    </eAnnotations>
-    <eAnnotations source="positions.49" references="/0/%.1">
-      <details key="start" value="1031"/>
-      <details key="end" value="1107"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.50" references="/0/CppBehaviorParameters">
-      <details key="start" value="1108"/>
-      <details key="end" value="1329"/>
-      <details key="line" value="26"/>
-    </eAnnotations>
-    <eAnnotations source="positions.51" references="/0/CppBehaviorParameters/%">
-      <details key="start" value="1192"/>
-      <details key="end" value="1317"/>
-      <details key="line" value="27"/>
-    </eAnnotations>
-    <eAnnotations source="positions.52" references="/0/CppBehaviorParameters/%/%">
-      <details key="start" value="1284"/>
-      <details key="end" value="1309"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.53" references="/0/CppBehaviorParameters/%/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.54" references="/0/CppBehaviorParameters/%/%/showDefault">
-      <details key="start" value="1297"/>
-      <details key="end" value="1308"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.55" references="/0/CppBehaviorParameters/%/select">
-      <details key="start" value="1198"/>
-      <details key="end" value="1265"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.56" references="/0/CppBehaviorParameters/%/select/%">
-      <details key="start" value="1198"/>
-      <details key="end" value="1212"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.57" references="/0/CppBehaviorParameters/%/select/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.58" references="/0/CppBehaviorParameters/%/select/%.1">
-      <details key="start" value="1221"/>
-      <details key="end" value="1264"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.59" references="/0/CppBehaviorParameters/%/select/%.1/%">
-      <details key="start" value="1221"/>
-      <details key="end" value="1230"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.60" references="/0/CppBehaviorParameters/%/select/%.1/%/temp1">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.61" references="/0/CppBehaviorParameters/%/select/%.1/%.1">
-      <details key="start" value="1234"/>
-      <details key="end" value="1264"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.62" references="/0/CppBehaviorParameters/%/select/temp2">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.63" references="/0/CppBehaviorParameters/%/%.1">
-      <details key="start" value="1277"/>
-      <details key="end" value="1281"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.64" references="/0/CppBehaviorParameters/behavior">
-      <details key="start" value="1147"/>
-      <details key="end" value="1166"/>
-      <details key="line" value="26"/>
-    </eAnnotations>
-    <eAnnotations source="positions.65" references="/0/CppBehaviorParameters/showDefault">
-      <details key="start" value="1168"/>
-      <details key="end" value="1189"/>
-      <details key="line" value="26"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.mtl
deleted file mode 100644
index 9f1a560d469..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.mtl
+++ /dev/null
@@ -1,28 +0,0 @@
-[module CppParameter('http://www.eclipse.org/uml2/5.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/]
-[import org::eclipse::papyrus::acceleo::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::CppGenUtils/]
-
-[import org::eclipse::papyrus::cpp::codegen::utils::Modifier/]
-
-
-
-[template public defaultValue(parameter : Parameter)]
-[if (defaultValue <> null)] = [defaultValue.stringValue()/][/if]
-[/template]
-
-[comment C++ parameter. Default values are added, if parameter showDefault is true (implementation signature
-	may not repeat default value)/]
-[template public CppParameter(parameter : Parameter, showDefault : Boolean)]
-[modCVQualifier()/][parameter.type.cppQualifiedName()/][modPtr()/][modRef()/] [parameter.name/][modArray()/][if (showDefault)][defaultValue()/][/if]
-[/template]
-
-
-[template public CppOperationParameters(operation : Operation, showDefault : Boolean)]
-[for (ownedParameter->select(direction <> ParameterDirectionKind::return)) separator(', ')][CppParameter(showDefault)/][/for]
-[/template]
-
-
-[comment signature for a given behavior (e.g. effect within state machine)/]
-[template public CppBehaviorParameters(behavior : Behavior, showDefault : Boolean)]
-[for (ownedParameter->select(direction <> ParameterDirectionKind::return)) separator(', ')][CppParameter(showDefault)/][/for]
-[/template]
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenUtils.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenUtils.emtl
deleted file mode 100644
index 6a3055dab7b..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenUtils.emtl
+++ /dev/null
@@ -1,244 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="CppCodeGenUtils" nsURI="org::eclipse::papyrus::cpp::codegen::preferences::CppCodeGenUtils" startHeaderPosition="29" endHeaderPosition="93">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <ownedModuleElement xsi:type="mtl:Query" name="getHeaderSuffix" visibility="Public">
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/4">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getHeaderSuffix()">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(OclVoid)" kind="Sequence"/>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getBodySuffix" visibility="Public">
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getBodySuffix()">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(OclVoid)" kind="Sequence"/>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-    <ownedModuleElement xsi:type="mtl:Query" name="getCommentHeader" visibility="Public">
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getCommentHeader()">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(OclVoid)" kind="Sequence"/>
-      </expression>
-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="getHeaderSuffix">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getHeaderSuffix"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eOperations>
-      <eOperations name="getBodySuffix">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getBodySuffix"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eOperations>
-      <eOperations name="getCommentHeader">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/getCommentHeader"/>
-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-      <eOperations name="invoke">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <eParameters name="class">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-        <eParameters name="method">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-        <eParameters name="arguments">
-          <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OclVoid)" instanceClassName="java.util.List">
-      <elementType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" instanceClassName="java.util.List">
-      <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/getHeaderSuffix">
-      <details key="start" value="97"/>
-      <details key="end" value="246"/>
-      <details key="line" value="4"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/getHeaderSuffix/%">
-      <details key="start" value="141"/>
-      <details key="end" value="243"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/getHeaderSuffix/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/getHeaderSuffix/%/%">
-      <details key="start" value="148"/>
-      <details key="end" value="209"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/getHeaderSuffix/%/%.1">
-      <details key="start" value="211"/>
-      <details key="end" value="230"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/getHeaderSuffix/%/%.2">
-      <details key="start" value="232"/>
-      <details key="end" value="242"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/getBodySuffix">
-      <details key="start" value="249"/>
-      <details key="end" value="394"/>
-      <details key="line" value="8"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/getBodySuffix/%">
-      <details key="start" value="291"/>
-      <details key="end" value="391"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.8" references="/0/getBodySuffix/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.9" references="/0/getBodySuffix/%/%">
-      <details key="start" value="298"/>
-      <details key="end" value="359"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.10" references="/0/getBodySuffix/%/%.1">
-      <details key="start" value="361"/>
-      <details key="end" value="378"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.11" references="/0/getBodySuffix/%/%.2">
-      <details key="start" value="380"/>
-      <details key="end" value="390"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.12" references="/0/getCommentHeader">
-      <details key="start" value="396"/>
-      <details key="end" value="547"/>
-      <details key="line" value="11"/>
-    </eAnnotations>
-    <eAnnotations source="positions.13" references="/0/getCommentHeader/%">
-      <details key="start" value="441"/>
-      <details key="end" value="544"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.14" references="/0/getCommentHeader/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.15" references="/0/getCommentHeader/%/%">
-      <details key="start" value="448"/>
-      <details key="end" value="509"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.16" references="/0/getCommentHeader/%/%.1">
-      <details key="start" value="511"/>
-      <details key="end" value="531"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.17" references="/0/getCommentHeader/%/%.2">
-      <details key="start" value="533"/>
-      <details key="end" value="543"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenUtils.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenUtils.mtl
deleted file mode 100644
index 79db6cdbb36..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenUtils.mtl
+++ /dev/null
@@ -1,13 +0,0 @@
-[comment encoding = UTF-8 /]
-[module CppCodeGenUtils('http://www.eclipse.org/uml2/5.0.0/UML')/]
-
-[query public getHeaderSuffix() : String
-	= invoke('org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils', 'getHeaderSuffix()', Sequence{}) /]
-
-
-[query public getBodySuffix() : String
-	= invoke('org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils', 'getBodySuffix()', Sequence{}) /]
-
-[query public getCommentHeader() : String
-	= invoke('org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils', 'getCommentHeader()', Sequence{}) /]
-
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
index 9e71bad4d07..52a72afd31f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
@@ -26,54 +26,38 @@ import org.eclipse.jface.text.IDocument;
 import org.eclipse.papyrus.C_Cpp.CppRoot;

 import org.eclipse.papyrus.C_Cpp.ExternLibrary;

 import org.eclipse.papyrus.C_Cpp.External;

-import org.eclipse.papyrus.C_Cpp.Include;

-import org.eclipse.papyrus.C_Cpp.ManualGeneration;

 import org.eclipse.papyrus.C_Cpp.NoCodeGen;

-import org.eclipse.papyrus.C_Cpp.Template;

-import org.eclipse.papyrus.acceleo.AcceleoDriver;

-import org.eclipse.papyrus.acceleo.AcceleoException;

 import org.eclipse.papyrus.acceleo.GenUtils;

 import org.eclipse.papyrus.acceleo.ModelElementsCreator;

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

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

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

+import org.eclipse.papyrus.cpp.codegen.xtend.CppClassifierGenerator;

+import org.eclipse.papyrus.cpp.codegen.xtend.CppPackageHeaderGenerator;

 import org.eclipse.text.edits.MalformedTreeException;

 import org.eclipse.text.edits.TextEdit;

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

-import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Namespace;

 import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.util.UMLUtil;

 

 

 

 /**

  * Main class of code generator

+ * 

+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)

  */

 public class CppModelElementsCreator extends ModelElementsCreator {

 

-	public static final String ACCELEO_PREFIX = "org::eclipse::papyrus::cpp::codegen::acceleo::"; //$NON-NLS-1$

-

-	public static final String CppClassBody = ACCELEO_PREFIX + "CppClassBody"; //$NON-NLS-1$

-

-	public static final String CppClassHeader = ACCELEO_PREFIX + "CppClassHeader"; //$NON-NLS-1$

-

-	public static final String CppBindBody = ACCELEO_PREFIX + "CppBindBody"; //$NON-NLS-1$

-

-	public static final String CppBindHeader = ACCELEO_PREFIX + "CppBindHeader"; //$NON-NLS-1$

-

-	public static final String CppPackageHeader = ACCELEO_PREFIX + "CppPackageHeader"; //$NON-NLS-1$

-

 	public static final String DOT = "."; //$NON-NLS-1$

-

+	

 	/**

-	 *

+	 * 

 	 * Constructor.

-	 *

+	 * 

 	 * @param project

-	 *            the project in which the generated code should be placed

+	 *        the project in which the generated code should be placed

 	 */

 	public CppModelElementsCreator(IProject project) {

 		super(project, CppCodeGenUtils.getCommentHeader());

@@ -82,13 +66,13 @@ public class CppModelElementsCreator extends ModelElementsCreator {
 	}

 

 	/**

-	 *

+	 * 

 	 * Constructor.

-	 *

+	 * 

 	 * @param project

-	 *            the project in which the generated code should be placed

+	 *        the project in which the generated code should be placed

 	 * @param commentHeader

-	 *            Custom prefix for each generated file

+	 *        Custom prefix for each generated file

 	 */

 	public CppModelElementsCreator(IProject project, String commentHeader) {

 		super(project, commentHeader);

@@ -107,64 +91,13 @@ public class CppModelElementsCreator extends ModelElementsCreator {
 	 * generates 2 headers (one for the privates concrete operations and one for

 	 * the attributes, public operations and virtual / abstract operations and

 	 * one body file.

-	 *

+	 * 

 	 * @param folder

 	 * @param classifier

 	 * @throws CoreException

 	 */

-	@Override

 	protected void createClassifierFiles(IContainer container, Classifier classifier) throws CoreException {

-

-		// treat case of manual code generation

-		if (GenUtils.hasStereotype(classifier, ManualGeneration.class)) {

-			ManualGeneration mg = UMLUtil.getStereotypeApplication(classifier, ManualGeneration.class);

-			Include cppInclude = UMLUtil.getStereotypeApplication(classifier, Include.class);

-			try {

-				String fileContent = commentHeader +

-						AcceleoDriver.evaluate(cppInclude.getHeader(), classifier, null);

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

-

-				// String manualURI = "TODO";

-				// fileContent = AcceleoDriver.evaluateURI(new URI(CppPackageHeader)), classifier);

-

-				fileContent = commentHeader +

-						AcceleoDriver.evaluate(cppInclude.getPreBody(), classifier, null) + GenUtils.NL +

-						AcceleoDriver.evaluate(cppInclude.getBody(), classifier, null) + GenUtils.NL;

-				String ext = GenUtils.maskNull(mg.getExtensionBody());

-				if (ext.length() == 0) {

-					ext = cppExt;

-				}

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

-			} catch (AcceleoException e) {

-				Activator.log.error(e);

-			}

-		}

-

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

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

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

-				(!(classifier instanceof Association))) {

-

-			// Template Bound Class

-			if (GenUtils.isTemplateBoundElement(classifier)) {

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

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

-

-				fileContent = commentHeader + AcceleoDriver.evaluateURI(CppBindBody, classifier);

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

-			}

-			else {

-				// Header file generation

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

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

-

-				// Create class body

-				if (classifier instanceof Class) {

-					fileContent = commentHeader + AcceleoDriver.evaluateURI(CppClassBody, classifier);

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

-				}

-			}

-		}

+		CppClassifierGenerator.generate(container, classifier, commentHeader);

 	}

 

 	@Override

@@ -174,15 +107,14 @@ public class CppModelElementsCreator extends ModelElementsCreator {
 	}

 

 	/**

-	 * Apply the user's currently selected formatting options to the input content. Return the

+	 * Apply the user's currently selected formatting options to the input content.  Return the

 	 * input String in case of error.

 	 */

 	private static String format(String content) {

 

 		// do nothing if the CDT plugin is not loaded

-		if (Platform.getBundle(CCorePlugin.PLUGIN_ID) == null) {

+		if (Platform.getBundle(CCorePlugin.PLUGIN_ID) == null)

 			return content;

-		}

 

 		CodeFormatter codeFormatter = ToolFactory.createCodeFormatter(null);

 		IDocument doc = new Document(content);

@@ -208,21 +140,18 @@ public class CppModelElementsCreator extends ModelElementsCreator {
 

 	@Override

 	protected void createPackageFiles(IContainer packageContainer, IProgressMonitor monitor, Package pkg) throws CoreException {

-		// Creates the header for the package.

-		String fileContent = commentHeader + AcceleoDriver.evaluateURI(CppPackageHeader, pkg);

-		createFile(packageContainer, "Pkg_" + pkg.getName() + DOT + hppExt, fileContent, true); //$NON-NLS-1$

+		CppPackageHeaderGenerator.generate(packageContainer, pkg);

 	}

 

 

-	@Override

 	protected boolean isRoot(Namespace ns) {

 		return GenUtils.hasStereotype(ns, CppRoot.class);

 	}

 

-	@Override

 	protected boolean noCodeGen(Element element) {

-		return GenUtils.hasStereotype(element, NoCodeGen.class) ||

-				GenUtils.hasStereotype(element, External.class) ||

-				GenUtils.hasStereotypeTree(element, ExternLibrary.class);

+		return

+			GenUtils.hasStereotype(element, NoCodeGen.class) ||

+			GenUtils.hasStereotype(element, External.class) ||

+			GenUtils.hasStereotypeTree(element, ExternLibrary.class);

 	}

 }

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ClassUtils.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ClassUtils.emtl
deleted file mode 100644
index 1e5df902647..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ClassUtils.emtl
+++ /dev/null
@@ -1,164 +0,0 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
-  <mtl:Module name="ClassUtils" nsURI="org::eclipse::papyrus::cpp::codegen::utils::ClassUtils" startHeaderPosition="29" endHeaderPosition="88">
-    <input>
-      <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-    </input>
-    <ownedModuleElement xsi:type="mtl:Query" name="includedClassifiers" visibility="Public" type="/3/Sequence(Classifier)">
-      <parameter name="cl">
-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </parameter>
-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </source>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.utils.ClassUtils">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="includedClassifiers(org.eclipse.uml2.uml.Classifier)">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </argument>
-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Classifier)" kind="Sequence">
-          <part xsi:type="ocl.ecore:CollectionItem">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            <item xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/includedClassifiers/cl">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-            </item>
-          </part>
-        </argument>
-      </expression>
-    </ownedModuleElement>
-  </mtl:Module>
-  <ecore:EPackage name="additions">
-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-      </eAnnotations>
-      <eOperations name="includedClassifiers" eType="/3/Sequence(Classifier)">
-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-          <contents xsi:type="ocl.ecore:Constraint"/>
-        </eAnnotations>
-        <eAnnotations source="MTL" references="/0/includedClassifiers"/>
-        <eParameters name="cl">
-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-      </eAnnotations>
-      <eOperations name="invoke">
-        <eAnnotations source="MTL non-standard"/>
-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-        <eParameters name="class">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-        <eParameters name="method">
-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        </eParameters>
-        <eParameters name="arguments">
-          <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
-        </eParameters>
-      </eOperations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class">
-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
-        <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-      </eAnnotations>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EPackage name="collections">
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Classifier)" instanceClassName="java.util.List">
-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ocl.ecore:SequenceType" instanceClassName="java.util.List">
-      <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
-    </eClassifiers>
-  </ecore:EPackage>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </ocl.ecore:Variable>
-  <ocl.ecore:Variable name="self">
-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </ocl.ecore:Variable>
-  <ecore:EAnnotation source="positions">
-    <eAnnotations source="positions.0" references="/0/includedClassifiers">
-      <details key="start" value="92"/>
-      <details key="end" value="300"/>
-      <details key="line" value="4"/>
-    </eAnnotations>
-    <eAnnotations source="positions.1" references="/0/includedClassifiers/cl">
-      <details key="start" value="126"/>
-      <details key="end" value="141"/>
-      <details key="line" value="4"/>
-    </eAnnotations>
-    <eAnnotations source="positions.2" references="/0/includedClassifiers/%">
-      <details key="start" value="169"/>
-      <details key="end" value="297"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.3" references="/0/includedClassifiers/%/self">
-      <details key="start" value="-1"/>
-      <details key="end" value="-1"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.4" references="/0/includedClassifiers/%/%">
-      <details key="start" value="176"/>
-      <details key="end" value="226"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.5" references="/0/includedClassifiers/%/%.1">
-      <details key="start" value="228"/>
-      <details key="end" value="282"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.6" references="/0/includedClassifiers/%/%.2">
-      <details key="start" value="284"/>
-      <details key="end" value="296"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-    <eAnnotations source="positions.7" references="/0/includedClassifiers/%/%.2/%/cl">
-      <details key="start" value="293"/>
-      <details key="end" value="295"/>
-      <details key="line" value="0"/>
-    </eAnnotations>
-  </ecore:EAnnotation>
-</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ClassUtils.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ClassUtils.java
index 5a1aaf25527..ce009fc9a29 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ClassUtils.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ClassUtils.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.common.util.UniqueEList;
 import org.eclipse.papyrus.acceleo.GenUtils;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.Interface;
 
 /**
  * A set of utility functions related to classes.
@@ -43,7 +44,8 @@ public class ClassUtils {
 		// realized interface dependencies
 		if (currentClass instanceof Class) {
 			Class clazz = (Class) currentClass;
-			usedClasses.addAll(clazz.getImplementedInterfaces());
+			EList<Interface> implementedInterfaces = clazz.getImplementedInterfaces();
+			usedClasses.addAll(implementedInterfaces);
 		}
 		// dependencies and associations
 		usedClasses.addAll(GenUtils.getTypesViaRelationshipsNoDeps(currentClass));
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ClassUtils.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ClassUtils.mtl
deleted file mode 100644
index 13fe22ce295..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ClassUtils.mtl
+++ /dev/null
@@ -1,6 +0,0 @@
-[comment encoding = UTF-8 /]
-[module ClassUtils('http://www.eclipse.org/uml2/5.0.0/UML')/]
-
-[query public includedClassifiers(cl : Classifier) : Sequence(Classifier)
-	= invoke('org.eclipse.papyrus.cpp.codegen.utils.ClassUtils', 'includedClassifiers(org.eclipse.uml2.uml.Classifier)', Sequence{cl}) /]
-
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppAttribute.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppAttribute.xtend
new file mode 100644
index 00000000000..2f7dd1c9e5b
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppAttribute.xtend
@@ -0,0 +1,70 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import org.eclipse.uml2.uml.Classifier
+import org.eclipse.uml2.uml.Class
+import org.eclipse.uml2.uml.DataType
+import org.eclipse.uml2.uml.Interface
+import org.eclipse.uml2.uml.Signal
+import org.eclipse.uml2.uml.Property
+import org.eclipse.papyrus.acceleo.GenUtils
+import org.eclipse.papyrus.C_Cpp.Const
+import org.eclipse.papyrus.cpp.codegen.utils.Modifier
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+class CppAttribute {
+
+	//  Loop over attributes. Check that the attribute is not a static const.
+	//	Constant static attributes are declared within the class declaration 
+	static def CppStaticAttributes(Classifier classifier) {
+		var code = '''
+			// static attributes (if any)
+			«FOR ownedAttribute : getOwnedAttributes(classifier)»
+				«IF (ownedAttribute.isStatic && !GenUtils.hasStereotype(ownedAttribute, Const))»
+					«CppStaticAttributeImplementation(ownedAttribute)»
+				«ENDIF»
+			«ENDFOR»
+		'''
+		return code
+	}
+
+	//return a list of owned attributes, since this is not supported directly on a classifier
+	static def getOwnedAttributes(Classifier cl) {
+		if (cl instanceof Class) {
+			(cl as Class).ownedAttributes
+		} else if (cl instanceof DataType) {
+			(cl as DataType).ownedAttributes
+		} else if (cl instanceof Interface) {
+			(cl as Interface).ownedAttributes
+		} else if (cl instanceof Signal) {
+			(cl as Signal).ownedAttributes
+		} else {
+			//Sequence{}
+		}
+	}
+
+	static def CppStaticAttributeImplementation(Property attribute) '''
+		«CppDocumentation.CppElementDoc(attribute)»
+		«CppGenUtils.cppQualifiedName(attribute.type)»«Modifier.modPtr(attribute)»«Modifier.modRef(attribute)»  «attribute.class_.name»::«attribute.name»«Modifier.modArray(attribute)»«defaultValue(attribute)»;
+	'''
+
+	static def defaultValue(Property attribute) {
+		if ((attribute.defaultValue != null) && attribute.isStatic) {
+			"=" + attribute.defaultValue.stringValue()
+		}
+	}
+
+	static def CppAttributeDeclaration(Property attribute) '''
+		«CppDocumentation.CppElementDoc(attribute)»
+		«staticValue(attribute)» «Modifier.modCVQualifier(attribute)»«CppGenUtils.cppQualifiedName(attribute.type)»«Modifier.
+			modPtr(attribute)»«Modifier.modRef(attribute)» «attribute.name»«Modifier.modArray(attribute)»«IF GenUtils.
+			hasStereotype(attribute, Const)»«defaultValue(attribute)»«ENDIF»;
+	'''
+
+	static def staticValue(Property attribute) {
+		if (attribute.isStatic) 'static'
+	}
+
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassAttributesDeclaration.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassAttributesDeclaration.xtend
new file mode 100644
index 00000000000..d272163fb1f
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassAttributesDeclaration.xtend
@@ -0,0 +1,15 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import org.eclipse.uml2.uml.Classifier
+import org.eclipse.uml2.uml.VisibilityKind
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+class CppClassAttributesDeclaration {
+	static def CppClassAttributesDeclaration(Classifier clazz, VisibilityKind visibilityFilter) '''
+		«FOR oa : CppAttribute.getOwnedAttributes(clazz).filter[it.visibility == visibilityFilter]»
+			«CppAttribute.CppAttributeDeclaration(oa)»
+		«ENDFOR»
+	'''
+}
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassFriendDeclaration.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassFriendDeclaration.xtend
new file mode 100644
index 00000000000..d754cf6f4d8
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassFriendDeclaration.xtend
@@ -0,0 +1,24 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import org.eclipse.uml2.uml.Classifier
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils
+import org.eclipse.papyrus.acceleo.GenUtils
+import org.eclipse.papyrus.C_Cpp.Friend
+import org.eclipse.papyrus.C_Cpp.NoCodeGen
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+class CppClassFriendDeclaration {
+	static def CppClassFriendDeclaration(Classifier friend) '''
+		friend class «CppGenUtils.cppQualifiedName(friend)»
+	'''
+
+	static def CppClassIncludeFriendDeclaration(Classifier clazz) {
+		for (uc : GenUtils.getUsedClassifiers(clazz)) {
+			if (GenUtils.hasStereotype(uc, Friend) && (!GenUtils.hasStereotype(uc, NoCodeGen))) {
+				CppClassFriendDeclaration(uc)
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeClassDeclaration.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeClassDeclaration.xtend
new file mode 100644
index 00000000000..1ec45f63da6
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeClassDeclaration.xtend
@@ -0,0 +1,58 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import org.eclipse.papyrus.C_Cpp.CppRoot
+import org.eclipse.papyrus.acceleo.GenUtils
+import org.eclipse.uml2.uml.Package
+import org.eclipse.uml2.uml.Classifier
+import org.eclipse.emf.common.util.EList
+import org.eclipse.papyrus.C_Cpp.NoCodeGen
+import org.eclipse.papyrus.C_Cpp.External
+import org.eclipse.uml2.uml.Enumeration
+import org.eclipse.uml2.uml.PrimitiveType
+import java.util.List
+import java.util.ArrayList
+import org.eclipse.papyrus.cpp.codegen.utils.ClassUtils
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+class CppClassIncludeClassDeclaration {
+ 	
+ 	static def cppOwnerPackageIncludePath(Package pkg) {
+		if ((pkg != null) && (!GenUtils.hasStereotype(pkg, CppRoot))) {
+			return GenUtils.getFullPath(pkg) + '/Pkg_' + pkg.name + '.h'
+		} else {
+			return null
+		}
+	}
+	
+	static def CppClassAllIncludesDeclarationBody(Classifier classifier) { 
+		cppClassAllIncludes(classifier, GenUtils.getTypesViaDependencies(classifier))
+	}
+	
+	static def cppClassAllIncludes(Classifier classifier, EList<Classifier> list) {
+		var List<String> newList = new ArrayList<String>()
+		for (cl : list) {
+			//var String str = null
+			if ((cl != classifier) && (!GenUtils.hasStereotype(cl, NoCodeGen)) || (GenUtils.hasStereotype(cl, External))) {
+				if ((cl instanceof Enumeration) || (cl instanceof PrimitiveType)) {
+					if ((cl.owner != null) && (cl.owner instanceof Package)) {
+						var includePath = (cl.owner as Package).cppOwnerPackageIncludePath
+						if (!newList.contains(includePath)) newList.add(includePath)
+					} else {
+						//str = null
+					}
+				} else {
+					newList.addAll(CppClassIncludeDeclaration.cppClassIncludes(cl))
+				}
+			} else {
+				//str = null
+			}
+		}
+		return newList.filter[str | str != null]
+	}
+	
+	static def CppClassAllIncludes(Classifier clazz) {
+		cppClassAllIncludes(clazz, ClassUtils.includedClassifiers(clazz))
+	}
+}
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeDeclaration.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeDeclaration.xtend
new file mode 100644
index 00000000000..a612b90f92a
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeDeclaration.xtend
@@ -0,0 +1,40 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import java.util.ArrayList
+import java.util.List
+import org.eclipse.papyrus.C_Cpp.ExternLibrary
+import org.eclipse.papyrus.C_Cpp.External
+import org.eclipse.papyrus.C_Cpp.Template
+import org.eclipse.papyrus.acceleo.GenUtils
+import org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils
+import org.eclipse.uml2.uml.NamedElement
+import org.eclipse.uml2.uml.util.UMLUtil
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+class CppClassIncludeDeclaration {
+	
+	static def cppClassIncludes(NamedElement ne) {
+		var List<String> result = new ArrayList<String>()
+		if (GenUtils.hasStereotypeTree(ne, ExternLibrary)) {
+			result = GenUtils.getApplicationTree(ne, ExternLibrary).includes
+		} else {
+			result.add(includeName(ne))
+		}
+		return result
+	}
+	
+	static def includeName(NamedElement ne) {
+		if (GenUtils.hasStereotypeTree(ne, Template)) {
+			return UMLUtil.getStereotypeApplication(ne, Template).declaration
+		} else {
+			if (GenUtils.hasStereotypeTree(ne, External)) {
+				return UMLUtil.getStereotypeApplication(ne, External).name
+			} else {
+				// standard case (no stereotypes are applied)
+				return GenUtils.getFullPath(ne.nearestPackage) + '/' + ne.name + '.' + CppCodeGenUtils.getHeaderSuffix()
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassInheritedDeclarations.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassInheritedDeclarations.xtend
new file mode 100644
index 00000000000..01cbd24bb6f
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassInheritedDeclarations.xtend
@@ -0,0 +1,38 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import org.eclipse.papyrus.C_Cpp.NoCodeGen
+import org.eclipse.papyrus.C_Cpp.Visibility
+import org.eclipse.papyrus.acceleo.GenUtils
+import org.eclipse.uml2.uml.Classifier
+import org.eclipse.uml2.uml.Generalization
+import org.eclipse.uml2.uml.InterfaceRealization
+import org.eclipse.uml2.uml.Relationship
+import org.eclipse.uml2.uml.util.UMLUtil
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+class CppClassInheritedDeclarations {
+	
+	static def CppClassInheritedDeclarations(Classifier clazz) '''
+		«IF (filteredRelationships(clazz).length > 0)» : «ENDIF»
+		«FOR fr: filteredRelationships(clazz) SEPARATOR ', \n'»
+			«getCppVisibility(fr)» «CppGenUtils.cppQualifiedName(fr.targets.get(0) as Classifier)»«ENDFOR»	
+	'''
+	
+	//Return a list of relationships that are either Generalizations or InterfaceRealiazations
+	//and the target does not point to a classifier that has the no-code-gen Stereotype
+	//TODO: not sure if it makes sense NOT to declare an inheritance, since we do not generate code.
+	static def filteredRelationships(Classifier clazz) {
+		clazz.sourceDirectedRelationships.filter[((it instanceof Generalization) || (it instanceof InterfaceRealization)) && (!GenUtils.hasStereotype(it.targets.get(0), NoCodeGen))]
+	}
+	
+	static def getCppVisibility(Relationship relationship) {
+		if (GenUtils.hasStereotype(relationship, Visibility)) {
+			(UMLUtil.getStereotypeApplication(relationship, Visibility) as Visibility).value 
+		} else { 
+			'public'
+		}
+	}
+}
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsDeclaration.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsDeclaration.xtend
new file mode 100644
index 00000000000..e986acbb236
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsDeclaration.xtend
@@ -0,0 +1,25 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import org.eclipse.uml2.uml.Classifier
+import org.eclipse.uml2.uml.OpaqueBehavior
+import org.eclipse.uml2.uml.VisibilityKind
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+class CppClassOperationsDeclaration {
+	
+	static def CppClassOperationsDeclaration(Classifier clazz, VisibilityKind visibilityFilter) '''
+		«FOR op : CppOperations.getOwnedOperations(clazz).filter[it.visibility == visibilityFilter]»
+		
+		«CppOperations.CppOperationDeclaration(op)»
+		«ENDFOR»
+		«FOR b : clazz.eAllContents.toList.filter(OpaqueBehavior).filter[it.visibility == visibilityFilter]»
+			«IF b.specification == null»
+			
+			// opaque behavior without specification (typically from state machine)
+			«CppOperations.CppBehaviorDeclaration(b)»
+			«ENDIF»
+		«ENDFOR»
+	'''
+}
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsImplementation.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsImplementation.xtend
new file mode 100644
index 00000000000..abb5ae392fa
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsImplementation.xtend
@@ -0,0 +1,29 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import org.eclipse.uml2.uml.Classifier
+import org.eclipse.papyrus.acceleo.GenUtils
+import org.eclipse.papyrus.C_Cpp.NoCodeGen
+import org.eclipse.uml2.uml.OpaqueBehavior
+import org.eclipse.papyrus.C_Cpp.Inline
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+class CppClassOperationsImplementation {
+	
+	// implementations of a classifier, parameter controls whether only inline (or only not inline) operations
+	//are produced
+	static def CppClassOperationsImplementation(Classifier clazz, boolean inline) '''
+		«FOR ownedOperation : CppOperations.getOwnedOperations(clazz).filter[(!(GenUtils.hasStereotype(it, NoCodeGen) || it.isAbstract)) && (GenUtils.hasStereotype(it, org.eclipse.papyrus.C_Cpp.Inline) == inline)] SEPARATOR "\n"»
+			«CppOperations.CppOperationImplementation(ownedOperation)»
+		«ENDFOR»
+		
+		«FOR b : clazz.eAllContents.toIterable.filter[(it instanceof OpaqueBehavior) && GenUtils.hasStereotype((it as OpaqueBehavior), Inline)==inline]»
+			«IF (b as OpaqueBehavior).specification == null»
+				// opaque behavior without specification (typically from state machine)
+				«CppOperations.CppBehaviorImplementation(b as OpaqueBehavior)»
+			«ENDIF»
+		«ENDFOR»
+	'''
+	
+}
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassTypeAndEnum.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassTypeAndEnum.xtend
new file mode 100644
index 00000000000..f3e1a8d3d5c
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassTypeAndEnum.xtend
@@ -0,0 +1,52 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import org.eclipse.papyrus.C_Cpp.NoCodeGen
+import org.eclipse.papyrus.acceleo.GenUtils
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils
+import org.eclipse.uml2.uml.Classifier
+import org.eclipse.uml2.uml.Element
+import org.eclipse.uml2.uml.Enumeration
+import org.eclipse.uml2.uml.Namespace
+import org.eclipse.uml2.uml.Package
+import org.eclipse.uml2.uml.PrimitiveType
+import org.eclipse.uml2.uml.VisibilityKind
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+class CppClassTypeAndEnum {
+	
+	static def CppClassTypeAndEnum(Classifier clazz) '''
+		«var publicStr = TypesAndEnumsForVisibility(clazz, VisibilityKind.PUBLIC_LITERAL).toString»
+		«CppGenUtils.getSection(VisibilityKind.PUBLIC_LITERAL, publicStr)»
+		«var protectedStr = TypesAndEnumsForVisibility(clazz, VisibilityKind.PROTECTED_LITERAL).toString»
+		«CppGenUtils.getSection(VisibilityKind.PROTECTED_LITERAL, protectedStr)»
+		«var privateStr = TypesAndEnumsForVisibility(clazz, VisibilityKind.PRIVATE_LITERAL).toString»
+		«CppGenUtils.getSection(VisibilityKind.PRIVATE_LITERAL, privateStr)»
+	'''
+	
+	static def CppClassTypeAndEnumPackage(Package pkg) {
+		TypesAndEnumsForVisibility(pkg, VisibilityKind.get(VisibilityKind.PACKAGE))
+		TypesAndEnumsForVisibility(pkg, VisibilityKind.get(VisibilityKind.PUBLIC))
+	}
+
+	static def TypesAndEnumsForVisibility(Namespace ne, VisibilityKind visibilityFilter) '''
+		«FOR ownedElement : ne.ownedElements»
+			«TypeAndEnumForVisibility(ownedElement, visibilityFilter)»
+		«ENDFOR»
+	'''
+
+	static def TypeAndEnumForVisibility(Element element, VisibilityKind visibilityFilter) {
+		if ((!GenUtils.hasStereotype(element, NoCodeGen)) && (element instanceof Classifier)) {
+			var elementVisibility = (element as Classifier).visibility
+			var value = elementVisibility.value
+			if ((value == visibilityFilter.value)) {
+				if (element instanceof Enumeration) {
+					return CppEnumerations.CppEnumerationDefinition(element as Enumeration)
+				} else if (element instanceof PrimitiveType) {
+					return CppPrimitiveTypes.CppPrimitiveTypeDefinition(element as PrimitiveType)
+				}	
+			}
+		}
+	}
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassifierGenerator.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassifierGenerator.xtend
new file mode 100644
index 00000000000..f2860230b23
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassifierGenerator.xtend
@@ -0,0 +1,330 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import org.eclipse.core.resources.IContainer
+import org.eclipse.papyrus.C_Cpp.ExternLibrary
+import org.eclipse.papyrus.C_Cpp.External
+import org.eclipse.papyrus.C_Cpp.Include
+import org.eclipse.papyrus.C_Cpp.ManualGeneration
+import org.eclipse.papyrus.C_Cpp.NoCodeGen
+import org.eclipse.papyrus.C_Cpp.Template
+import org.eclipse.papyrus.C_Cpp.Union
+import org.eclipse.papyrus.acceleo.GenUtils
+import org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils
+import org.eclipse.uml2.uml.Association
+import org.eclipse.uml2.uml.Class
+import org.eclipse.uml2.uml.Classifier
+import org.eclipse.uml2.uml.DataType
+import org.eclipse.uml2.uml.Element
+import org.eclipse.uml2.uml.NamedElement
+import org.eclipse.uml2.uml.VisibilityKind
+import org.eclipse.uml2.uml.profile.standard.Create
+import org.eclipse.uml2.uml.util.UMLUtil
+import org.eclipse.papyrus.acceleo.AcceleoDriver
+import org.eclipse.papyrus.cpp.codegen.transformation.CppModelElementsCreator
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+class CppClassifierGenerator extends CppFileGenerator {
+
+	static def generate(IContainer container, Classifier classifier, String commentHeader) {
+
+		// treat case of manual code generation
+		if (GenUtils.hasStereotype(classifier, ManualGeneration)) {
+			var ManualGeneration mg = UMLUtil.getStereotypeApplication(classifier, ManualGeneration);
+			var Include cppInclude = UMLUtil.getStereotypeApplication(classifier, Include);
+			var fileContentH = commentHeader +
+					AcceleoDriver.evaluate(cppInclude.getHeader(), classifier, null);
+
+			// generate header code
+			val fileNameH = classifier.getName() + CppModelElementsCreator.DOT + CppCodeGenUtils.getHeaderSuffix()
+			generateFile(container, fileNameH, fileContentH, true);
+
+			// generate body code
+			val fileContentB = commentHeader +
+				AcceleoDriver.evaluate(cppInclude.getPreBody(), classifier, null) + GenUtils.NL +
+				AcceleoDriver.evaluate(cppInclude.getBody(), classifier, null) + GenUtils.NL;
+			var ext = GenUtils.maskNull(mg.getExtensionBody());
+			if (ext.length() == 0) {
+				ext = CppCodeGenUtils.getBodySuffix();
+			}
+			val fileNameB = classifier.getName() + CppModelElementsCreator.DOT + ext;
+			generateFile(container, fileNameB, fileContentB, true);
+		}
+
+		// Only generate when no CppNoCodeGen stereotype is applied to the class
+		else if ((!classifier.noCodeGen) && (!GenUtils.hasStereotype(classifier, Template)) &&
+			(!(classifier instanceof Association))) {
+
+			// Template Bound Class
+			if (GenUtils.isTemplateBoundElement(classifier)) {
+				val bindHeaderFileName = classifier.getName() + "." + CppCodeGenUtils.getHeaderSuffix()
+				generateFile(container, bindHeaderFileName, commentHeader + classifier.generateBindHeaderCode, true);
+
+				var bindBodyFileName = classifier.getName() + "." + CppCodeGenUtils.getBodySuffix()
+				generateFile(container, bindBodyFileName, commentHeader + classifier.generateBindBodyCode, true);
+			}
+			else {
+
+				// Class Header file generation
+				val classHeaderFileName = classifier.getName() + "." + CppCodeGenUtils.getHeaderSuffix()
+				generateFile(container, classHeaderFileName, commentHeader + classifier.generateClassHeaderCode, true);
+
+				// Class Body file generation
+				if (classifier instanceof Class) {
+					var classBodyFileName = classifier.getName() + "." + CppCodeGenUtils.getBodySuffix()
+					generateFile(container, classBodyFileName, commentHeader + classifier.generateClassBodyCode, true);
+				}
+			}
+		}
+	}
+
+	static def noCodeGen(Element element) {
+		return GenUtils.hasStereotype(element, NoCodeGen) || GenUtils.hasStereotype(element, External) ||
+			GenUtils.hasStereotypeTree(element, ExternLibrary);
+	}
+
+	static def generateHeaderCode(Classifier classifier, String commentHeader) {
+		var code = ''' 
+			«commentHeader»
+			AcceleoDriver.evaluate(cppInclude.getHeader(), classifier, null);
+		'''
+		return code
+	}
+
+	static def generateBindHeaderCode(Classifier classifier) {
+		var code = ''' 
+		#ifndef «GenUtils.getFullNameUC(classifier)»_H
+		#define «GenUtils.getFullNameUC(classifier)»_H
+		
+		/************************************************************
+		              «classifier.name» template binding header
+		 ************************************************************/
+		
+		«CppIncludeUtil.includeDirective(CppClassIncludeClassDeclaration.cppOwnerPackageIncludePath(classifier.package))»
+		
+		«FOR path : getSortedIncludePathList(classifier)» 
+			«CppIncludeUtil.includeDirective(path)»
+		«ENDFOR»
+		
+		«CppIncludeUtil.CppIncludeHeader(classifier)»
+		
+		«var tb = classifier.templateBindings»
+		«var templateElement = tb.get(0)»
+		«CppIncludeUtil.includeDirective(
+			GenUtils.getFullPath(classifier.package) + '/' + (templateElement.owner as NamedElement).name + '.' +
+				CppCodeGenUtils.getHeaderSuffix())»
+		
+		«CppGenUtils.openNS(classifier)»
+		/************************************************************/
+		typedef «(templateElement.owner as NamedElement).name»«FOR ps : templateElement.parameterSubstitutions»«CppTemplates.
+			CppTemplateBindingParameter(ps)»«ENDFOR» «classifier.name»;
+		
+		«CppGenUtils.closeNS(classifier)»
+		
+		/************************************************************
+		              End of «classifier.name» template binding header
+		 ************************************************************/
+		
+		#endif'''
+		return code
+	}
+
+	static def getSortedIncludePathList(Classifier classifier) {
+		var includePathList = CppClassIncludeClassDeclaration.CppClassAllIncludes(classifier).sort;
+		return includePathList
+	}
+
+	static def generateBindBodyCode(Classifier classifier) {
+		var code = '''
+		#define «GenUtils.getFullNameUC(classifier)»_BODY
+		
+		/************************************************************
+		              «classifier.name» template binding body
+		 ************************************************************/
+		
+		«CppIncludeUtil.CppIncludePreBody(classifier)»
+		
+		// include associated header file
+		«CppIncludeUtil.includeDirective(
+			GenUtils.getFullPath(classifier.package) + '/' + classifier.name + '.' + CppCodeGenUtils.getHeaderSuffix())»
+		
+		«CppIncludeUtil.CppIncludeBody(classifier)»
+		
+		«CppGenUtils.openNS(classifier)»
+		
+		// Derived includes directives
+		«FOR path : CppClassIncludeClassDeclaration.CppClassAllIncludes(classifier).sort» 
+			«CppIncludeUtil.includeDirective(path)»
+		«ENDFOR»
+		
+		/************************************************************/
+		«var tb = GenUtils.getTemplateBindings(classifier as Class)»
+		«var templateElement = tb.targets.get(0)»
+		template class «(templateElement.owner as NamedElement).name»<«FOR ps : tb.parameterSubstitutions»«CppTemplates.
+			CppTemplateBindingParameter(ps)»«ENDFOR»;
+		
+		«CppGenUtils.closeNS(classifier)»
+		
+		/************************************************************
+		              End of «classifier.name» template binding body
+		 ************************************************************/'''
+		return code
+	}
+
+	static def generateClassHeaderCode(Classifier classifier) {
+		var code = '''
+		#ifndef «GenUtils.getFullNameUC(classifier)»_H
+		#define «GenUtils.getFullNameUC(classifier)»_H
+		
+		/************************************************************
+		              «classifier.name» class header
+		 ************************************************************/
+		
+		«CppIncludeUtil.includeDirective(CppClassIncludeClassDeclaration.cppOwnerPackageIncludePath(classifier.package))»
+		
+		«FOR path : getSortedIncludePathList(classifier)» 
+			«CppIncludeUtil.includeDirective(path)»
+		«ENDFOR»
+		
+		«CppIncludeUtil.CppIncludeHeader(classifier)»
+		
+		«CppGenUtils.openNS(classifier)»
+		
+		/************************************************************/
+		«CppDocumentation.CppElementDoc(classifier)»
+		«CppTemplates.templateSignature(classifier)»«classUnionOrStruct(classifier)» «classifier.name»«CppClassInheritedDeclarations.
+			CppClassInheritedDeclarations(classifier)» {
+		«CppClassFriendDeclaration.CppClassIncludeFriendDeclaration(classifier)»«CppClassTypeAndEnum.
+			CppClassTypeAndEnum(classifier)»
+			«var publicVisibility = VisibilityKind.PUBLIC_LITERAL»
+			   «CppGenUtils.getSection(publicVisibility, defaultInitializer(classifier))»
+			   «CppGenUtils.getSection(publicVisibility,
+			CppClassAttributesDeclaration.CppClassAttributesDeclaration(classifier, publicVisibility).toString)»
+			   «CppGenUtils.getSection(publicVisibility,
+			CppClassOperationsDeclaration.CppClassOperationsDeclaration(classifier, publicVisibility).toString)»
+		
+			«var protectedVisibility = VisibilityKind.PROTECTED_LITERAL»
+			   «CppGenUtils.getSection(protectedVisibility,
+			CppClassAttributesDeclaration.CppClassAttributesDeclaration(classifier, protectedVisibility).toString)»
+			   «CppGenUtils.getSection(protectedVisibility,
+			CppClassOperationsDeclaration.CppClassOperationsDeclaration(classifier, protectedVisibility).toString)»
+		
+			«var privateVisibility = VisibilityKind.PRIVATE_LITERAL»
+			   «CppGenUtils.getSection(privateVisibility,
+			CppClassAttributesDeclaration.CppClassAttributesDeclaration(classifier, privateVisibility).toString)»
+			   «CppGenUtils.getSection(privateVisibility,
+			CppClassOperationsDeclaration.CppClassOperationsDeclaration(classifier, privateVisibility).toString)»
+		};
+		/************************************************************/
+		/* External declarations (package visibility)               */
+		«var packageVisibility = VisibilityKind.PACKAGE_LITERAL»
+		«CppClassAttributesDeclaration.CppClassAttributesDeclaration(classifier, packageVisibility)»
+		«CppClassOperationsDeclaration.CppClassOperationsDeclaration(classifier, packageVisibility)»
+		/************************************************************/
+		
+		«IF CppTemplates.isTemplate(classifier)»
+			/************************************************************/
+			/* Template functions                                       */
+			«CppClassOperationsImplementation.CppClassOperationsImplementation(classifier, false)»
+		«ENDIF»
+		
+		/* Inline functions                                         */
+		«CppClassOperationsImplementation.CppClassOperationsImplementation(classifier, true)»
+		«CppGenUtils.closeNS(classifier)»
+		
+		/************************************************************
+		              End of «classifier.name» class header
+		 ************************************************************/
+		
+		#endif'''
+		return code
+	}
+
+	static def classUnionOrStruct(Classifier classifier) {
+		if (GenUtils.hasStereotype(classifier, Union)) {
+			return 'union'
+		} else {
+			if (classifier instanceof DataType) {
+				CppGenUtils.resetVisibility(VisibilityKind.PUBLIC_LITERAL)
+				return 'struct'
+			} else {
+				CppGenUtils.resetVisibility(VisibilityKind.PRIVATE_LITERAL)
+				return 'class'
+			}
+		}
+	}
+
+	/**
+	 * default initializer for non-static attributes with a default value TODO: should be disabled by default, since non-static members can be initialized directly in C++ 011
+	 */
+	static def defaultInitializer(Classifier classifier) {
+
+		/*	Bug 422373: The default initializer should not be generated if there are any user-defined
+		constructors.  In plain C++ code, the existence of a constructor with parameters
+		means that the compiler will not synthesize a default one.
+		
+		E.g., this would be invalid in plain C++ code:
+		class T1 { };
+		class T2 { public: T(int); };
+		T1 * t1 = new T1;     // OK, sythesized default constructor used
+		T2 * t2a = new T2(5); // OK, user-defined constructor used
+		T2 * t2b = new T2; // ERROR, default constructor was not synthesized
+		
+		Also, if the user has provided a default constructor in the code, we don't need
+		to generate a second copy here.  A default constructor should only be generated
+		here if the compiler would have synthesized one anyhow.  Otherwise the default
+		property values should be set in the constructors that are generated by
+		CppClassOperationsDeclaration.
+		*/
+		var code = '''
+		«IF CppOperations.getOwnedOperations(classifier).filter[GenUtils.hasStereotype(it, Create)].size() == 0»
+			«var attributeList = classifier.attributes.filter[
+			(it.isStatic == false) && (it.defaultValue != null) && (it.defaultValue.stringValue != null)]»
+			«IF !attributeList.empty»
+				«classifier.name»() : «FOR a : attributeList SEPARATOR ', '»«a.name»(«a.defaultValue.stringValue»)«ENDFOR» {}
+			«ENDIF»
+		«ENDIF»'''
+		return code.trim
+	}
+
+	static def generateClassBodyCode(Classifier classifier) {
+		var code = '''
+		#define «GenUtils.getFullName(classifier)»_BODY
+		
+		/************************************************************
+		              «classifier.name» class body
+		 ************************************************************/
+		
+		«CppIncludeUtil.CppIncludePreBody(classifier)»
+		
+		// include associated header file
+		«CppIncludeUtil.includeDirective(
+			GenUtils.getFullPath(classifier.nearestPackage) + '/' + classifier.name + '.' +
+				CppCodeGenUtils.getHeaderSuffix())»
+		
+		// Derived includes directives
+		«FOR path : CppClassIncludeClassDeclaration.CppClassAllIncludesDeclarationBody(classifier).sort» 
+			«CppIncludeUtil.includeDirective(path)»
+		«ENDFOR»
+		
+		«CppIncludeUtil.CppIncludeBody(classifier)»
+		
+		«CppGenUtils.openNS(classifier)»
+		
+		«CppAttribute.CppStaticAttributes(classifier)»
+		
+		«IF !classifier.isTemplate»
+			«CppClassOperationsImplementation.CppClassOperationsImplementation(classifier, false)»
+		«ENDIF»
+		
+		«CppGenUtils.closeNS(classifier)»
+		
+		/************************************************************
+		              End of «classifier.name» class body
+		 ************************************************************/'''
+		return code
+	}
+
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppCodeGenerator.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppCodeGenerator.xtend
new file mode 100644
index 00000000000..b20f551a366
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppCodeGenerator.xtend
@@ -0,0 +1,66 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import org.eclipse.core.resources.IResource
+import org.eclipse.core.runtime.CoreException
+import org.eclipse.emf.common.util.EList
+import org.eclipse.papyrus.cpp.codegen.Activator
+import org.eclipse.papyrus.cpp.codegen.utils.ClassUtils
+import org.eclipse.uml2.uml.Classifier
+import org.eclipse.uml2.uml.Package
+import org.eclipse.uml2.uml.PackageableElement
+import org.eclipse.papyrus.cpp.codegen.transformation.CppModelElementsCreator
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+public class CppCodeGenerator {
+	
+	/**
+	 * Generate code for a passed packageable element and the elements required by it (in the sense of #included statements)
+	 * 
+	 * @param mec model elements creator 
+	 * @param pe the element that should be generated
+	 * @param alreadyHandled list of packageable elements for which code has already been generated. 
+	 * @param recurse if the passed packageableElement is a package, generate code for its contents (recursively).
+	 */
+	static def generate(CppModelElementsCreator mec, PackageableElement pe, EList<PackageableElement> alreadyHandled,
+		boolean recurse) {
+		val srcPkg = mec.getContainer(pe);
+		try {
+			alreadyHandled.add(pe);
+			mec.createPackageableElement(srcPkg, null, pe, false);
+		} catch (CoreException coreException) {
+			Activator.log.error(coreException);
+		} finally {
+			// Refresh the container for the newly created files.  This needs to be done even
+			// during error because of the possibility for partial results.
+			try {
+				srcPkg.refreshLocal(IResource.DEPTH_INFINITE, null);
+			} catch(CoreException e) {
+				Activator.log.error(e);
+ 			}
+		}
+		
+		if (pe instanceof Classifier) {
+			var EList<Classifier> requiredClassifiers = ClassUtils.includedClassifiers((pe as Classifier));
+			for (Classifier requiredClassifier : requiredClassifiers) {
+				if (!alreadyHandled.contains(requiredClassifier)) {
+					generate(mec, requiredClassifier, alreadyHandled, false);
+				}
+			}
+		}
+		// owning package is required by generated code.
+		var Package owningPackage = pe.getNearestPackage();
+		if ((owningPackage != null) && (owningPackage != pe)) {
+			if (!alreadyHandled.contains(owningPackage)) {
+				generate(mec, owningPackage, alreadyHandled, false);
+			}
+		}
+		if ((pe instanceof Package) && recurse) {
+			// Continue generation parsing package contents
+			for(PackageableElement currentElement : (pe as Package).getPackagedElements()) {
+				generate(mec, currentElement, alreadyHandled, recurse);
+			}
+		}
+	}
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppDocumentation.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppDocumentation.xtend
new file mode 100644
index 00000000000..6795cceec7f
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppDocumentation.xtend
@@ -0,0 +1,38 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import org.eclipse.uml2.uml.Element
+import org.eclipse.papyrus.acceleo.GenUtils
+import org.eclipse.uml2.uml.Operation
+import org.eclipse.uml2.uml.Parameter
+import org.eclipse.uml2.uml.Behavior
+import org.eclipse.uml2.uml.ParameterDirectionKind
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+class CppDocumentation {
+	static def CppElementDoc(Element argument) '''
+		/**
+		 * «GenUtils.getComments(argument).replaceAll('\n', '\n * ')»
+		 */
+	'''
+	
+	static def CppOperationDoc(Operation operation) '''
+		/**
+		 * «GenUtils.getComments(operation).replaceAll('\n', '\n * ')»
+		 «FOR op: operation.ownedParameters»«CppParamDoc(op)»«ENDFOR»
+		 */
+	'''
+	
+	static def CppParamDoc(Parameter parameter) '''
+		* «IF (parameter.direction == ParameterDirectionKind.RETURN_LITERAL)
+		  »@return«ELSE»@param«ENDIF» «parameter.name» «GenUtils.getComments(parameter).replaceAll('\n', '\n *    ')»
+	'''
+	
+	static def CppBehaviorDoc(Behavior behavior) '''
+		/**
+		 * «GenUtils.getComments(behavior).replaceAll('\n', '\n * ')»
+		 * «FOR op : behavior.ownedParameters»«CppParamDoc(op)»«ENDFOR»
+		 */
+	'''
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppEnumerations.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppEnumerations.xtend
new file mode 100644
index 00000000000..909bae5b37b
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppEnumerations.xtend
@@ -0,0 +1,22 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import org.eclipse.uml2.uml.Enumeration
+import org.eclipse.papyrus.acceleo.GenUtils
+import org.eclipse.papyrus.C_Cpp.CppInit
+import org.eclipse.uml2.uml.util.UMLUtil
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+class CppEnumerations {
+	static def CppEnumerationDefinition(Enumeration enume) '''
+		«CppDocumentation.CppElementDoc(enume)»
+		enum «enume.name» {
+			«FOR ownedLiteral : enume.ownedLiterals»
+				«CppDocumentation.CppElementDoc(ownedLiteral)»
+				«ownedLiteral.name»«IF GenUtils.hasStereotype(ownedLiteral, CppInit)»«UMLUtil.
+				getStereotypeApplication(ownedLiteral, CppInit).value»«ENDIF»,
+			«ENDFOR»
+		};
+	'''
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppFileGenerator.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppFileGenerator.xtend
new file mode 100644
index 00000000000..ddf38c16473
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppFileGenerator.xtend
@@ -0,0 +1,100 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import java.io.ByteArrayInputStream
+import java.io.IOException
+import java.io.OutputStream
+import org.eclipse.core.filesystem.EFS
+import org.eclipse.core.filesystem.IFileStore
+import org.eclipse.core.resources.IContainer
+import org.eclipse.core.resources.IFile
+import org.eclipse.core.resources.IFolder
+import org.eclipse.core.resources.IProject
+import org.eclipse.core.runtime.CoreException
+import org.eclipse.core.runtime.Platform
+import org.eclipse.cdt.core.CCorePlugin
+import org.eclipse.cdt.core.formatter.CodeFormatter
+import org.eclipse.cdt.core.ToolFactory
+import org.eclipse.jface.text.IDocument
+import org.eclipse.jface.text.Document
+import org.eclipse.text.edits.TextEdit
+import org.eclipse.papyrus.cpp.codegen.Activator
+import org.eclipse.papyrus.cpp.codegen.Messages
+import org.eclipse.text.edits.MalformedTreeException
+import org.eclipse.jface.text.BadLocationException
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+abstract class CppFileGenerator {
+	
+	static def generateFile(IContainer owner, String filename, String content, boolean force) {
+		var IFile file = null;
+		if (owner instanceof IProject) {
+			file = (owner as IProject).getFile(filename)
+		} else if(owner instanceof IFolder) {
+			file = (owner as IFolder).getFile(filename)
+		} else {
+			// undefined
+		}
+		
+		if(file != null) {
+			createFile(file, format(content), force);
+		}
+	}
+	
+	static def void createFile(IFile file, String content, boolean force) throws CoreException {
+		if (file.exists() && force) {
+			// file.delete(true,true,null);
+			// YT - deleting files produce inconsistency in SVN working copies
+			var locationURI = file.getLocationURI();
+			if(locationURI != null) {
+				var IFileStore store = EFS.getStore(locationURI);
+				var OutputStream os = store.openOutputStream(0, null);
+				try {
+					os.write(content.getBytes());
+				} catch (IOException e) {
+					throw new RuntimeException ("C++ code generation: " + e.getMessage()); //$NON-NLS-1$
+				}
+			}
+			// file.setContents(new ByteArrayInputStream(content.getBytes()),
+			// true, true, null);
+		} else if(file.exists() && !(force)) {
+			// the file is not updated
+		} else {
+			// the file does not exists
+			file.create(new ByteArrayInputStream(content.getBytes()), true, null);
+		}
+	}	
+	
+	/**
+	 * Apply the user's currently selected formatting options to the input content.  Return the
+	 * input String in case of error.
+	 */
+	static def String format(String content) {
+
+		// do nothing if the CDT plugin is not loaded
+		if (Platform.getBundle(CCorePlugin.PLUGIN_ID) == null)
+			return content;
+
+		var CodeFormatter codeFormatter = ToolFactory.createCodeFormatter(null);
+		var IDocument doc = new Document(content);
+
+		var TextEdit edit = codeFormatter.format(CodeFormatter.K_TRANSLATION_UNIT, doc.get(), 0, doc.get().length(), 0, null);
+
+		if (edit == null) {
+			Activator.log.debug(Messages.CppModelElementsCreator_CannotFormatContent);
+			return content;
+		}
+
+		try {
+			edit.apply(doc);
+			return doc.get();
+		} catch (MalformedTreeException e) {
+			Activator.log.error(e);
+		} catch (BadLocationException e) {
+			Activator.log.error(e);
+		}
+
+		return content;
+	}
+}
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppIncludeUtil.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppIncludeUtil.xtend
new file mode 100644
index 00000000000..f7cc8621673
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppIncludeUtil.xtend
@@ -0,0 +1,75 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import org.eclipse.uml2.uml.NamedElement
+import org.eclipse.papyrus.acceleo.GenUtils
+import org.eclipse.papyrus.C_Cpp.Include
+import org.eclipse.uml2.uml.util.UMLUtil
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+class CppIncludeUtil {
+	static def includeDirective(String path) {
+		if ((path != null) && (path.length > 0))
+			return '''#include ''' + '"' + path + '"'
+	}
+
+	static def CppIncludeHeader(NamedElement ne) {
+		if (GenUtils.hasStereotype(ne, Include)) {
+			UMLUtil.getStereotypeApplication(ne, Include)
+			var header = UMLUtil.getStereotypeApplication(ne, Include).header
+			if ((header != null) && (header.length > 0)) {
+				var includeHeader = constIncludeHeaderStart + GenUtils.cleanCR(header) + '\n' +
+					constIncludeHeaderEnd
+				return includeHeader
+			}
+		}
+	}
+
+	static def constIncludeHeaderStart() '''
+		// Include from Include stereotype (header)
+	'''
+
+	static def constIncludeHeaderEnd() '''
+		// End of Include stereotype (header)
+	'''
+	
+	static def CppIncludePreBody(NamedElement ne) {
+		if (GenUtils.hasStereotype(ne, Include)) {
+			var String preBody = UMLUtil.getStereotypeApplication(ne, Include).preBody
+			if ((preBody != null) && (preBody.length > 0)) {
+				var includePreBody = constIncludePreBodyStart + GenUtils.cleanCR(preBody) + '\n' +
+					constIncludePreBodyEnd
+				return includePreBody
+			}
+		}
+	}
+	
+	static def constIncludePreBodyStart() '''
+		// Include from Include stereotype (pre-body)
+	'''
+
+	static def constIncludePreBodyEnd() '''
+		// End of Include stereotype (pre-body)
+	'''
+	
+	static def CppIncludeBody(NamedElement ne) {
+		if (GenUtils.hasStereotype(ne, Include)) {
+			var String body = UMLUtil.getStereotypeApplication(ne, Include).body
+			if ((body != null) && (body.length > 0)) {
+				var includeBody = constIncludeBodyStart + GenUtils.cleanCR(body) + '\n' +
+					constIncludeBodyEnd
+				return includeBody
+			}
+		}
+	}
+	
+	static def constIncludeBodyStart() '''
+		// Include from Include declaration (body)
+	'''
+
+	static def constIncludeBodyEnd() '''
+		// End of Include declaration (body)
+	'''
+
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppOperations.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppOperations.xtend
new file mode 100644
index 00000000000..53b4625212e
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppOperations.xtend
@@ -0,0 +1,128 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import org.eclipse.papyrus.C_Cpp.Inline
+import org.eclipse.papyrus.C_Cpp.Virtual
+import org.eclipse.papyrus.acceleo.GenUtils
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils
+import org.eclipse.papyrus.cpp.codegen.utils.Modifier
+import org.eclipse.uml2.uml.Behavior
+import org.eclipse.uml2.uml.Class
+import org.eclipse.uml2.uml.Classifier
+import org.eclipse.uml2.uml.DataType
+import org.eclipse.uml2.uml.Element
+import org.eclipse.uml2.uml.Interface
+import org.eclipse.uml2.uml.OpaqueBehavior
+import org.eclipse.uml2.uml.Operation
+import org.eclipse.uml2.uml.profile.standard.Create
+import org.eclipse.uml2.uml.profile.standard.Destroy
+import org.eclipse.papyrus.C_Cpp.ConstInit
+import org.eclipse.uml2.uml.util.UMLUtil
+
+class CppOperations {
+	static def CppOperationImplementation(Operation operation) '''
+		«CppDocumentation.CppOperationDoc(operation)»
+		«IF (operation.name == 'main')»
+			«CppReturnSpec(operation)»«operation.name»(«CppParameter.CppOperationParameters(operation,false)») {
+				«GenUtils.getBody(operation, 'C/C++')»
+			} 
+		«ELSE»
+			«CppTemplates.templateSignature(operation)»«InlineTxt(operation)»«CppReturnSpec(operation)»«operation.featuringClassifiers.get(0).name»«CppTemplates.templateShortSignature(operation)»::«destructor(operation)»«operation.name»(«CppParameter.CppOperationParameters(operation, false)»)«throwss(operation)»«Modifier.modCVQualifier(operation)»«CppConstInit(operation)» {
+				«GenUtils.getBody(operation, 'C/C++')»
+			}
+		«ENDIF»
+	'''	
+	
+	static def CppReturnSpec(Operation operation) {
+		if ((operation.type == null) || isConsOrDestructor(operation)) {
+			ConsDestructorOrVoid(operation)
+		} else {
+			Modifier.modCVQualifier(operation.getReturnResult())+' '+CppGenUtils.cppQualifiedName(operation.type)+Modifier.modPtr(operation.getReturnResult())+Modifier.modRef(operation.getReturnResult())+' ' 
+		}
+	}
+	
+	static def CppReturnSpec(Behavior behavior) '''
+		«IF (GenUtils.returnResult(behavior) == null)»void «ELSE»«Modifier.modCVQualifier(GenUtils.returnResult(behavior))» «CppGenUtils.cppQualifiedName(GenUtils.returnResult(behavior).type)»«Modifier.modPtr(GenUtils.returnResult(behavior))»«Modifier.modRef(GenUtils.returnResult(behavior))» «ENDIF»
+	'''
+	
+	static def throwss(Operation operation) '''
+		«IF operation.raisedExceptions.length > 0»
+		throws «FOR re : operation.raisedExceptions SEPARATOR ','»«re.name»«ENDFOR»
+		«ENDIF»
+	'''
+	
+	static def ConsDestructorOrVoid(Operation operation) {
+		if (isConsOrDestructor(operation)) {
+		
+		} else {
+			'void ' 
+		}
+	}
+	
+	static def isConsOrDestructor(Operation operation) {
+		GenUtils.hasStereotype(operation, Create) || GenUtils.hasStereotype(operation, Destroy)
+	}
+	
+	static def CppConstInit(Operation operation) {
+		if (GenUtils.hasStereotype(operation, ConstInit) && GenUtils.hasStereotype(operation, Create)) {
+			(UMLUtil.getStereotypeApplication(operation, ConstInit) as ConstInit).initialisation
+		}
+	}
+	
+	// return a list of owned operations, since this is not supported directly on a classifier/]
+	static def getOwnedOperations(Classifier cl) {
+		if (cl instanceof Class) {
+			(cl as Class).ownedOperations
+		} else {
+			if (cl instanceof DataType) {
+				(cl as DataType).ownedOperations
+			} else {
+				if (cl instanceof Interface) {
+					(cl as Interface).ownedOperations
+				} else {
+					// Sequence{}
+				}
+			}
+		}
+	}
+	
+	static def CppBehaviorImplementation(OpaqueBehavior behavior) '''
+		«CppDocumentation.CppBehaviorDoc(behavior)»
+		«CppReturnSpec(behavior)»«behavior.context.name»::«behavior.name»(«CppParameter.CppBehaviorParameters(behavior, false)»)«Modifier.modCVQualifier(behavior)» {
+			«GenUtils.getBodyFromOB(behavior, 'C/C++')»
+		}
+	'''
+	
+	static def CppOperationDeclaration(Operation operation) '''
+		«CppDocumentation.CppOperationDoc(operation)»
+		«InlineTxt(operation)»«virtualTxt(operation)»«staticTxt(operation)»«CppReturnSpec(operation)»«destructor(operation)»«operation.name»(«CppParameter.CppOperationParameters(operation,true)»)«Modifier.modCVQualifier(operation)»«virtualSuffix(operation)»;
+	'''
+	
+	static def InlineTxt(Element element) {
+		if (GenUtils.hasStereotype(element, Inline)) 'inline '
+	}
+	
+	static def virtualTxt(Operation operation) {
+		if ((operation.interface != null) || (operation.isAbstract) || (GenUtils.hasStereotype(operation, Virtual))) 'virtual '
+	}
+	
+	static def staticTxt(Operation operation) {
+		if (operation.isStatic) 'static '
+	}
+	
+	static def destructor(Operation operation) {
+		if (GenUtils.hasStereotype(operation, Destroy) && (!operation.name.startsWith('~'))) {
+			'~'
+		} else { 
+			''
+		}
+	}
+		
+	static def public virtualSuffix(Operation operation) {
+		if ((operation.interface != null) || (operation.isAbstract)) ' = 0'
+	}
+	
+	static def CppBehaviorDeclaration(Behavior behavior) '''
+		«CppDocumentation.CppBehaviorDoc(behavior)»
+		«InlineTxt(behavior)»«CppReturnSpec(behavior)»«behavior.name»(«CppParameter.CppBehaviorParameters(behavior, true)»)«Modifier.modCVQualifier(behavior)»;
+	'''
+}
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppPackageHeaderGenerator.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppPackageHeaderGenerator.xtend
new file mode 100644
index 00000000000..126706c5a03
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppPackageHeaderGenerator.xtend
@@ -0,0 +1,63 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import org.eclipse.core.resources.IContainer
+import org.eclipse.papyrus.acceleo.GenUtils
+import org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils
+import org.eclipse.uml2.uml.Package
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+class CppPackageHeaderGenerator extends CppFileGenerator {
+	static def generate(IContainer packageContainer, Package pkg) {
+		val fileName = "Pkg_" + pkg.name + "." + CppCodeGenUtils.getHeaderSuffix()
+		generateFile(packageContainer, fileName, pkg.generateCode, true)
+	}
+
+	static def generateCode(Package pkg) {
+		val code = '''
+		#ifndef PKG_«GenUtils.getFullNameUC(pkg)»
+		#define PKG_«GenUtils.getFullNameUC(pkg)»
+
+		/************************************************************
+		              Pkg_«pkg.name» package header
+		 ************************************************************/
+
+		«CppIncludeUtil.includeDirective(CppClassIncludeClassDeclaration.cppOwnerPackageIncludePath(pkg.nestingPackage))»
+		
+		#ifndef _IN_
+		#define _IN_
+		#endif
+		#ifndef _OUT_
+		#define _OUT_
+		#endif
+		#ifndef _INOUT_
+		#define _INOUT_
+		#endif
+		
+			
+		/* Package dependency header include                        */
+		«FOR p: GenUtils.getUsedPackages(pkg)»
+		«var path = GenUtils.getFullPath(p) + "/Pkg_"+ p.name + "." + CppCodeGenUtils.getHeaderSuffix»
+		«CppIncludeUtil.includeDirective(path)»
+		«ENDFOR»
+		
+		«CppIncludeUtil.CppIncludeHeader(pkg)»
+		«CppGenUtils.openNS(pkg)»
+		
+		// Types defined within the package
+		«IF pkg.name == "root"»
+		«var x = 0»
+		«ENDIF»
+		«CppClassTypeAndEnum.CppClassTypeAndEnumPackage(pkg)»
+		«CppGenUtils.closeNS(pkg)»
+		
+		/************************************************************
+		              End of Pkg_«pkg.name» package header
+		 ************************************************************/
+		
+		#endif'''
+		return code
+	}
+}
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppParameter.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppParameter.xtend
new file mode 100644
index 00000000000..7b8f496c978
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppParameter.xtend
@@ -0,0 +1,35 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import org.eclipse.uml2.uml.Operation
+import org.eclipse.uml2.uml.Parameter
+import org.eclipse.papyrus.cpp.codegen.utils.Modifier
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils
+import org.eclipse.uml2.uml.ParameterDirectionKind
+import org.eclipse.uml2.uml.Behavior
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+class CppParameter {
+	
+	static def CppOperationParameters(Operation operation, boolean showDefault) '''
+		«FOR ownedParameter : operation.ownedParameters.filter[it.direction != ParameterDirectionKind.RETURN_LITERAL] SEPARATOR ', '»«CppParameter(ownedParameter, showDefault)»«ENDFOR»'''
+	
+	/**  
+	 * comment signature for a given behavior (e.g. effect within state machine)
+	 */ 
+	static def CppBehaviorParameters(Behavior behavior, boolean showDefault) '''
+		«FOR ownedParameter : behavior.ownedParameters.filter[it.direction != ParameterDirectionKind.RETURN_LITERAL] SEPARATOR ', '»«CppParameter(ownedParameter, showDefault)»«ENDFOR»
+	'''
+	
+	/**
+	 * C++ parameter. Default values are added, if parameter showDefault is true (implementation signature
+	 */ 
+	static def CppParameter(Parameter parameter, boolean showDefault) {
+		Modifier.modCVQualifier(parameter)+CppGenUtils.cppQualifiedName(parameter.type)+Modifier.modPtr(parameter)+Modifier.modRef(parameter)+" "+parameter.name + Modifier.modArray(parameter) + {if (showDefault) defaultValue(parameter) else ""}
+	}
+	
+	static def defaultValue(Parameter parameter) {
+		if (parameter.defaultValue != null)  " = " + parameter.defaultValue.stringValue() else ""
+	}
+}
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppPrimitiveTypes.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppPrimitiveTypes.xtend
new file mode 100644
index 00000000000..3757e8dd098
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppPrimitiveTypes.xtend
@@ -0,0 +1,38 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import org.eclipse.uml2.uml.PrimitiveType
+import org.eclipse.papyrus.acceleo.GenUtils
+import org.eclipse.papyrus.C_Cpp.Typedef
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils
+import org.eclipse.uml2.uml.util.UMLUtil
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+class CppPrimitiveTypes {
+	
+	 /** Support two different kinds of primitive types
+	 * (1) those that are native types of the programming language such as long
+	 *     For these, no additional definition has to be done and they should be referenced
+	 *     with their name only
+	 * (2) those that correspond to a typedef (e.g. typedef long ErrorType). These require
+	 *     a typedef definition within the package and need to be referenced with their
+	 *     fully qualified name (e.g. MyPackage::ErrorType)
+	 * (3) Sometimes the name of the type defined by a typedef does not appear at the end, e.g.
+	 *     when defining functionPointers such as "typedef int (*HandlerFct) (void*);"
+	 *	   (a function with a void* argument returning int)
+	 *     Support this case via a specific 'typeName' constant that gets replaced by the name of the
+	 *     type
+	 */
+	static def CppPrimitiveTypeDefinition(PrimitiveType primitiveType) '''
+		«CppDocumentation.CppElementDoc(primitiveType)»
+		«IF GenUtils.hasStereotype(primitiveType, Typedef)»
+		typedef «UMLUtil.getStereotypeApplication(primitiveType, Typedef).definition.replaceAll('typeName', primitiveType.name)»
+			«IF !UMLUtil.getStereotypeApplication(primitiveType, Typedef).definition.contains('typeName')»«primitiveType.name»«ENDIF»;
+			
+		«ELSE»
+		«CppGenUtils.getStdtypes(primitiveType)»
+		 
+		«ENDIF»
+	'''
+}
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppTemplates.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppTemplates.xtend
new file mode 100644
index 00000000000..7ae148b2044
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppTemplates.xtend
@@ -0,0 +1,47 @@
+package org.eclipse.papyrus.cpp.codegen.xtend
+
+import org.eclipse.uml2.uml.Operation
+import org.eclipse.uml2.uml.Classifier
+import org.eclipse.papyrus.acceleo.GenUtils
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils
+import org.eclipse.uml2.uml.TemplateParameterSubstitution
+import org.eclipse.uml2.uml.NamedElement
+import org.eclipse.uml2.uml.LiteralInteger
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+class CppTemplates {
+	
+	static def templateSignature(Operation operation) {
+		templateSignature(operation.owner as Classifier)
+	}
+	
+	static def templateSignature(Classifier clazz)'''
+		«IF (isTemplate(clazz))»
+			template<«FOR templateParam : GenUtils.getTemplateParameters(clazz) SEPARATOR ', '»«CppGenUtils.getTemplateTypeName(templateParam)»«ENDFOR»>
+		«ENDIF»
+	'''
+	
+	static def templateShortSignature(Operation operation) {
+		templateShortSignature(operation.owner as Classifier)
+	}
+	
+	static def templateShortSignature(Classifier clazz)'''
+		«IF (isTemplate(clazz))»
+			<«FOR templateParam : GenUtils.getTemplateParameters(clazz) SEPARATOR ', '»«GenUtils.getTemplateName(templateParam)»«ENDFOR»>
+		«ENDIF»
+	'''
+	
+	static def isTemplate(Classifier clazz) {
+		GenUtils.getTemplateParameters(clazz).size() > 0
+	}
+	
+	static def CppTemplateBindingParameter(TemplateParameterSubstitution tps) {
+		if (tps.actual instanceof LiteralInteger) {
+			(tps.actual as LiteralInteger).value
+		} else {
+			(tps.actual as NamedElement).name
+		}
+	}
+}
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppAttribute.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppAttribute.java
new file mode 100644
index 00000000000..423847c7e74
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppAttribute.java
@@ -0,0 +1,170 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import com.google.common.base.Objects;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.C_Cpp.Const;
+import org.eclipse.papyrus.acceleo.GenUtils;
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils;
+import org.eclipse.papyrus.cpp.codegen.utils.Modifier;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppDocumentation;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.Interface;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Signal;
+import org.eclipse.uml2.uml.Type;
+import org.eclipse.uml2.uml.ValueSpecification;
+import org.eclipse.xtend2.lib.StringConcatenation;
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+@SuppressWarnings("all")
+public class CppAttribute {
+  public static String CppStaticAttributes(final Classifier classifier) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("// static attributes (if any)");
+    _builder.newLine();
+    {
+      EList<Property> _ownedAttributes = CppAttribute.getOwnedAttributes(classifier);
+      for(final Property ownedAttribute : _ownedAttributes) {
+        {
+          boolean _and = false;
+          boolean _isStatic = ownedAttribute.isStatic();
+          if (!_isStatic) {
+            _and = false;
+          } else {
+            boolean _hasStereotype = GenUtils.hasStereotype(ownedAttribute, Const.class);
+            boolean _not = (!_hasStereotype);
+            _and = _not;
+          }
+          if (_and) {
+            CharSequence _CppStaticAttributeImplementation = CppAttribute.CppStaticAttributeImplementation(ownedAttribute);
+            _builder.append(_CppStaticAttributeImplementation, "");
+            _builder.newLineIfNotEmpty();
+          }
+        }
+      }
+    }
+    String code = _builder.toString();
+    return code;
+  }
+  
+  public static EList<Property> getOwnedAttributes(final Classifier cl) {
+    EList<Property> _xifexpression = null;
+    if ((cl instanceof org.eclipse.uml2.uml.Class)) {
+      _xifexpression = ((org.eclipse.uml2.uml.Class) cl).getOwnedAttributes();
+    } else {
+      EList<Property> _xifexpression_1 = null;
+      if ((cl instanceof DataType)) {
+        _xifexpression_1 = ((DataType) cl).getOwnedAttributes();
+      } else {
+        EList<Property> _xifexpression_2 = null;
+        if ((cl instanceof Interface)) {
+          _xifexpression_2 = ((Interface) cl).getOwnedAttributes();
+        } else {
+          EList<Property> _xifexpression_3 = null;
+          if ((cl instanceof Signal)) {
+            _xifexpression_3 = ((Signal) cl).getOwnedAttributes();
+          } else {
+            _xifexpression_3 = null;
+          }
+          _xifexpression_2 = _xifexpression_3;
+        }
+        _xifexpression_1 = _xifexpression_2;
+      }
+      _xifexpression = _xifexpression_1;
+    }
+    return _xifexpression;
+  }
+  
+  public static CharSequence CppStaticAttributeImplementation(final Property attribute) {
+    StringConcatenation _builder = new StringConcatenation();
+    CharSequence _CppElementDoc = CppDocumentation.CppElementDoc(attribute);
+    _builder.append(_CppElementDoc, "");
+    _builder.newLineIfNotEmpty();
+    Type _type = attribute.getType();
+    String _cppQualifiedName = CppGenUtils.cppQualifiedName(_type);
+    _builder.append(_cppQualifiedName, "");
+    String _modPtr = Modifier.modPtr(attribute);
+    _builder.append(_modPtr, "");
+    String _modRef = Modifier.modRef(attribute);
+    _builder.append(_modRef, "");
+    _builder.append("  ");
+    org.eclipse.uml2.uml.Class _class_ = attribute.getClass_();
+    String _name = _class_.getName();
+    _builder.append(_name, "");
+    _builder.append("::");
+    String _name_1 = attribute.getName();
+    _builder.append(_name_1, "");
+    String _modArray = Modifier.modArray(attribute);
+    _builder.append(_modArray, "");
+    String _defaultValue = CppAttribute.defaultValue(attribute);
+    _builder.append(_defaultValue, "");
+    _builder.append(";");
+    _builder.newLineIfNotEmpty();
+    return _builder;
+  }
+  
+  public static String defaultValue(final Property attribute) {
+    String _xifexpression = null;
+    boolean _and = false;
+    ValueSpecification _defaultValue = attribute.getDefaultValue();
+    boolean _notEquals = (!Objects.equal(_defaultValue, null));
+    if (!_notEquals) {
+      _and = false;
+    } else {
+      boolean _isStatic = attribute.isStatic();
+      _and = _isStatic;
+    }
+    if (_and) {
+      ValueSpecification _defaultValue_1 = attribute.getDefaultValue();
+      String _stringValue = _defaultValue_1.stringValue();
+      _xifexpression = ("=" + _stringValue);
+    }
+    return _xifexpression;
+  }
+  
+  public static CharSequence CppAttributeDeclaration(final Property attribute) {
+    StringConcatenation _builder = new StringConcatenation();
+    CharSequence _CppElementDoc = CppDocumentation.CppElementDoc(attribute);
+    _builder.append(_CppElementDoc, "");
+    _builder.newLineIfNotEmpty();
+    String _staticValue = CppAttribute.staticValue(attribute);
+    _builder.append(_staticValue, "");
+    _builder.append(" ");
+    String _modCVQualifier = Modifier.modCVQualifier(attribute);
+    _builder.append(_modCVQualifier, "");
+    Type _type = attribute.getType();
+    String _cppQualifiedName = CppGenUtils.cppQualifiedName(_type);
+    _builder.append(_cppQualifiedName, "");
+    String _modPtr = Modifier.modPtr(attribute);
+    _builder.append(_modPtr, "");
+    String _modRef = Modifier.modRef(attribute);
+    _builder.append(_modRef, "");
+    _builder.append(" ");
+    String _name = attribute.getName();
+    _builder.append(_name, "");
+    String _modArray = Modifier.modArray(attribute);
+    _builder.append(_modArray, "");
+    {
+      boolean _hasStereotype = GenUtils.hasStereotype(attribute, Const.class);
+      if (_hasStereotype) {
+        String _defaultValue = CppAttribute.defaultValue(attribute);
+        _builder.append(_defaultValue, "");
+      }
+    }
+    _builder.append(";");
+    _builder.newLineIfNotEmpty();
+    return _builder;
+  }
+  
+  public static String staticValue(final Property attribute) {
+    String _xifexpression = null;
+    boolean _isStatic = attribute.isStatic();
+    if (_isStatic) {
+      _xifexpression = "static";
+    }
+    return _xifexpression;
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassAttributesDeclaration.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassAttributesDeclaration.java
new file mode 100644
index 00000000000..b16d70168f4
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassAttributesDeclaration.java
@@ -0,0 +1,37 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import com.google.common.base.Objects;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppAttribute;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.VisibilityKind;
+import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+@SuppressWarnings("all")
+public class CppClassAttributesDeclaration {
+  public static CharSequence CppClassAttributesDeclaration(final Classifier clazz, final VisibilityKind visibilityFilter) {
+    StringConcatenation _builder = new StringConcatenation();
+    {
+      EList<Property> _ownedAttributes = CppAttribute.getOwnedAttributes(clazz);
+      final Function1<Property, Boolean> _function = new Function1<Property, Boolean>() {
+        public Boolean apply(final Property it) {
+          VisibilityKind _visibility = it.getVisibility();
+          return Boolean.valueOf(Objects.equal(_visibility, visibilityFilter));
+        }
+      };
+      Iterable<Property> _filter = IterableExtensions.<Property>filter(_ownedAttributes, _function);
+      for(final Property oa : _filter) {
+        CharSequence _CppAttributeDeclaration = CppAttribute.CppAttributeDeclaration(oa);
+        _builder.append(_CppAttributeDeclaration, "");
+        _builder.newLineIfNotEmpty();
+      }
+    }
+    return _builder;
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassFriendDeclaration.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassFriendDeclaration.java
new file mode 100644
index 00000000000..23b17ac42c1
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassFriendDeclaration.java
@@ -0,0 +1,42 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.C_Cpp.Friend;
+import org.eclipse.papyrus.C_Cpp.NoCodeGen;
+import org.eclipse.papyrus.acceleo.GenUtils;
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.xtend2.lib.StringConcatenation;
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+@SuppressWarnings("all")
+public class CppClassFriendDeclaration {
+  public static CharSequence CppClassFriendDeclaration(final Classifier friend) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("friend class ");
+    String _cppQualifiedName = CppGenUtils.cppQualifiedName(friend);
+    _builder.append(_cppQualifiedName, "");
+    _builder.newLineIfNotEmpty();
+    return _builder;
+  }
+  
+  public static void CppClassIncludeFriendDeclaration(final Classifier clazz) {
+    EList<Classifier> _usedClassifiers = GenUtils.getUsedClassifiers(clazz);
+    for (final Classifier uc : _usedClassifiers) {
+      boolean _and = false;
+      boolean _hasStereotype = GenUtils.hasStereotype(uc, Friend.class);
+      if (!_hasStereotype) {
+        _and = false;
+      } else {
+        boolean _hasStereotype_1 = GenUtils.hasStereotype(uc, NoCodeGen.class);
+        boolean _not = (!_hasStereotype_1);
+        _and = _not;
+      }
+      if (_and) {
+        CppClassFriendDeclaration.CppClassFriendDeclaration(uc);
+      }
+    }
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeClassDeclaration.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeClassDeclaration.java
new file mode 100644
index 00000000000..d380b88b864
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeClassDeclaration.java
@@ -0,0 +1,116 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import com.google.common.base.Objects;
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.C_Cpp.CppRoot;
+import org.eclipse.papyrus.C_Cpp.External;
+import org.eclipse.papyrus.C_Cpp.NoCodeGen;
+import org.eclipse.papyrus.acceleo.GenUtils;
+import org.eclipse.papyrus.cpp.codegen.utils.ClassUtils;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppClassIncludeDeclaration;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Enumeration;
+import org.eclipse.uml2.uml.PrimitiveType;
+import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+@SuppressWarnings("all")
+public class CppClassIncludeClassDeclaration {
+  public static String cppOwnerPackageIncludePath(final org.eclipse.uml2.uml.Package pkg) {
+    boolean _and = false;
+    boolean _notEquals = (!Objects.equal(pkg, null));
+    if (!_notEquals) {
+      _and = false;
+    } else {
+      boolean _hasStereotype = GenUtils.hasStereotype(pkg, CppRoot.class);
+      boolean _not = (!_hasStereotype);
+      _and = _not;
+    }
+    if (_and) {
+      String _fullPath = GenUtils.getFullPath(pkg);
+      String _plus = (_fullPath + "/Pkg_");
+      String _name = pkg.getName();
+      String _plus_1 = (_plus + _name);
+      return (_plus_1 + ".h");
+    } else {
+      return null;
+    }
+  }
+  
+  public static Iterable<String> CppClassAllIncludesDeclarationBody(final Classifier classifier) {
+    EList<Classifier> _typesViaDependencies = GenUtils.getTypesViaDependencies(classifier);
+    return CppClassIncludeClassDeclaration.cppClassAllIncludes(classifier, _typesViaDependencies);
+  }
+  
+  public static Iterable<String> cppClassAllIncludes(final Classifier classifier, final EList<Classifier> list) {
+    List<String> newList = new ArrayList<String>();
+    for (final Classifier cl : list) {
+      boolean _or = false;
+      boolean _and = false;
+      boolean _notEquals = (!Objects.equal(cl, classifier));
+      if (!_notEquals) {
+        _and = false;
+      } else {
+        boolean _hasStereotype = GenUtils.hasStereotype(cl, NoCodeGen.class);
+        boolean _not = (!_hasStereotype);
+        _and = _not;
+      }
+      if (_and) {
+        _or = true;
+      } else {
+        boolean _hasStereotype_1 = GenUtils.hasStereotype(cl, External.class);
+        _or = _hasStereotype_1;
+      }
+      if (_or) {
+        boolean _or_1 = false;
+        if ((cl instanceof Enumeration)) {
+          _or_1 = true;
+        } else {
+          _or_1 = (cl instanceof PrimitiveType);
+        }
+        if (_or_1) {
+          boolean _and_1 = false;
+          Element _owner = cl.getOwner();
+          boolean _notEquals_1 = (!Objects.equal(_owner, null));
+          if (!_notEquals_1) {
+            _and_1 = false;
+          } else {
+            Element _owner_1 = cl.getOwner();
+            _and_1 = (_owner_1 instanceof org.eclipse.uml2.uml.Package);
+          }
+          if (_and_1) {
+            Element _owner_2 = cl.getOwner();
+            String includePath = CppClassIncludeClassDeclaration.cppOwnerPackageIncludePath(((org.eclipse.uml2.uml.Package) _owner_2));
+            boolean _contains = newList.contains(includePath);
+            boolean _not_1 = (!_contains);
+            if (_not_1) {
+              newList.add(includePath);
+            }
+          } else {
+          }
+        } else {
+          List<String> _cppClassIncludes = CppClassIncludeDeclaration.cppClassIncludes(cl);
+          newList.addAll(_cppClassIncludes);
+        }
+      } else {
+      }
+    }
+    final Function1<String, Boolean> _function = new Function1<String, Boolean>() {
+      public Boolean apply(final String str) {
+        return Boolean.valueOf((!Objects.equal(str, null)));
+      }
+    };
+    return IterableExtensions.<String>filter(newList, _function);
+  }
+  
+  public static Iterable<String> CppClassAllIncludes(final Classifier clazz) {
+    EList<Classifier> _includedClassifiers = ClassUtils.includedClassifiers(clazz);
+    return CppClassIncludeClassDeclaration.cppClassAllIncludes(clazz, _includedClassifiers);
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeDeclaration.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeDeclaration.java
new file mode 100644
index 00000000000..7e5f9b0bcee
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassIncludeDeclaration.java
@@ -0,0 +1,55 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.C_Cpp.ExternLibrary;
+import org.eclipse.papyrus.C_Cpp.External;
+import org.eclipse.papyrus.C_Cpp.Template;
+import org.eclipse.papyrus.acceleo.GenUtils;
+import org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.util.UMLUtil;
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+@SuppressWarnings("all")
+public class CppClassIncludeDeclaration {
+  public static List<String> cppClassIncludes(final NamedElement ne) {
+    List<String> result = new ArrayList<String>();
+    boolean _hasStereotypeTree = GenUtils.hasStereotypeTree(ne, ExternLibrary.class);
+    if (_hasStereotypeTree) {
+      ExternLibrary _applicationTree = GenUtils.<ExternLibrary>getApplicationTree(ne, ExternLibrary.class);
+      EList<String> _includes = _applicationTree.getIncludes();
+      result = _includes;
+    } else {
+      String _includeName = CppClassIncludeDeclaration.includeName(ne);
+      result.add(_includeName);
+    }
+    return result;
+  }
+  
+  public static String includeName(final NamedElement ne) {
+    boolean _hasStereotypeTree = GenUtils.hasStereotypeTree(ne, Template.class);
+    if (_hasStereotypeTree) {
+      Template _stereotypeApplication = UMLUtil.<Template>getStereotypeApplication(ne, Template.class);
+      return _stereotypeApplication.getDeclaration();
+    } else {
+      boolean _hasStereotypeTree_1 = GenUtils.hasStereotypeTree(ne, External.class);
+      if (_hasStereotypeTree_1) {
+        External _stereotypeApplication_1 = UMLUtil.<External>getStereotypeApplication(ne, External.class);
+        return _stereotypeApplication_1.getName();
+      } else {
+        org.eclipse.uml2.uml.Package _nearestPackage = ne.getNearestPackage();
+        String _fullPath = GenUtils.getFullPath(_nearestPackage);
+        String _plus = (_fullPath + "/");
+        String _name = ne.getName();
+        String _plus_1 = (_plus + _name);
+        String _plus_2 = (_plus_1 + ".");
+        String _headerSuffix = CppCodeGenUtils.getHeaderSuffix();
+        return (_plus_2 + _headerSuffix);
+      }
+    }
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassInheritedDeclarations.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassInheritedDeclarations.java
new file mode 100644
index 00000000000..c3e86778edd
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassInheritedDeclarations.java
@@ -0,0 +1,90 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.C_Cpp.NoCodeGen;
+import org.eclipse.papyrus.C_Cpp.Visibility;
+import org.eclipse.papyrus.acceleo.GenUtils;
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.DirectedRelationship;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Generalization;
+import org.eclipse.uml2.uml.InterfaceRealization;
+import org.eclipse.uml2.uml.Relationship;
+import org.eclipse.uml2.uml.util.UMLUtil;
+import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.Conversions;
+import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+@SuppressWarnings("all")
+public class CppClassInheritedDeclarations {
+  public static CharSequence CppClassInheritedDeclarations(final Classifier clazz) {
+    StringConcatenation _builder = new StringConcatenation();
+    {
+      Iterable<DirectedRelationship> _filteredRelationships = CppClassInheritedDeclarations.filteredRelationships(clazz);
+      int _length = ((Object[])Conversions.unwrapArray(_filteredRelationships, Object.class)).length;
+      boolean _greaterThan = (_length > 0);
+      if (_greaterThan) {
+        _builder.append(" : ");
+      }
+    }
+    _builder.newLineIfNotEmpty();
+    {
+      Iterable<DirectedRelationship> _filteredRelationships_1 = CppClassInheritedDeclarations.filteredRelationships(clazz);
+      boolean _hasElements = false;
+      for(final DirectedRelationship fr : _filteredRelationships_1) {
+        if (!_hasElements) {
+          _hasElements = true;
+        } else {
+          _builder.appendImmediate(", \n", "");
+        }
+        String _cppVisibility = CppClassInheritedDeclarations.getCppVisibility(fr);
+        _builder.append(_cppVisibility, "");
+        _builder.append(" ");
+        EList<Element> _targets = fr.getTargets();
+        Element _get = _targets.get(0);
+        String _cppQualifiedName = CppGenUtils.cppQualifiedName(((Classifier) _get));
+        _builder.append(_cppQualifiedName, "");
+      }
+    }
+    _builder.append("\t");
+    _builder.newLineIfNotEmpty();
+    return _builder;
+  }
+  
+  public static Iterable<DirectedRelationship> filteredRelationships(final Classifier clazz) {
+    EList<DirectedRelationship> _sourceDirectedRelationships = clazz.getSourceDirectedRelationships();
+    final Function1<DirectedRelationship, Boolean> _function = new Function1<DirectedRelationship, Boolean>() {
+      public Boolean apply(final DirectedRelationship it) {
+        boolean _and = false;
+        if (!((it instanceof Generalization) || (it instanceof InterfaceRealization))) {
+          _and = false;
+        } else {
+          EList<Element> _targets = it.getTargets();
+          Element _get = _targets.get(0);
+          boolean _hasStereotype = GenUtils.hasStereotype(_get, NoCodeGen.class);
+          boolean _not = (!_hasStereotype);
+          _and = _not;
+        }
+        return Boolean.valueOf(_and);
+      }
+    };
+    return IterableExtensions.<DirectedRelationship>filter(_sourceDirectedRelationships, _function);
+  }
+  
+  public static String getCppVisibility(final Relationship relationship) {
+    String _xifexpression = null;
+    boolean _hasStereotype = GenUtils.hasStereotype(relationship, Visibility.class);
+    if (_hasStereotype) {
+      Visibility _stereotypeApplication = UMLUtil.<Visibility>getStereotypeApplication(relationship, Visibility.class);
+      _xifexpression = ((Visibility) _stereotypeApplication).getValue();
+    } else {
+      _xifexpression = "public";
+    }
+    return _xifexpression;
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsDeclaration.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsDeclaration.java
new file mode 100644
index 00000000000..6ab9b1cb8dd
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsDeclaration.java
@@ -0,0 +1,71 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import com.google.common.base.Objects;
+import com.google.common.collect.Iterables;
+import java.util.List;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppOperations;
+import org.eclipse.uml2.uml.BehavioralFeature;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.OpaqueBehavior;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.VisibilityKind;
+import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.IteratorExtensions;
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+@SuppressWarnings("all")
+public class CppClassOperationsDeclaration {
+  public static CharSequence CppClassOperationsDeclaration(final Classifier clazz, final VisibilityKind visibilityFilter) {
+    StringConcatenation _builder = new StringConcatenation();
+    {
+      EList<Operation> _ownedOperations = CppOperations.getOwnedOperations(clazz);
+      final Function1<Operation, Boolean> _function = new Function1<Operation, Boolean>() {
+        public Boolean apply(final Operation it) {
+          VisibilityKind _visibility = it.getVisibility();
+          return Boolean.valueOf(Objects.equal(_visibility, visibilityFilter));
+        }
+      };
+      Iterable<Operation> _filter = IterableExtensions.<Operation>filter(_ownedOperations, _function);
+      for(final Operation op : _filter) {
+        _builder.newLine();
+        CharSequence _CppOperationDeclaration = CppOperations.CppOperationDeclaration(op);
+        _builder.append(_CppOperationDeclaration, "");
+        _builder.newLineIfNotEmpty();
+      }
+    }
+    {
+      TreeIterator<EObject> _eAllContents = clazz.eAllContents();
+      List<EObject> _list = IteratorExtensions.<EObject>toList(_eAllContents);
+      Iterable<OpaqueBehavior> _filter_1 = Iterables.<OpaqueBehavior>filter(_list, OpaqueBehavior.class);
+      final Function1<OpaqueBehavior, Boolean> _function_1 = new Function1<OpaqueBehavior, Boolean>() {
+        public Boolean apply(final OpaqueBehavior it) {
+          VisibilityKind _visibility = it.getVisibility();
+          return Boolean.valueOf(Objects.equal(_visibility, visibilityFilter));
+        }
+      };
+      Iterable<OpaqueBehavior> _filter_2 = IterableExtensions.<OpaqueBehavior>filter(_filter_1, _function_1);
+      for(final OpaqueBehavior b : _filter_2) {
+        {
+          BehavioralFeature _specification = b.getSpecification();
+          boolean _equals = Objects.equal(_specification, null);
+          if (_equals) {
+            _builder.newLine();
+            _builder.append("// opaque behavior without specification (typically from state machine)");
+            _builder.newLine();
+            CharSequence _CppBehaviorDeclaration = CppOperations.CppBehaviorDeclaration(b);
+            _builder.append(_CppBehaviorDeclaration, "");
+            _builder.newLineIfNotEmpty();
+          }
+        }
+      }
+    }
+    return _builder;
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsImplementation.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsImplementation.java
new file mode 100644
index 00000000000..35f5ecafd13
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassOperationsImplementation.java
@@ -0,0 +1,98 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import com.google.common.base.Objects;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.C_Cpp.Inline;
+import org.eclipse.papyrus.C_Cpp.NoCodeGen;
+import org.eclipse.papyrus.acceleo.GenUtils;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppOperations;
+import org.eclipse.uml2.uml.BehavioralFeature;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.OpaqueBehavior;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.IteratorExtensions;
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+@SuppressWarnings("all")
+public class CppClassOperationsImplementation {
+  public static CharSequence CppClassOperationsImplementation(final Classifier clazz, final boolean inline) {
+    StringConcatenation _builder = new StringConcatenation();
+    {
+      EList<Operation> _ownedOperations = CppOperations.getOwnedOperations(clazz);
+      final Function1<Operation, Boolean> _function = new Function1<Operation, Boolean>() {
+        public Boolean apply(final Operation it) {
+          boolean _and = false;
+          boolean _or = false;
+          boolean _hasStereotype = GenUtils.hasStereotype(it, NoCodeGen.class);
+          if (_hasStereotype) {
+            _or = true;
+          } else {
+            boolean _isAbstract = it.isAbstract();
+            _or = _isAbstract;
+          }
+          boolean _not = (!_or);
+          if (!_not) {
+            _and = false;
+          } else {
+            boolean _hasStereotype_1 = GenUtils.hasStereotype(it, Inline.class);
+            boolean _equals = (_hasStereotype_1 == inline);
+            _and = _equals;
+          }
+          return Boolean.valueOf(_and);
+        }
+      };
+      Iterable<Operation> _filter = IterableExtensions.<Operation>filter(_ownedOperations, _function);
+      boolean _hasElements = false;
+      for(final Operation ownedOperation : _filter) {
+        if (!_hasElements) {
+          _hasElements = true;
+        } else {
+          _builder.appendImmediate("\n", "");
+        }
+        CharSequence _CppOperationImplementation = CppOperations.CppOperationImplementation(ownedOperation);
+        _builder.append(_CppOperationImplementation, "");
+        _builder.newLineIfNotEmpty();
+      }
+    }
+    _builder.newLine();
+    {
+      TreeIterator<EObject> _eAllContents = clazz.eAllContents();
+      Iterable<EObject> _iterable = IteratorExtensions.<EObject>toIterable(_eAllContents);
+      final Function1<EObject, Boolean> _function_1 = new Function1<EObject, Boolean>() {
+        public Boolean apply(final EObject it) {
+          boolean _and = false;
+          if (!(it instanceof OpaqueBehavior)) {
+            _and = false;
+          } else {
+            boolean _hasStereotype = GenUtils.hasStereotype(((OpaqueBehavior) it), Inline.class);
+            boolean _equals = (_hasStereotype == inline);
+            _and = _equals;
+          }
+          return Boolean.valueOf(_and);
+        }
+      };
+      Iterable<EObject> _filter_1 = IterableExtensions.<EObject>filter(_iterable, _function_1);
+      for(final EObject b : _filter_1) {
+        {
+          BehavioralFeature _specification = ((OpaqueBehavior) b).getSpecification();
+          boolean _equals = Objects.equal(_specification, null);
+          if (_equals) {
+            _builder.append("// opaque behavior without specification (typically from state machine)");
+            _builder.newLine();
+            CharSequence _CppBehaviorImplementation = CppOperations.CppBehaviorImplementation(((OpaqueBehavior) b));
+            _builder.append(_CppBehaviorImplementation, "");
+            _builder.newLineIfNotEmpty();
+          }
+        }
+      }
+    }
+    return _builder;
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassTypeAndEnum.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassTypeAndEnum.java
new file mode 100644
index 00000000000..e3bd37d908a
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassTypeAndEnum.java
@@ -0,0 +1,95 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.C_Cpp.NoCodeGen;
+import org.eclipse.papyrus.acceleo.GenUtils;
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppEnumerations;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppPrimitiveTypes;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Enumeration;
+import org.eclipse.uml2.uml.Namespace;
+import org.eclipse.uml2.uml.PrimitiveType;
+import org.eclipse.uml2.uml.VisibilityKind;
+import org.eclipse.xtend2.lib.StringConcatenation;
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+@SuppressWarnings("all")
+public class CppClassTypeAndEnum {
+  public static CharSequence CppClassTypeAndEnum(final Classifier clazz) {
+    StringConcatenation _builder = new StringConcatenation();
+    CharSequence _TypesAndEnumsForVisibility = CppClassTypeAndEnum.TypesAndEnumsForVisibility(clazz, VisibilityKind.PUBLIC_LITERAL);
+    String publicStr = _TypesAndEnumsForVisibility.toString();
+    _builder.newLineIfNotEmpty();
+    String _section = CppGenUtils.getSection(VisibilityKind.PUBLIC_LITERAL, publicStr);
+    _builder.append(_section, "");
+    _builder.newLineIfNotEmpty();
+    CharSequence _TypesAndEnumsForVisibility_1 = CppClassTypeAndEnum.TypesAndEnumsForVisibility(clazz, VisibilityKind.PROTECTED_LITERAL);
+    String protectedStr = _TypesAndEnumsForVisibility_1.toString();
+    _builder.newLineIfNotEmpty();
+    String _section_1 = CppGenUtils.getSection(VisibilityKind.PROTECTED_LITERAL, protectedStr);
+    _builder.append(_section_1, "");
+    _builder.newLineIfNotEmpty();
+    CharSequence _TypesAndEnumsForVisibility_2 = CppClassTypeAndEnum.TypesAndEnumsForVisibility(clazz, VisibilityKind.PRIVATE_LITERAL);
+    String privateStr = _TypesAndEnumsForVisibility_2.toString();
+    _builder.newLineIfNotEmpty();
+    String _section_2 = CppGenUtils.getSection(VisibilityKind.PRIVATE_LITERAL, privateStr);
+    _builder.append(_section_2, "");
+    _builder.newLineIfNotEmpty();
+    return _builder;
+  }
+  
+  public static CharSequence CppClassTypeAndEnumPackage(final org.eclipse.uml2.uml.Package pkg) {
+    CharSequence _xblockexpression = null;
+    {
+      VisibilityKind _get = VisibilityKind.get(VisibilityKind.PACKAGE);
+      CppClassTypeAndEnum.TypesAndEnumsForVisibility(pkg, _get);
+      VisibilityKind _get_1 = VisibilityKind.get(VisibilityKind.PUBLIC);
+      _xblockexpression = CppClassTypeAndEnum.TypesAndEnumsForVisibility(pkg, _get_1);
+    }
+    return _xblockexpression;
+  }
+  
+  public static CharSequence TypesAndEnumsForVisibility(final Namespace ne, final VisibilityKind visibilityFilter) {
+    StringConcatenation _builder = new StringConcatenation();
+    {
+      EList<Element> _ownedElements = ne.getOwnedElements();
+      for(final Element ownedElement : _ownedElements) {
+        CharSequence _TypeAndEnumForVisibility = CppClassTypeAndEnum.TypeAndEnumForVisibility(ownedElement, visibilityFilter);
+        _builder.append(_TypeAndEnumForVisibility, "");
+        _builder.newLineIfNotEmpty();
+      }
+    }
+    return _builder;
+  }
+  
+  public static CharSequence TypeAndEnumForVisibility(final Element element, final VisibilityKind visibilityFilter) {
+    boolean _and = false;
+    boolean _hasStereotype = GenUtils.hasStereotype(element, NoCodeGen.class);
+    boolean _not = (!_hasStereotype);
+    if (!_not) {
+      _and = false;
+    } else {
+      _and = (element instanceof Classifier);
+    }
+    if (_and) {
+      VisibilityKind elementVisibility = ((Classifier) element).getVisibility();
+      int value = elementVisibility.getValue();
+      int _value = visibilityFilter.getValue();
+      boolean _equals = (value == _value);
+      if (_equals) {
+        if ((element instanceof Enumeration)) {
+          return CppEnumerations.CppEnumerationDefinition(((Enumeration) element));
+        } else {
+          if ((element instanceof PrimitiveType)) {
+            return CppPrimitiveTypes.CppPrimitiveTypeDefinition(((PrimitiveType) element));
+          }
+        }
+      }
+    }
+    return null;
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassifierGenerator.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassifierGenerator.java
new file mode 100644
index 00000000000..69a93103839
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppClassifierGenerator.java
@@ -0,0 +1,739 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import com.google.common.base.Objects;
+import java.util.List;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.C_Cpp.ExternLibrary;
+import org.eclipse.papyrus.C_Cpp.External;
+import org.eclipse.papyrus.C_Cpp.Include;
+import org.eclipse.papyrus.C_Cpp.ManualGeneration;
+import org.eclipse.papyrus.C_Cpp.NoCodeGen;
+import org.eclipse.papyrus.C_Cpp.Template;
+import org.eclipse.papyrus.C_Cpp.Union;
+import org.eclipse.papyrus.acceleo.AcceleoDriver;
+import org.eclipse.papyrus.acceleo.GenUtils;
+import org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils;
+import org.eclipse.papyrus.cpp.codegen.transformation.CppModelElementsCreator;
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppAttribute;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppClassAttributesDeclaration;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppClassFriendDeclaration;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppClassIncludeClassDeclaration;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppClassInheritedDeclarations;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppClassOperationsDeclaration;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppClassOperationsImplementation;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppClassTypeAndEnum;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppDocumentation;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppFileGenerator;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppIncludeUtil;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppOperations;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppTemplates;
+import org.eclipse.uml2.uml.Association;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.TemplateBinding;
+import org.eclipse.uml2.uml.TemplateParameterSubstitution;
+import org.eclipse.uml2.uml.ValueSpecification;
+import org.eclipse.uml2.uml.VisibilityKind;
+import org.eclipse.uml2.uml.profile.standard.Create;
+import org.eclipse.uml2.uml.util.UMLUtil;
+import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.Exceptions;
+import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+@SuppressWarnings("all")
+public class CppClassifierGenerator extends CppFileGenerator {
+  public static void generate(final IContainer container, final Classifier classifier, final String commentHeader) {
+    try {
+      boolean _hasStereotype = GenUtils.hasStereotype(classifier, ManualGeneration.class);
+      if (_hasStereotype) {
+        ManualGeneration mg = UMLUtil.<ManualGeneration>getStereotypeApplication(classifier, ManualGeneration.class);
+        Include cppInclude = UMLUtil.<Include>getStereotypeApplication(classifier, Include.class);
+        String _header = cppInclude.getHeader();
+        String _evaluate = AcceleoDriver.evaluate(_header, classifier, null);
+        String fileContentH = (commentHeader + _evaluate);
+        String _name = classifier.getName();
+        String _plus = (_name + CppModelElementsCreator.DOT);
+        String _headerSuffix = CppCodeGenUtils.getHeaderSuffix();
+        final String fileNameH = (_plus + _headerSuffix);
+        CppFileGenerator.generateFile(container, fileNameH, fileContentH, true);
+        String _preBody = cppInclude.getPreBody();
+        String _evaluate_1 = AcceleoDriver.evaluate(_preBody, classifier, null);
+        String _plus_1 = (commentHeader + _evaluate_1);
+        String _plus_2 = (_plus_1 + GenUtils.NL);
+        String _body = cppInclude.getBody();
+        String _evaluate_2 = AcceleoDriver.evaluate(_body, classifier, null);
+        String _plus_3 = (_plus_2 + _evaluate_2);
+        final String fileContentB = (_plus_3 + GenUtils.NL);
+        String _extensionBody = mg.getExtensionBody();
+        String ext = GenUtils.maskNull(_extensionBody);
+        int _length = ext.length();
+        boolean _equals = (_length == 0);
+        if (_equals) {
+          String _bodySuffix = CppCodeGenUtils.getBodySuffix();
+          ext = _bodySuffix;
+        }
+        String _name_1 = classifier.getName();
+        String _plus_4 = (_name_1 + CppModelElementsCreator.DOT);
+        final String fileNameB = (_plus_4 + ext);
+        CppFileGenerator.generateFile(container, fileNameB, fileContentB, true);
+      } else {
+        boolean _and = false;
+        boolean _and_1 = false;
+        boolean _noCodeGen = CppClassifierGenerator.noCodeGen(classifier);
+        boolean _not = (!_noCodeGen);
+        if (!_not) {
+          _and_1 = false;
+        } else {
+          boolean _hasStereotype_1 = GenUtils.hasStereotype(classifier, Template.class);
+          boolean _not_1 = (!_hasStereotype_1);
+          _and_1 = _not_1;
+        }
+        if (!_and_1) {
+          _and = false;
+        } else {
+          _and = (!(classifier instanceof Association));
+        }
+        if (_and) {
+          boolean _isTemplateBoundElement = GenUtils.isTemplateBoundElement(classifier);
+          if (_isTemplateBoundElement) {
+            String _name_2 = classifier.getName();
+            String _plus_5 = (_name_2 + ".");
+            String _headerSuffix_1 = CppCodeGenUtils.getHeaderSuffix();
+            final String bindHeaderFileName = (_plus_5 + _headerSuffix_1);
+            String _generateBindHeaderCode = CppClassifierGenerator.generateBindHeaderCode(classifier);
+            String _plus_6 = (commentHeader + _generateBindHeaderCode);
+            CppFileGenerator.generateFile(container, bindHeaderFileName, _plus_6, true);
+            String _name_3 = classifier.getName();
+            String _plus_7 = (_name_3 + ".");
+            String _bodySuffix_1 = CppCodeGenUtils.getBodySuffix();
+            String bindBodyFileName = (_plus_7 + _bodySuffix_1);
+            String _generateBindBodyCode = CppClassifierGenerator.generateBindBodyCode(classifier);
+            String _plus_8 = (commentHeader + _generateBindBodyCode);
+            CppFileGenerator.generateFile(container, bindBodyFileName, _plus_8, true);
+          } else {
+            String _name_4 = classifier.getName();
+            String _plus_9 = (_name_4 + ".");
+            String _headerSuffix_2 = CppCodeGenUtils.getHeaderSuffix();
+            final String classHeaderFileName = (_plus_9 + _headerSuffix_2);
+            String _generateClassHeaderCode = CppClassifierGenerator.generateClassHeaderCode(classifier);
+            String _plus_10 = (commentHeader + _generateClassHeaderCode);
+            CppFileGenerator.generateFile(container, classHeaderFileName, _plus_10, true);
+            if ((classifier instanceof org.eclipse.uml2.uml.Class)) {
+              String _name_5 = ((org.eclipse.uml2.uml.Class)classifier).getName();
+              String _plus_11 = (_name_5 + ".");
+              String _bodySuffix_2 = CppCodeGenUtils.getBodySuffix();
+              String classBodyFileName = (_plus_11 + _bodySuffix_2);
+              String _generateClassBodyCode = CppClassifierGenerator.generateClassBodyCode(classifier);
+              String _plus_12 = (commentHeader + _generateClassBodyCode);
+              CppFileGenerator.generateFile(container, classBodyFileName, _plus_12, true);
+            }
+          }
+        }
+      }
+    } catch (Throwable _e) {
+      throw Exceptions.sneakyThrow(_e);
+    }
+  }
+  
+  public static boolean noCodeGen(final Element element) {
+    boolean _or = false;
+    boolean _or_1 = false;
+    boolean _hasStereotype = GenUtils.hasStereotype(element, NoCodeGen.class);
+    if (_hasStereotype) {
+      _or_1 = true;
+    } else {
+      boolean _hasStereotype_1 = GenUtils.hasStereotype(element, External.class);
+      _or_1 = _hasStereotype_1;
+    }
+    if (_or_1) {
+      _or = true;
+    } else {
+      boolean _hasStereotypeTree = GenUtils.hasStereotypeTree(element, ExternLibrary.class);
+      _or = _hasStereotypeTree;
+    }
+    return _or;
+  }
+  
+  public static String generateHeaderCode(final Classifier classifier, final String commentHeader) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append(commentHeader, "");
+    _builder.newLineIfNotEmpty();
+    _builder.append("AcceleoDriver.evaluate(cppInclude.getHeader(), classifier, null);");
+    _builder.newLine();
+    String code = _builder.toString();
+    return code;
+  }
+  
+  public static String generateBindHeaderCode(final Classifier classifier) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("#ifndef ");
+    String _fullNameUC = GenUtils.getFullNameUC(classifier);
+    _builder.append(_fullNameUC, "");
+    _builder.append("_H");
+    _builder.newLineIfNotEmpty();
+    _builder.append("#define ");
+    String _fullNameUC_1 = GenUtils.getFullNameUC(classifier);
+    _builder.append(_fullNameUC_1, "");
+    _builder.append("_H");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("/************************************************************");
+    _builder.newLine();
+    _builder.append("              ");
+    String _name = classifier.getName();
+    _builder.append(_name, "              ");
+    _builder.append(" template binding header");
+    _builder.newLineIfNotEmpty();
+    _builder.append(" ");
+    _builder.append("************************************************************/");
+    _builder.newLine();
+    _builder.newLine();
+    org.eclipse.uml2.uml.Package _package = classifier.getPackage();
+    String _cppOwnerPackageIncludePath = CppClassIncludeClassDeclaration.cppOwnerPackageIncludePath(_package);
+    String _includeDirective = CppIncludeUtil.includeDirective(_cppOwnerPackageIncludePath);
+    _builder.append(_includeDirective, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    {
+      List<String> _sortedIncludePathList = CppClassifierGenerator.getSortedIncludePathList(classifier);
+      for(final String path : _sortedIncludePathList) {
+        String _includeDirective_1 = CppIncludeUtil.includeDirective(path);
+        _builder.append(_includeDirective_1, "");
+        _builder.newLineIfNotEmpty();
+      }
+    }
+    _builder.newLine();
+    String _CppIncludeHeader = CppIncludeUtil.CppIncludeHeader(classifier);
+    _builder.append(_CppIncludeHeader, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    EList<TemplateBinding> tb = classifier.getTemplateBindings();
+    _builder.newLineIfNotEmpty();
+    TemplateBinding templateElement = tb.get(0);
+    _builder.newLineIfNotEmpty();
+    org.eclipse.uml2.uml.Package _package_1 = classifier.getPackage();
+    String _fullPath = GenUtils.getFullPath(_package_1);
+    String _plus = (_fullPath + "/");
+    Element _owner = templateElement.getOwner();
+    String _name_1 = ((NamedElement) _owner).getName();
+    String _plus_1 = (_plus + _name_1);
+    String _plus_2 = (_plus_1 + ".");
+    String _headerSuffix = CppCodeGenUtils.getHeaderSuffix();
+    String _plus_3 = (_plus_2 + _headerSuffix);
+    String _includeDirective_2 = CppIncludeUtil.includeDirective(_plus_3);
+    _builder.append(_includeDirective_2, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    String _openNS = CppGenUtils.openNS(classifier);
+    _builder.append(_openNS, "");
+    _builder.newLineIfNotEmpty();
+    _builder.append("/************************************************************/");
+    _builder.newLine();
+    _builder.append("typedef ");
+    Element _owner_1 = templateElement.getOwner();
+    String _name_2 = ((NamedElement) _owner_1).getName();
+    _builder.append(_name_2, "");
+    {
+      EList<TemplateParameterSubstitution> _parameterSubstitutions = templateElement.getParameterSubstitutions();
+      for(final TemplateParameterSubstitution ps : _parameterSubstitutions) {
+        Object _CppTemplateBindingParameter = CppTemplates.CppTemplateBindingParameter(ps);
+        _builder.append(_CppTemplateBindingParameter, "");
+      }
+    }
+    _builder.append(" ");
+    String _name_3 = classifier.getName();
+    _builder.append(_name_3, "");
+    _builder.append(";");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    String _closeNS = CppGenUtils.closeNS(classifier);
+    _builder.append(_closeNS, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("/************************************************************");
+    _builder.newLine();
+    _builder.append("              ");
+    _builder.append("End of ");
+    String _name_4 = classifier.getName();
+    _builder.append(_name_4, "              ");
+    _builder.append(" template binding header");
+    _builder.newLineIfNotEmpty();
+    _builder.append(" ");
+    _builder.append("************************************************************/");
+    _builder.newLine();
+    _builder.newLine();
+    _builder.append("#endif");
+    String code = _builder.toString();
+    return code;
+  }
+  
+  public static List<String> getSortedIncludePathList(final Classifier classifier) {
+    Iterable<String> _CppClassAllIncludes = CppClassIncludeClassDeclaration.CppClassAllIncludes(classifier);
+    List<String> includePathList = IterableExtensions.<String>sort(_CppClassAllIncludes);
+    return includePathList;
+  }
+  
+  public static String generateBindBodyCode(final Classifier classifier) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("#define ");
+    String _fullNameUC = GenUtils.getFullNameUC(classifier);
+    _builder.append(_fullNameUC, "");
+    _builder.append("_BODY");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("/************************************************************");
+    _builder.newLine();
+    _builder.append("              ");
+    String _name = classifier.getName();
+    _builder.append(_name, "              ");
+    _builder.append(" template binding body");
+    _builder.newLineIfNotEmpty();
+    _builder.append(" ");
+    _builder.append("************************************************************/");
+    _builder.newLine();
+    _builder.newLine();
+    String _CppIncludePreBody = CppIncludeUtil.CppIncludePreBody(classifier);
+    _builder.append(_CppIncludePreBody, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("// include associated header file");
+    _builder.newLine();
+    org.eclipse.uml2.uml.Package _package = classifier.getPackage();
+    String _fullPath = GenUtils.getFullPath(_package);
+    String _plus = (_fullPath + "/");
+    String _name_1 = classifier.getName();
+    String _plus_1 = (_plus + _name_1);
+    String _plus_2 = (_plus_1 + ".");
+    String _headerSuffix = CppCodeGenUtils.getHeaderSuffix();
+    String _plus_3 = (_plus_2 + _headerSuffix);
+    String _includeDirective = CppIncludeUtil.includeDirective(_plus_3);
+    _builder.append(_includeDirective, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    String _CppIncludeBody = CppIncludeUtil.CppIncludeBody(classifier);
+    _builder.append(_CppIncludeBody, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    String _openNS = CppGenUtils.openNS(classifier);
+    _builder.append(_openNS, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("// Derived includes directives");
+    _builder.newLine();
+    {
+      Iterable<String> _CppClassAllIncludes = CppClassIncludeClassDeclaration.CppClassAllIncludes(classifier);
+      List<String> _sort = IterableExtensions.<String>sort(_CppClassAllIncludes);
+      for(final String path : _sort) {
+        String _includeDirective_1 = CppIncludeUtil.includeDirective(path);
+        _builder.append(_includeDirective_1, "");
+        _builder.newLineIfNotEmpty();
+      }
+    }
+    _builder.newLine();
+    _builder.append("/************************************************************/");
+    _builder.newLine();
+    TemplateBinding tb = GenUtils.getTemplateBindings(((org.eclipse.uml2.uml.Class) classifier));
+    _builder.newLineIfNotEmpty();
+    EList<Element> _targets = tb.getTargets();
+    Element templateElement = _targets.get(0);
+    _builder.newLineIfNotEmpty();
+    _builder.append("template class ");
+    Element _owner = templateElement.getOwner();
+    String _name_2 = ((NamedElement) _owner).getName();
+    _builder.append(_name_2, "");
+    _builder.append("<");
+    {
+      EList<TemplateParameterSubstitution> _parameterSubstitutions = tb.getParameterSubstitutions();
+      for(final TemplateParameterSubstitution ps : _parameterSubstitutions) {
+        Object _CppTemplateBindingParameter = CppTemplates.CppTemplateBindingParameter(ps);
+        _builder.append(_CppTemplateBindingParameter, "");
+      }
+    }
+    _builder.append(";");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    String _closeNS = CppGenUtils.closeNS(classifier);
+    _builder.append(_closeNS, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("/************************************************************");
+    _builder.newLine();
+    _builder.append("              ");
+    _builder.append("End of ");
+    String _name_3 = classifier.getName();
+    _builder.append(_name_3, "              ");
+    _builder.append(" template binding body");
+    _builder.newLineIfNotEmpty();
+    _builder.append(" ");
+    _builder.append("************************************************************/");
+    String code = _builder.toString();
+    return code;
+  }
+  
+  public static String generateClassHeaderCode(final Classifier classifier) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("#ifndef ");
+    String _fullNameUC = GenUtils.getFullNameUC(classifier);
+    _builder.append(_fullNameUC, "");
+    _builder.append("_H");
+    _builder.newLineIfNotEmpty();
+    _builder.append("#define ");
+    String _fullNameUC_1 = GenUtils.getFullNameUC(classifier);
+    _builder.append(_fullNameUC_1, "");
+    _builder.append("_H");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("/************************************************************");
+    _builder.newLine();
+    _builder.append("              ");
+    String _name = classifier.getName();
+    _builder.append(_name, "              ");
+    _builder.append(" class header");
+    _builder.newLineIfNotEmpty();
+    _builder.append(" ");
+    _builder.append("************************************************************/");
+    _builder.newLine();
+    _builder.newLine();
+    org.eclipse.uml2.uml.Package _package = classifier.getPackage();
+    String _cppOwnerPackageIncludePath = CppClassIncludeClassDeclaration.cppOwnerPackageIncludePath(_package);
+    String _includeDirective = CppIncludeUtil.includeDirective(_cppOwnerPackageIncludePath);
+    _builder.append(_includeDirective, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    {
+      List<String> _sortedIncludePathList = CppClassifierGenerator.getSortedIncludePathList(classifier);
+      for(final String path : _sortedIncludePathList) {
+        String _includeDirective_1 = CppIncludeUtil.includeDirective(path);
+        _builder.append(_includeDirective_1, "");
+        _builder.newLineIfNotEmpty();
+      }
+    }
+    _builder.newLine();
+    String _CppIncludeHeader = CppIncludeUtil.CppIncludeHeader(classifier);
+    _builder.append(_CppIncludeHeader, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    String _openNS = CppGenUtils.openNS(classifier);
+    _builder.append(_openNS, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("/************************************************************/");
+    _builder.newLine();
+    CharSequence _CppElementDoc = CppDocumentation.CppElementDoc(classifier);
+    _builder.append(_CppElementDoc, "");
+    _builder.newLineIfNotEmpty();
+    CharSequence _templateSignature = CppTemplates.templateSignature(classifier);
+    _builder.append(_templateSignature, "");
+    String _classUnionOrStruct = CppClassifierGenerator.classUnionOrStruct(classifier);
+    _builder.append(_classUnionOrStruct, "");
+    _builder.append(" ");
+    String _name_1 = classifier.getName();
+    _builder.append(_name_1, "");
+    CharSequence _CppClassInheritedDeclarations = CppClassInheritedDeclarations.CppClassInheritedDeclarations(classifier);
+    _builder.append(_CppClassInheritedDeclarations, "");
+    _builder.append(" {");
+    _builder.newLineIfNotEmpty();
+    CppClassFriendDeclaration.CppClassIncludeFriendDeclaration(classifier);
+    CharSequence _CppClassTypeAndEnum = CppClassTypeAndEnum.CppClassTypeAndEnum(classifier);
+    _builder.append(_CppClassTypeAndEnum, "");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t");
+    VisibilityKind publicVisibility = VisibilityKind.PUBLIC_LITERAL;
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t   ");
+    String _defaultInitializer = CppClassifierGenerator.defaultInitializer(classifier);
+    String _section = CppGenUtils.getSection(publicVisibility, _defaultInitializer);
+    _builder.append(_section, "\t   ");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t   ");
+    CharSequence _CppClassAttributesDeclaration = CppClassAttributesDeclaration.CppClassAttributesDeclaration(classifier, publicVisibility);
+    String _string = _CppClassAttributesDeclaration.toString();
+    String _section_1 = CppGenUtils.getSection(publicVisibility, _string);
+    _builder.append(_section_1, "\t   ");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t   ");
+    CharSequence _CppClassOperationsDeclaration = CppClassOperationsDeclaration.CppClassOperationsDeclaration(classifier, publicVisibility);
+    String _string_1 = _CppClassOperationsDeclaration.toString();
+    String _section_2 = CppGenUtils.getSection(publicVisibility, _string_1);
+    _builder.append(_section_2, "\t   ");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("\t");
+    VisibilityKind protectedVisibility = VisibilityKind.PROTECTED_LITERAL;
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t   ");
+    CharSequence _CppClassAttributesDeclaration_1 = CppClassAttributesDeclaration.CppClassAttributesDeclaration(classifier, protectedVisibility);
+    String _string_2 = _CppClassAttributesDeclaration_1.toString();
+    String _section_3 = CppGenUtils.getSection(protectedVisibility, _string_2);
+    _builder.append(_section_3, "\t   ");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t   ");
+    CharSequence _CppClassOperationsDeclaration_1 = CppClassOperationsDeclaration.CppClassOperationsDeclaration(classifier, protectedVisibility);
+    String _string_3 = _CppClassOperationsDeclaration_1.toString();
+    String _section_4 = CppGenUtils.getSection(protectedVisibility, _string_3);
+    _builder.append(_section_4, "\t   ");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("\t");
+    VisibilityKind privateVisibility = VisibilityKind.PRIVATE_LITERAL;
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t   ");
+    CharSequence _CppClassAttributesDeclaration_2 = CppClassAttributesDeclaration.CppClassAttributesDeclaration(classifier, privateVisibility);
+    String _string_4 = _CppClassAttributesDeclaration_2.toString();
+    String _section_5 = CppGenUtils.getSection(privateVisibility, _string_4);
+    _builder.append(_section_5, "\t   ");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t   ");
+    CharSequence _CppClassOperationsDeclaration_2 = CppClassOperationsDeclaration.CppClassOperationsDeclaration(classifier, privateVisibility);
+    String _string_5 = _CppClassOperationsDeclaration_2.toString();
+    String _section_6 = CppGenUtils.getSection(privateVisibility, _string_5);
+    _builder.append(_section_6, "\t   ");
+    _builder.newLineIfNotEmpty();
+    _builder.append("};");
+    _builder.newLine();
+    _builder.append("/************************************************************/");
+    _builder.newLine();
+    _builder.append("/* External declarations (package visibility)               */");
+    _builder.newLine();
+    VisibilityKind packageVisibility = VisibilityKind.PACKAGE_LITERAL;
+    _builder.newLineIfNotEmpty();
+    CharSequence _CppClassAttributesDeclaration_3 = CppClassAttributesDeclaration.CppClassAttributesDeclaration(classifier, packageVisibility);
+    _builder.append(_CppClassAttributesDeclaration_3, "");
+    _builder.newLineIfNotEmpty();
+    CharSequence _CppClassOperationsDeclaration_3 = CppClassOperationsDeclaration.CppClassOperationsDeclaration(classifier, packageVisibility);
+    _builder.append(_CppClassOperationsDeclaration_3, "");
+    _builder.newLineIfNotEmpty();
+    _builder.append("/************************************************************/");
+    _builder.newLine();
+    _builder.newLine();
+    {
+      boolean _isTemplate = CppTemplates.isTemplate(classifier);
+      if (_isTemplate) {
+        _builder.append("/************************************************************/");
+        _builder.newLine();
+        _builder.append("/* Template functions                                       */");
+        _builder.newLine();
+        CharSequence _CppClassOperationsImplementation = CppClassOperationsImplementation.CppClassOperationsImplementation(classifier, false);
+        _builder.append(_CppClassOperationsImplementation, "");
+        _builder.newLineIfNotEmpty();
+      }
+    }
+    _builder.newLine();
+    _builder.append("/* Inline functions                                         */");
+    _builder.newLine();
+    CharSequence _CppClassOperationsImplementation_1 = CppClassOperationsImplementation.CppClassOperationsImplementation(classifier, true);
+    _builder.append(_CppClassOperationsImplementation_1, "");
+    _builder.newLineIfNotEmpty();
+    String _closeNS = CppGenUtils.closeNS(classifier);
+    _builder.append(_closeNS, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("/************************************************************");
+    _builder.newLine();
+    _builder.append("              ");
+    _builder.append("End of ");
+    String _name_2 = classifier.getName();
+    _builder.append(_name_2, "              ");
+    _builder.append(" class header");
+    _builder.newLineIfNotEmpty();
+    _builder.append(" ");
+    _builder.append("************************************************************/");
+    _builder.newLine();
+    _builder.newLine();
+    _builder.append("#endif");
+    String code = _builder.toString();
+    return code;
+  }
+  
+  public static String classUnionOrStruct(final Classifier classifier) {
+    boolean _hasStereotype = GenUtils.hasStereotype(classifier, Union.class);
+    if (_hasStereotype) {
+      return "union";
+    } else {
+      if ((classifier instanceof DataType)) {
+        CppGenUtils.resetVisibility(VisibilityKind.PUBLIC_LITERAL);
+        return "struct";
+      } else {
+        CppGenUtils.resetVisibility(VisibilityKind.PRIVATE_LITERAL);
+        return "class";
+      }
+    }
+  }
+  
+  /**
+   * default initializer for non-static attributes with a default value TODO: should be disabled by default, since non-static members can be initialized directly in C++ 011
+   */
+  public static String defaultInitializer(final Classifier classifier) {
+    StringConcatenation _builder = new StringConcatenation();
+    {
+      EList<Operation> _ownedOperations = CppOperations.getOwnedOperations(classifier);
+      final Function1<Operation, Boolean> _function = new Function1<Operation, Boolean>() {
+        public Boolean apply(final Operation it) {
+          return Boolean.valueOf(GenUtils.hasStereotype(it, Create.class));
+        }
+      };
+      Iterable<Operation> _filter = IterableExtensions.<Operation>filter(_ownedOperations, _function);
+      int _size = IterableExtensions.size(_filter);
+      boolean _equals = (_size == 0);
+      if (_equals) {
+        EList<Property> _attributes = classifier.getAttributes();
+        final Function1<Property, Boolean> _function_1 = new Function1<Property, Boolean>() {
+          public Boolean apply(final Property it) {
+            boolean _and = false;
+            boolean _and_1 = false;
+            boolean _isStatic = it.isStatic();
+            boolean _equals = (_isStatic == false);
+            if (!_equals) {
+              _and_1 = false;
+            } else {
+              ValueSpecification _defaultValue = it.getDefaultValue();
+              boolean _notEquals = (!Objects.equal(_defaultValue, null));
+              _and_1 = _notEquals;
+            }
+            if (!_and_1) {
+              _and = false;
+            } else {
+              ValueSpecification _defaultValue_1 = it.getDefaultValue();
+              String _stringValue = _defaultValue_1.stringValue();
+              boolean _notEquals_1 = (!Objects.equal(_stringValue, null));
+              _and = _notEquals_1;
+            }
+            return Boolean.valueOf(_and);
+          }
+        };
+        Iterable<Property> attributeList = IterableExtensions.<Property>filter(_attributes, _function_1);
+        _builder.newLineIfNotEmpty();
+        {
+          boolean _isEmpty = IterableExtensions.isEmpty(attributeList);
+          boolean _not = (!_isEmpty);
+          if (_not) {
+            String _name = classifier.getName();
+            _builder.append(_name, "");
+            _builder.append("() : ");
+            {
+              boolean _hasElements = false;
+              for(final Property a : attributeList) {
+                if (!_hasElements) {
+                  _hasElements = true;
+                } else {
+                  _builder.appendImmediate(", ", "");
+                }
+                String _name_1 = a.getName();
+                _builder.append(_name_1, "");
+                _builder.append("(");
+                ValueSpecification _defaultValue = a.getDefaultValue();
+                String _stringValue = _defaultValue.stringValue();
+                _builder.append(_stringValue, "");
+                _builder.append(")");
+              }
+            }
+            _builder.append(" {}");
+            _builder.newLineIfNotEmpty();
+          }
+        }
+        _builder.append("\t\t");
+      }
+    }
+    String code = _builder.toString();
+    return code.trim();
+  }
+  
+  public static String generateClassBodyCode(final Classifier classifier) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("#define ");
+    String _fullName = GenUtils.getFullName(classifier);
+    _builder.append(_fullName, "");
+    _builder.append("_BODY");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("/************************************************************");
+    _builder.newLine();
+    _builder.append("              ");
+    String _name = classifier.getName();
+    _builder.append(_name, "              ");
+    _builder.append(" class body");
+    _builder.newLineIfNotEmpty();
+    _builder.append(" ");
+    _builder.append("************************************************************/");
+    _builder.newLine();
+    _builder.newLine();
+    String _CppIncludePreBody = CppIncludeUtil.CppIncludePreBody(classifier);
+    _builder.append(_CppIncludePreBody, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("// include associated header file");
+    _builder.newLine();
+    org.eclipse.uml2.uml.Package _nearestPackage = classifier.getNearestPackage();
+    String _fullPath = GenUtils.getFullPath(_nearestPackage);
+    String _plus = (_fullPath + "/");
+    String _name_1 = classifier.getName();
+    String _plus_1 = (_plus + _name_1);
+    String _plus_2 = (_plus_1 + ".");
+    String _headerSuffix = CppCodeGenUtils.getHeaderSuffix();
+    String _plus_3 = (_plus_2 + _headerSuffix);
+    String _includeDirective = CppIncludeUtil.includeDirective(_plus_3);
+    _builder.append(_includeDirective, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("// Derived includes directives");
+    _builder.newLine();
+    {
+      Iterable<String> _CppClassAllIncludesDeclarationBody = CppClassIncludeClassDeclaration.CppClassAllIncludesDeclarationBody(classifier);
+      List<String> _sort = IterableExtensions.<String>sort(_CppClassAllIncludesDeclarationBody);
+      for(final String path : _sort) {
+        String _includeDirective_1 = CppIncludeUtil.includeDirective(path);
+        _builder.append(_includeDirective_1, "");
+        _builder.newLineIfNotEmpty();
+      }
+    }
+    _builder.newLine();
+    String _CppIncludeBody = CppIncludeUtil.CppIncludeBody(classifier);
+    _builder.append(_CppIncludeBody, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    String _openNS = CppGenUtils.openNS(classifier);
+    _builder.append(_openNS, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    String _CppStaticAttributes = CppAttribute.CppStaticAttributes(classifier);
+    _builder.append(_CppStaticAttributes, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    {
+      boolean _isTemplate = classifier.isTemplate();
+      boolean _not = (!_isTemplate);
+      if (_not) {
+        CharSequence _CppClassOperationsImplementation = CppClassOperationsImplementation.CppClassOperationsImplementation(classifier, false);
+        _builder.append(_CppClassOperationsImplementation, "");
+        _builder.newLineIfNotEmpty();
+      }
+    }
+    _builder.newLine();
+    String _closeNS = CppGenUtils.closeNS(classifier);
+    _builder.append(_closeNS, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("/************************************************************");
+    _builder.newLine();
+    _builder.append("              ");
+    _builder.append("End of ");
+    String _name_2 = classifier.getName();
+    _builder.append(_name_2, "              ");
+    _builder.append(" class body");
+    _builder.newLineIfNotEmpty();
+    _builder.append(" ");
+    _builder.append("************************************************************/");
+    String code = _builder.toString();
+    return code;
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppCodeGenerator.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppCodeGenerator.java
new file mode 100644
index 00000000000..567248aee31
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppCodeGenerator.java
@@ -0,0 +1,92 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import com.google.common.base.Objects;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.cpp.codegen.Activator;
+import org.eclipse.papyrus.cpp.codegen.transformation.CppModelElementsCreator;
+import org.eclipse.papyrus.cpp.codegen.utils.ClassUtils;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.PackageableElement;
+import org.eclipse.xtext.xbase.lib.Exceptions;
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+@SuppressWarnings("all")
+public class CppCodeGenerator {
+  /**
+   * Generate code for a passed packageable element and the elements required by it (in the sense of #included statements)
+   * 
+   * @param mec model elements creator
+   * @param pe the element that should be generated
+   * @param alreadyHandled list of packageable elements for which code has already been generated.
+   * @param recurse if the passed packageableElement is a package, generate code for its contents (recursively).
+   */
+  public static Object generate(final CppModelElementsCreator mec, final PackageableElement pe, final EList<PackageableElement> alreadyHandled, final boolean recurse) {
+    final IContainer srcPkg = mec.getContainer(pe);
+    try {
+      alreadyHandled.add(pe);
+      mec.createPackageableElement(srcPkg, null, pe, false);
+    } catch (final Throwable _t) {
+      if (_t instanceof CoreException) {
+        final CoreException coreException = (CoreException)_t;
+        Activator.log.error(coreException);
+      } else {
+        throw Exceptions.sneakyThrow(_t);
+      }
+    } finally {
+      try {
+        srcPkg.refreshLocal(IResource.DEPTH_INFINITE, null);
+      } catch (final Throwable _t_1) {
+        if (_t_1 instanceof CoreException) {
+          final CoreException e = (CoreException)_t_1;
+          Activator.log.error(e);
+        } else {
+          throw Exceptions.sneakyThrow(_t_1);
+        }
+      }
+    }
+    if ((pe instanceof Classifier)) {
+      EList<Classifier> requiredClassifiers = ClassUtils.includedClassifiers(((Classifier) pe));
+      for (final Classifier requiredClassifier : requiredClassifiers) {
+        boolean _contains = alreadyHandled.contains(requiredClassifier);
+        boolean _not = (!_contains);
+        if (_not) {
+          CppCodeGenerator.generate(mec, requiredClassifier, alreadyHandled, false);
+        }
+      }
+    }
+    org.eclipse.uml2.uml.Package owningPackage = pe.getNearestPackage();
+    boolean _and = false;
+    boolean _notEquals = (!Objects.equal(owningPackage, null));
+    if (!_notEquals) {
+      _and = false;
+    } else {
+      boolean _notEquals_1 = (!Objects.equal(owningPackage, pe));
+      _and = _notEquals_1;
+    }
+    if (_and) {
+      boolean _contains_1 = alreadyHandled.contains(owningPackage);
+      boolean _not_1 = (!_contains_1);
+      if (_not_1) {
+        CppCodeGenerator.generate(mec, owningPackage, alreadyHandled, false);
+      }
+    }
+    boolean _and_1 = false;
+    if (!(pe instanceof org.eclipse.uml2.uml.Package)) {
+      _and_1 = false;
+    } else {
+      _and_1 = recurse;
+    }
+    if (_and_1) {
+      EList<PackageableElement> _packagedElements = ((org.eclipse.uml2.uml.Package) pe).getPackagedElements();
+      for (final PackageableElement currentElement : _packagedElements) {
+        CppCodeGenerator.generate(mec, currentElement, alreadyHandled, recurse);
+      }
+    }
+    return null;
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppDocumentation.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppDocumentation.java
new file mode 100644
index 00000000000..4d0b48b5612
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppDocumentation.java
@@ -0,0 +1,107 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import com.google.common.base.Objects;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.acceleo.GenUtils;
+import org.eclipse.uml2.uml.Behavior;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Parameter;
+import org.eclipse.uml2.uml.ParameterDirectionKind;
+import org.eclipse.xtend2.lib.StringConcatenation;
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+@SuppressWarnings("all")
+public class CppDocumentation {
+  public static CharSequence CppElementDoc(final Element argument) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("/**");
+    _builder.newLine();
+    _builder.append(" ");
+    _builder.append("* ");
+    String _comments = GenUtils.getComments(argument);
+    String _replaceAll = _comments.replaceAll("\n", "\n * ");
+    _builder.append(_replaceAll, " ");
+    _builder.newLineIfNotEmpty();
+    _builder.append(" ");
+    _builder.append("*/");
+    _builder.newLine();
+    return _builder;
+  }
+  
+  public static CharSequence CppOperationDoc(final Operation operation) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("/**");
+    _builder.newLine();
+    _builder.append(" ");
+    _builder.append("* ");
+    String _comments = GenUtils.getComments(operation);
+    String _replaceAll = _comments.replaceAll("\n", "\n * ");
+    _builder.append(_replaceAll, " ");
+    _builder.newLineIfNotEmpty();
+    _builder.append(" ");
+    {
+      EList<Parameter> _ownedParameters = operation.getOwnedParameters();
+      for(final Parameter op : _ownedParameters) {
+        CharSequence _CppParamDoc = CppDocumentation.CppParamDoc(op);
+        _builder.append(_CppParamDoc, " ");
+      }
+    }
+    _builder.newLineIfNotEmpty();
+    _builder.append(" ");
+    _builder.append("*/");
+    _builder.newLine();
+    return _builder;
+  }
+  
+  public static CharSequence CppParamDoc(final Parameter parameter) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("* ");
+    {
+      ParameterDirectionKind _direction = parameter.getDirection();
+      boolean _equals = Objects.equal(_direction, ParameterDirectionKind.RETURN_LITERAL);
+      if (_equals) {
+        _builder.append("@return");
+      } else {
+        _builder.append("@param");
+      }
+    }
+    _builder.append(" ");
+    String _name = parameter.getName();
+    _builder.append(_name, "");
+    _builder.append(" ");
+    String _comments = GenUtils.getComments(parameter);
+    String _replaceAll = _comments.replaceAll("\n", "\n *    ");
+    _builder.append(_replaceAll, "");
+    _builder.newLineIfNotEmpty();
+    return _builder;
+  }
+  
+  public static CharSequence CppBehaviorDoc(final Behavior behavior) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("/**");
+    _builder.newLine();
+    _builder.append(" ");
+    _builder.append("* ");
+    String _comments = GenUtils.getComments(behavior);
+    String _replaceAll = _comments.replaceAll("\n", "\n * ");
+    _builder.append(_replaceAll, " ");
+    _builder.newLineIfNotEmpty();
+    _builder.append(" ");
+    _builder.append("* ");
+    {
+      EList<Parameter> _ownedParameters = behavior.getOwnedParameters();
+      for(final Parameter op : _ownedParameters) {
+        CharSequence _CppParamDoc = CppDocumentation.CppParamDoc(op);
+        _builder.append(_CppParamDoc, " ");
+      }
+    }
+    _builder.newLineIfNotEmpty();
+    _builder.append(" ");
+    _builder.append("*/");
+    _builder.newLine();
+    return _builder;
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppEnumerations.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppEnumerations.java
new file mode 100644
index 00000000000..0a14a571d9e
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppEnumerations.java
@@ -0,0 +1,53 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.C_Cpp.CppInit;
+import org.eclipse.papyrus.acceleo.GenUtils;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppDocumentation;
+import org.eclipse.uml2.uml.Enumeration;
+import org.eclipse.uml2.uml.EnumerationLiteral;
+import org.eclipse.uml2.uml.util.UMLUtil;
+import org.eclipse.xtend2.lib.StringConcatenation;
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+@SuppressWarnings("all")
+public class CppEnumerations {
+  public static CharSequence CppEnumerationDefinition(final Enumeration enume) {
+    StringConcatenation _builder = new StringConcatenation();
+    CharSequence _CppElementDoc = CppDocumentation.CppElementDoc(enume);
+    _builder.append(_CppElementDoc, "");
+    _builder.newLineIfNotEmpty();
+    _builder.append("enum ");
+    String _name = enume.getName();
+    _builder.append(_name, "");
+    _builder.append(" {");
+    _builder.newLineIfNotEmpty();
+    {
+      EList<EnumerationLiteral> _ownedLiterals = enume.getOwnedLiterals();
+      for(final EnumerationLiteral ownedLiteral : _ownedLiterals) {
+        _builder.append("\t");
+        CharSequence _CppElementDoc_1 = CppDocumentation.CppElementDoc(ownedLiteral);
+        _builder.append(_CppElementDoc_1, "\t");
+        _builder.newLineIfNotEmpty();
+        _builder.append("\t");
+        String _name_1 = ownedLiteral.getName();
+        _builder.append(_name_1, "\t");
+        {
+          boolean _hasStereotype = GenUtils.hasStereotype(ownedLiteral, CppInit.class);
+          if (_hasStereotype) {
+            CppInit _stereotypeApplication = UMLUtil.<CppInit>getStereotypeApplication(ownedLiteral, CppInit.class);
+            int _value = _stereotypeApplication.getValue();
+            _builder.append(_value, "\t");
+          }
+        }
+        _builder.append(",");
+        _builder.newLineIfNotEmpty();
+      }
+    }
+    _builder.append("};");
+    _builder.newLine();
+    return _builder;
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppFileGenerator.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppFileGenerator.java
new file mode 100644
index 00000000000..cea58ba8ebf
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppFileGenerator.java
@@ -0,0 +1,139 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import com.google.common.base.Objects;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URI;
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.ToolFactory;
+import org.eclipse.cdt.core.formatter.CodeFormatter;
+import org.eclipse.core.filesystem.EFS;
+import org.eclipse.core.filesystem.IFileStore;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.Document;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.papyrus.cpp.codegen.Activator;
+import org.eclipse.papyrus.cpp.codegen.Messages;
+import org.eclipse.text.edits.MalformedTreeException;
+import org.eclipse.text.edits.TextEdit;
+import org.eclipse.xtext.xbase.lib.Exceptions;
+import org.osgi.framework.Bundle;
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+@SuppressWarnings("all")
+public abstract class CppFileGenerator {
+  public static void generateFile(final IContainer owner, final String filename, final String content, final boolean force) {
+    try {
+      IFile file = null;
+      if ((owner instanceof IProject)) {
+        IFile _file = ((IProject) owner).getFile(filename);
+        file = _file;
+      } else {
+        if ((owner instanceof IFolder)) {
+          IFile _file_1 = ((IFolder) owner).getFile(filename);
+          file = _file_1;
+        } else {
+        }
+      }
+      boolean _notEquals = (!Objects.equal(file, null));
+      if (_notEquals) {
+        String _format = CppFileGenerator.format(content);
+        CppFileGenerator.createFile(file, _format, force);
+      }
+    } catch (Throwable _e) {
+      throw Exceptions.sneakyThrow(_e);
+    }
+  }
+  
+  public static void createFile(final IFile file, final String content, final boolean force) throws CoreException {
+    boolean _and = false;
+    boolean _exists = file.exists();
+    if (!_exists) {
+      _and = false;
+    } else {
+      _and = force;
+    }
+    if (_and) {
+      URI locationURI = file.getLocationURI();
+      boolean _notEquals = (!Objects.equal(locationURI, null));
+      if (_notEquals) {
+        IFileStore store = EFS.getStore(locationURI);
+        OutputStream os = store.openOutputStream(0, null);
+        try {
+          byte[] _bytes = content.getBytes();
+          os.write(_bytes);
+        } catch (final Throwable _t) {
+          if (_t instanceof IOException) {
+            final IOException e = (IOException)_t;
+            String _message = e.getMessage();
+            String _plus = ("C++ code generation: " + _message);
+            throw new RuntimeException(_plus);
+          } else {
+            throw Exceptions.sneakyThrow(_t);
+          }
+        }
+      }
+    } else {
+      boolean _and_1 = false;
+      boolean _exists_1 = file.exists();
+      if (!_exists_1) {
+        _and_1 = false;
+      } else {
+        _and_1 = (!force);
+      }
+      if (_and_1) {
+      } else {
+        byte[] _bytes_1 = content.getBytes();
+        ByteArrayInputStream _byteArrayInputStream = new ByteArrayInputStream(_bytes_1);
+        file.create(_byteArrayInputStream, true, null);
+      }
+    }
+  }
+  
+  /**
+   * Apply the user's currently selected formatting options to the input content.  Return the
+   * input String in case of error.
+   */
+  public static String format(final String content) {
+    Bundle _bundle = Platform.getBundle(CCorePlugin.PLUGIN_ID);
+    boolean _equals = Objects.equal(_bundle, null);
+    if (_equals) {
+      return content;
+    }
+    CodeFormatter codeFormatter = ToolFactory.createCodeFormatter(null);
+    IDocument doc = new Document(content);
+    String _get = doc.get();
+    String _get_1 = doc.get();
+    int _length = _get_1.length();
+    TextEdit edit = codeFormatter.format(CodeFormatter.K_TRANSLATION_UNIT, _get, 0, _length, 0, null);
+    boolean _equals_1 = Objects.equal(edit, null);
+    if (_equals_1) {
+      Activator.log.debug(Messages.CppModelElementsCreator_CannotFormatContent);
+      return content;
+    }
+    try {
+      edit.apply(doc);
+      return doc.get();
+    } catch (final Throwable _t) {
+      if (_t instanceof MalformedTreeException) {
+        final MalformedTreeException e = (MalformedTreeException)_t;
+        Activator.log.error(e);
+      } else if (_t instanceof BadLocationException) {
+        final BadLocationException e_1 = (BadLocationException)_t;
+        Activator.log.error(e_1);
+      } else {
+        throw Exceptions.sneakyThrow(_t);
+      }
+    }
+    return content;
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppIncludeUtil.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppIncludeUtil.java
new file mode 100644
index 00000000000..5ba183df155
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppIncludeUtil.java
@@ -0,0 +1,158 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import com.google.common.base.Objects;
+import org.eclipse.papyrus.C_Cpp.Include;
+import org.eclipse.papyrus.acceleo.GenUtils;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.util.UMLUtil;
+import org.eclipse.xtend2.lib.StringConcatenation;
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+@SuppressWarnings("all")
+public class CppIncludeUtil {
+  public static String includeDirective(final String path) {
+    boolean _and = false;
+    boolean _notEquals = (!Objects.equal(path, null));
+    if (!_notEquals) {
+      _and = false;
+    } else {
+      int _length = path.length();
+      boolean _greaterThan = (_length > 0);
+      _and = _greaterThan;
+    }
+    if (_and) {
+      StringConcatenation _builder = new StringConcatenation();
+      _builder.append("#include ");
+      String _plus = (_builder.toString() + "\"");
+      String _plus_1 = (_plus + path);
+      return (_plus_1 + "\"");
+    }
+    return null;
+  }
+  
+  public static String CppIncludeHeader(final NamedElement ne) {
+    boolean _hasStereotype = GenUtils.hasStereotype(ne, Include.class);
+    if (_hasStereotype) {
+      UMLUtil.<Include>getStereotypeApplication(ne, Include.class);
+      Include _stereotypeApplication = UMLUtil.<Include>getStereotypeApplication(ne, Include.class);
+      String header = _stereotypeApplication.getHeader();
+      boolean _and = false;
+      boolean _notEquals = (!Objects.equal(header, null));
+      if (!_notEquals) {
+        _and = false;
+      } else {
+        int _length = header.length();
+        boolean _greaterThan = (_length > 0);
+        _and = _greaterThan;
+      }
+      if (_and) {
+        CharSequence _constIncludeHeaderStart = CppIncludeUtil.constIncludeHeaderStart();
+        String _cleanCR = GenUtils.cleanCR(header);
+        String _plus = (_constIncludeHeaderStart + _cleanCR);
+        String _plus_1 = (_plus + "\n");
+        CharSequence _constIncludeHeaderEnd = CppIncludeUtil.constIncludeHeaderEnd();
+        String includeHeader = (_plus_1 + _constIncludeHeaderEnd);
+        return includeHeader;
+      }
+    }
+    return null;
+  }
+  
+  public static CharSequence constIncludeHeaderStart() {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("// Include from Include stereotype (header)");
+    _builder.newLine();
+    return _builder;
+  }
+  
+  public static CharSequence constIncludeHeaderEnd() {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("// End of Include stereotype (header)");
+    _builder.newLine();
+    return _builder;
+  }
+  
+  public static String CppIncludePreBody(final NamedElement ne) {
+    boolean _hasStereotype = GenUtils.hasStereotype(ne, Include.class);
+    if (_hasStereotype) {
+      Include _stereotypeApplication = UMLUtil.<Include>getStereotypeApplication(ne, Include.class);
+      String preBody = _stereotypeApplication.getPreBody();
+      boolean _and = false;
+      boolean _notEquals = (!Objects.equal(preBody, null));
+      if (!_notEquals) {
+        _and = false;
+      } else {
+        int _length = preBody.length();
+        boolean _greaterThan = (_length > 0);
+        _and = _greaterThan;
+      }
+      if (_and) {
+        CharSequence _constIncludePreBodyStart = CppIncludeUtil.constIncludePreBodyStart();
+        String _cleanCR = GenUtils.cleanCR(preBody);
+        String _plus = (_constIncludePreBodyStart + _cleanCR);
+        String _plus_1 = (_plus + "\n");
+        CharSequence _constIncludePreBodyEnd = CppIncludeUtil.constIncludePreBodyEnd();
+        String includePreBody = (_plus_1 + _constIncludePreBodyEnd);
+        return includePreBody;
+      }
+    }
+    return null;
+  }
+  
+  public static CharSequence constIncludePreBodyStart() {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("// Include from Include stereotype (pre-body)");
+    _builder.newLine();
+    return _builder;
+  }
+  
+  public static CharSequence constIncludePreBodyEnd() {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("// End of Include stereotype (pre-body)");
+    _builder.newLine();
+    return _builder;
+  }
+  
+  public static String CppIncludeBody(final NamedElement ne) {
+    boolean _hasStereotype = GenUtils.hasStereotype(ne, Include.class);
+    if (_hasStereotype) {
+      Include _stereotypeApplication = UMLUtil.<Include>getStereotypeApplication(ne, Include.class);
+      String body = _stereotypeApplication.getBody();
+      boolean _and = false;
+      boolean _notEquals = (!Objects.equal(body, null));
+      if (!_notEquals) {
+        _and = false;
+      } else {
+        int _length = body.length();
+        boolean _greaterThan = (_length > 0);
+        _and = _greaterThan;
+      }
+      if (_and) {
+        CharSequence _constIncludeBodyStart = CppIncludeUtil.constIncludeBodyStart();
+        String _cleanCR = GenUtils.cleanCR(body);
+        String _plus = (_constIncludeBodyStart + _cleanCR);
+        String _plus_1 = (_plus + "\n");
+        CharSequence _constIncludeBodyEnd = CppIncludeUtil.constIncludeBodyEnd();
+        String includeBody = (_plus_1 + _constIncludeBodyEnd);
+        return includeBody;
+      }
+    }
+    return null;
+  }
+  
+  public static CharSequence constIncludeBodyStart() {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("// Include from Include declaration (body)");
+    _builder.newLine();
+    return _builder;
+  }
+  
+  public static CharSequence constIncludeBodyEnd() {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("// End of Include declaration (body)");
+    _builder.newLine();
+    return _builder;
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppOperations.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppOperations.java
new file mode 100644
index 00000000000..ab5b34f8be7
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppOperations.java
@@ -0,0 +1,406 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import com.google.common.base.Objects;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.C_Cpp.ConstInit;
+import org.eclipse.papyrus.C_Cpp.Inline;
+import org.eclipse.papyrus.C_Cpp.Virtual;
+import org.eclipse.papyrus.acceleo.GenUtils;
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils;
+import org.eclipse.papyrus.cpp.codegen.utils.Modifier;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppDocumentation;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppParameter;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppTemplates;
+import org.eclipse.uml2.uml.Behavior;
+import org.eclipse.uml2.uml.BehavioredClassifier;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Interface;
+import org.eclipse.uml2.uml.OpaqueBehavior;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Parameter;
+import org.eclipse.uml2.uml.Type;
+import org.eclipse.uml2.uml.profile.standard.Create;
+import org.eclipse.uml2.uml.profile.standard.Destroy;
+import org.eclipse.uml2.uml.util.UMLUtil;
+import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.Conversions;
+
+@SuppressWarnings("all")
+public class CppOperations {
+  public static CharSequence CppOperationImplementation(final Operation operation) {
+    StringConcatenation _builder = new StringConcatenation();
+    CharSequence _CppOperationDoc = CppDocumentation.CppOperationDoc(operation);
+    _builder.append(_CppOperationDoc, "");
+    _builder.newLineIfNotEmpty();
+    {
+      String _name = operation.getName();
+      boolean _equals = Objects.equal(_name, "main");
+      if (_equals) {
+        String _CppReturnSpec = CppOperations.CppReturnSpec(operation);
+        _builder.append(_CppReturnSpec, "");
+        String _name_1 = operation.getName();
+        _builder.append(_name_1, "");
+        _builder.append("(");
+        CharSequence _CppOperationParameters = CppParameter.CppOperationParameters(operation, false);
+        _builder.append(_CppOperationParameters, "");
+        _builder.append(") {");
+        _builder.newLineIfNotEmpty();
+        _builder.append("\t");
+        String _body = GenUtils.getBody(operation, "C/C++");
+        _builder.append(_body, "\t");
+        _builder.newLineIfNotEmpty();
+        _builder.append("} ");
+        _builder.newLine();
+      } else {
+        CharSequence _templateSignature = CppTemplates.templateSignature(operation);
+        _builder.append(_templateSignature, "");
+        String _InlineTxt = CppOperations.InlineTxt(operation);
+        _builder.append(_InlineTxt, "");
+        String _CppReturnSpec_1 = CppOperations.CppReturnSpec(operation);
+        _builder.append(_CppReturnSpec_1, "");
+        EList<Classifier> _featuringClassifiers = operation.getFeaturingClassifiers();
+        Classifier _get = _featuringClassifiers.get(0);
+        String _name_2 = _get.getName();
+        _builder.append(_name_2, "");
+        CharSequence _templateShortSignature = CppTemplates.templateShortSignature(operation);
+        _builder.append(_templateShortSignature, "");
+        _builder.append("::");
+        String _destructor = CppOperations.destructor(operation);
+        _builder.append(_destructor, "");
+        String _name_3 = operation.getName();
+        _builder.append(_name_3, "");
+        _builder.append("(");
+        CharSequence _CppOperationParameters_1 = CppParameter.CppOperationParameters(operation, false);
+        _builder.append(_CppOperationParameters_1, "");
+        _builder.append(")");
+        CharSequence _throwss = CppOperations.throwss(operation);
+        _builder.append(_throwss, "");
+        String _modCVQualifier = Modifier.modCVQualifier(operation);
+        _builder.append(_modCVQualifier, "");
+        String _CppConstInit = CppOperations.CppConstInit(operation);
+        _builder.append(_CppConstInit, "");
+        _builder.append(" {");
+        _builder.newLineIfNotEmpty();
+        _builder.append("\t");
+        String _body_1 = GenUtils.getBody(operation, "C/C++");
+        _builder.append(_body_1, "\t");
+        _builder.newLineIfNotEmpty();
+        _builder.append("}");
+        _builder.newLine();
+      }
+    }
+    return _builder;
+  }
+  
+  public static String CppReturnSpec(final Operation operation) {
+    String _xifexpression = null;
+    boolean _or = false;
+    Type _type = operation.getType();
+    boolean _equals = Objects.equal(_type, null);
+    if (_equals) {
+      _or = true;
+    } else {
+      boolean _isConsOrDestructor = CppOperations.isConsOrDestructor(operation);
+      _or = _isConsOrDestructor;
+    }
+    if (_or) {
+      _xifexpression = CppOperations.ConsDestructorOrVoid(operation);
+    } else {
+      Parameter _returnResult = operation.getReturnResult();
+      String _modCVQualifier = Modifier.modCVQualifier(_returnResult);
+      String _plus = (_modCVQualifier + " ");
+      Type _type_1 = operation.getType();
+      String _cppQualifiedName = CppGenUtils.cppQualifiedName(_type_1);
+      String _plus_1 = (_plus + _cppQualifiedName);
+      Parameter _returnResult_1 = operation.getReturnResult();
+      String _modPtr = Modifier.modPtr(_returnResult_1);
+      String _plus_2 = (_plus_1 + _modPtr);
+      Parameter _returnResult_2 = operation.getReturnResult();
+      String _modRef = Modifier.modRef(_returnResult_2);
+      String _plus_3 = (_plus_2 + _modRef);
+      _xifexpression = (_plus_3 + " ");
+    }
+    return _xifexpression;
+  }
+  
+  public static CharSequence CppReturnSpec(final Behavior behavior) {
+    StringConcatenation _builder = new StringConcatenation();
+    {
+      Parameter _returnResult = GenUtils.returnResult(behavior);
+      boolean _equals = Objects.equal(_returnResult, null);
+      if (_equals) {
+        _builder.append("void ");
+      } else {
+        Parameter _returnResult_1 = GenUtils.returnResult(behavior);
+        String _modCVQualifier = Modifier.modCVQualifier(_returnResult_1);
+        _builder.append(_modCVQualifier, "");
+        _builder.append(" ");
+        Parameter _returnResult_2 = GenUtils.returnResult(behavior);
+        Type _type = _returnResult_2.getType();
+        String _cppQualifiedName = CppGenUtils.cppQualifiedName(_type);
+        _builder.append(_cppQualifiedName, "");
+        Parameter _returnResult_3 = GenUtils.returnResult(behavior);
+        String _modPtr = Modifier.modPtr(_returnResult_3);
+        _builder.append(_modPtr, "");
+        Parameter _returnResult_4 = GenUtils.returnResult(behavior);
+        String _modRef = Modifier.modRef(_returnResult_4);
+        _builder.append(_modRef, "");
+        _builder.append(" ");
+      }
+    }
+    _builder.newLineIfNotEmpty();
+    return _builder;
+  }
+  
+  public static CharSequence throwss(final Operation operation) {
+    StringConcatenation _builder = new StringConcatenation();
+    {
+      EList<Type> _raisedExceptions = operation.getRaisedExceptions();
+      int _length = ((Object[])Conversions.unwrapArray(_raisedExceptions, Object.class)).length;
+      boolean _greaterThan = (_length > 0);
+      if (_greaterThan) {
+        _builder.append("throws ");
+        {
+          EList<Type> _raisedExceptions_1 = operation.getRaisedExceptions();
+          boolean _hasElements = false;
+          for(final Type re : _raisedExceptions_1) {
+            if (!_hasElements) {
+              _hasElements = true;
+            } else {
+              _builder.appendImmediate(",", "");
+            }
+            String _name = re.getName();
+            _builder.append(_name, "");
+          }
+        }
+        _builder.newLineIfNotEmpty();
+      }
+    }
+    return _builder;
+  }
+  
+  public static String ConsDestructorOrVoid(final Operation operation) {
+    String _xifexpression = null;
+    boolean _isConsOrDestructor = CppOperations.isConsOrDestructor(operation);
+    if (_isConsOrDestructor) {
+      _xifexpression = null;
+    } else {
+      _xifexpression = "void ";
+    }
+    return _xifexpression;
+  }
+  
+  public static boolean isConsOrDestructor(final Operation operation) {
+    boolean _or = false;
+    boolean _hasStereotype = GenUtils.hasStereotype(operation, Create.class);
+    if (_hasStereotype) {
+      _or = true;
+    } else {
+      boolean _hasStereotype_1 = GenUtils.hasStereotype(operation, Destroy.class);
+      _or = _hasStereotype_1;
+    }
+    return _or;
+  }
+  
+  public static String CppConstInit(final Operation operation) {
+    String _xifexpression = null;
+    boolean _and = false;
+    boolean _hasStereotype = GenUtils.hasStereotype(operation, ConstInit.class);
+    if (!_hasStereotype) {
+      _and = false;
+    } else {
+      boolean _hasStereotype_1 = GenUtils.hasStereotype(operation, Create.class);
+      _and = _hasStereotype_1;
+    }
+    if (_and) {
+      ConstInit _stereotypeApplication = UMLUtil.<ConstInit>getStereotypeApplication(operation, ConstInit.class);
+      _xifexpression = ((ConstInit) _stereotypeApplication).getInitialisation();
+    }
+    return _xifexpression;
+  }
+  
+  public static EList<Operation> getOwnedOperations(final Classifier cl) {
+    EList<Operation> _xifexpression = null;
+    if ((cl instanceof org.eclipse.uml2.uml.Class)) {
+      _xifexpression = ((org.eclipse.uml2.uml.Class) cl).getOwnedOperations();
+    } else {
+      EList<Operation> _xifexpression_1 = null;
+      if ((cl instanceof DataType)) {
+        _xifexpression_1 = ((DataType) cl).getOwnedOperations();
+      } else {
+        EList<Operation> _xifexpression_2 = null;
+        if ((cl instanceof Interface)) {
+          _xifexpression_2 = ((Interface) cl).getOwnedOperations();
+        } else {
+          _xifexpression_2 = null;
+        }
+        _xifexpression_1 = _xifexpression_2;
+      }
+      _xifexpression = _xifexpression_1;
+    }
+    return _xifexpression;
+  }
+  
+  public static CharSequence CppBehaviorImplementation(final OpaqueBehavior behavior) {
+    StringConcatenation _builder = new StringConcatenation();
+    CharSequence _CppBehaviorDoc = CppDocumentation.CppBehaviorDoc(behavior);
+    _builder.append(_CppBehaviorDoc, "");
+    _builder.newLineIfNotEmpty();
+    CharSequence _CppReturnSpec = CppOperations.CppReturnSpec(behavior);
+    _builder.append(_CppReturnSpec, "");
+    BehavioredClassifier _context = behavior.getContext();
+    String _name = _context.getName();
+    _builder.append(_name, "");
+    _builder.append("::");
+    String _name_1 = behavior.getName();
+    _builder.append(_name_1, "");
+    _builder.append("(");
+    CharSequence _CppBehaviorParameters = CppParameter.CppBehaviorParameters(behavior, false);
+    _builder.append(_CppBehaviorParameters, "");
+    _builder.append(")");
+    String _modCVQualifier = Modifier.modCVQualifier(behavior);
+    _builder.append(_modCVQualifier, "");
+    _builder.append(" {");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t");
+    String _bodyFromOB = GenUtils.getBodyFromOB(behavior, "C/C++");
+    _builder.append(_bodyFromOB, "\t");
+    _builder.newLineIfNotEmpty();
+    _builder.append("}");
+    _builder.newLine();
+    return _builder;
+  }
+  
+  public static CharSequence CppOperationDeclaration(final Operation operation) {
+    StringConcatenation _builder = new StringConcatenation();
+    CharSequence _CppOperationDoc = CppDocumentation.CppOperationDoc(operation);
+    _builder.append(_CppOperationDoc, "");
+    _builder.newLineIfNotEmpty();
+    String _InlineTxt = CppOperations.InlineTxt(operation);
+    _builder.append(_InlineTxt, "");
+    String _virtualTxt = CppOperations.virtualTxt(operation);
+    _builder.append(_virtualTxt, "");
+    String _staticTxt = CppOperations.staticTxt(operation);
+    _builder.append(_staticTxt, "");
+    String _CppReturnSpec = CppOperations.CppReturnSpec(operation);
+    _builder.append(_CppReturnSpec, "");
+    String _destructor = CppOperations.destructor(operation);
+    _builder.append(_destructor, "");
+    String _name = operation.getName();
+    _builder.append(_name, "");
+    _builder.append("(");
+    CharSequence _CppOperationParameters = CppParameter.CppOperationParameters(operation, true);
+    _builder.append(_CppOperationParameters, "");
+    _builder.append(")");
+    String _modCVQualifier = Modifier.modCVQualifier(operation);
+    _builder.append(_modCVQualifier, "");
+    String _virtualSuffix = CppOperations.virtualSuffix(operation);
+    _builder.append(_virtualSuffix, "");
+    _builder.append(";");
+    _builder.newLineIfNotEmpty();
+    return _builder;
+  }
+  
+  public static String InlineTxt(final Element element) {
+    String _xifexpression = null;
+    boolean _hasStereotype = GenUtils.hasStereotype(element, Inline.class);
+    if (_hasStereotype) {
+      _xifexpression = "inline ";
+    }
+    return _xifexpression;
+  }
+  
+  public static String virtualTxt(final Operation operation) {
+    String _xifexpression = null;
+    boolean _or = false;
+    boolean _or_1 = false;
+    Interface _interface = operation.getInterface();
+    boolean _notEquals = (!Objects.equal(_interface, null));
+    if (_notEquals) {
+      _or_1 = true;
+    } else {
+      boolean _isAbstract = operation.isAbstract();
+      _or_1 = _isAbstract;
+    }
+    if (_or_1) {
+      _or = true;
+    } else {
+      boolean _hasStereotype = GenUtils.hasStereotype(operation, Virtual.class);
+      _or = _hasStereotype;
+    }
+    if (_or) {
+      _xifexpression = "virtual ";
+    }
+    return _xifexpression;
+  }
+  
+  public static String staticTxt(final Operation operation) {
+    String _xifexpression = null;
+    boolean _isStatic = operation.isStatic();
+    if (_isStatic) {
+      _xifexpression = "static ";
+    }
+    return _xifexpression;
+  }
+  
+  public static String destructor(final Operation operation) {
+    String _xifexpression = null;
+    boolean _and = false;
+    boolean _hasStereotype = GenUtils.hasStereotype(operation, Destroy.class);
+    if (!_hasStereotype) {
+      _and = false;
+    } else {
+      String _name = operation.getName();
+      boolean _startsWith = _name.startsWith("~");
+      boolean _not = (!_startsWith);
+      _and = _not;
+    }
+    if (_and) {
+      _xifexpression = "~";
+    } else {
+      _xifexpression = "";
+    }
+    return _xifexpression;
+  }
+  
+  public static String virtualSuffix(final Operation operation) {
+    String _xifexpression = null;
+    boolean _or = false;
+    Interface _interface = operation.getInterface();
+    boolean _notEquals = (!Objects.equal(_interface, null));
+    if (_notEquals) {
+      _or = true;
+    } else {
+      boolean _isAbstract = operation.isAbstract();
+      _or = _isAbstract;
+    }
+    if (_or) {
+      _xifexpression = " = 0";
+    }
+    return _xifexpression;
+  }
+  
+  public static CharSequence CppBehaviorDeclaration(final Behavior behavior) {
+    StringConcatenation _builder = new StringConcatenation();
+    CharSequence _CppBehaviorDoc = CppDocumentation.CppBehaviorDoc(behavior);
+    _builder.append(_CppBehaviorDoc, "");
+    _builder.newLineIfNotEmpty();
+    String _InlineTxt = CppOperations.InlineTxt(behavior);
+    _builder.append(_InlineTxt, "");
+    CharSequence _CppReturnSpec = CppOperations.CppReturnSpec(behavior);
+    _builder.append(_CppReturnSpec, "");
+    String _name = behavior.getName();
+    _builder.append(_name, "");
+    _builder.append("(");
+    CharSequence _CppBehaviorParameters = CppParameter.CppBehaviorParameters(behavior, true);
+    _builder.append(_CppBehaviorParameters, "");
+    _builder.append(")");
+    String _modCVQualifier = Modifier.modCVQualifier(behavior);
+    _builder.append(_modCVQualifier, "");
+    _builder.append(";");
+    _builder.newLineIfNotEmpty();
+    return _builder;
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppPackageHeaderGenerator.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppPackageHeaderGenerator.java
new file mode 100644
index 00000000000..498dae9714d
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppPackageHeaderGenerator.java
@@ -0,0 +1,139 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import com.google.common.base.Objects;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.acceleo.GenUtils;
+import org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils;
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppClassIncludeClassDeclaration;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppClassTypeAndEnum;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppFileGenerator;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppIncludeUtil;
+import org.eclipse.xtend2.lib.StringConcatenation;
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+@SuppressWarnings("all")
+public class CppPackageHeaderGenerator extends CppFileGenerator {
+  public static void generate(final IContainer packageContainer, final org.eclipse.uml2.uml.Package pkg) {
+    String _name = pkg.getName();
+    String _plus = ("Pkg_" + _name);
+    String _plus_1 = (_plus + ".");
+    String _headerSuffix = CppCodeGenUtils.getHeaderSuffix();
+    final String fileName = (_plus_1 + _headerSuffix);
+    String _generateCode = CppPackageHeaderGenerator.generateCode(pkg);
+    CppFileGenerator.generateFile(packageContainer, fileName, _generateCode, true);
+  }
+  
+  public static String generateCode(final org.eclipse.uml2.uml.Package pkg) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("#ifndef PKG_");
+    String _fullNameUC = GenUtils.getFullNameUC(pkg);
+    _builder.append(_fullNameUC, "");
+    _builder.newLineIfNotEmpty();
+    _builder.append("#define PKG_");
+    String _fullNameUC_1 = GenUtils.getFullNameUC(pkg);
+    _builder.append(_fullNameUC_1, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("/************************************************************");
+    _builder.newLine();
+    _builder.append("              ");
+    _builder.append("Pkg_");
+    String _name = pkg.getName();
+    _builder.append(_name, "              ");
+    _builder.append(" package header");
+    _builder.newLineIfNotEmpty();
+    _builder.append(" ");
+    _builder.append("************************************************************/");
+    _builder.newLine();
+    _builder.newLine();
+    org.eclipse.uml2.uml.Package _nestingPackage = pkg.getNestingPackage();
+    String _cppOwnerPackageIncludePath = CppClassIncludeClassDeclaration.cppOwnerPackageIncludePath(_nestingPackage);
+    String _includeDirective = CppIncludeUtil.includeDirective(_cppOwnerPackageIncludePath);
+    _builder.append(_includeDirective, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("#ifndef _IN_");
+    _builder.newLine();
+    _builder.append("#define _IN_");
+    _builder.newLine();
+    _builder.append("#endif");
+    _builder.newLine();
+    _builder.append("#ifndef _OUT_");
+    _builder.newLine();
+    _builder.append("#define _OUT_");
+    _builder.newLine();
+    _builder.append("#endif");
+    _builder.newLine();
+    _builder.append("#ifndef _INOUT_");
+    _builder.newLine();
+    _builder.append("#define _INOUT_");
+    _builder.newLine();
+    _builder.append("#endif");
+    _builder.newLine();
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.newLine();
+    _builder.append("/* Package dependency header include                        */");
+    _builder.newLine();
+    {
+      EList<org.eclipse.uml2.uml.Package> _usedPackages = GenUtils.getUsedPackages(pkg);
+      for(final org.eclipse.uml2.uml.Package p : _usedPackages) {
+        String _fullPath = GenUtils.getFullPath(p);
+        String _plus = (_fullPath + "/Pkg_");
+        String _name_1 = p.getName();
+        String _plus_1 = (_plus + _name_1);
+        String _plus_2 = (_plus_1 + ".");
+        String _headerSuffix = CppCodeGenUtils.getHeaderSuffix();
+        String path = (_plus_2 + _headerSuffix);
+        _builder.newLineIfNotEmpty();
+        String _includeDirective_1 = CppIncludeUtil.includeDirective(path);
+        _builder.append(_includeDirective_1, "");
+        _builder.newLineIfNotEmpty();
+      }
+    }
+    _builder.newLine();
+    String _CppIncludeHeader = CppIncludeUtil.CppIncludeHeader(pkg);
+    _builder.append(_CppIncludeHeader, "");
+    _builder.newLineIfNotEmpty();
+    String _openNS = CppGenUtils.openNS(pkg);
+    _builder.append(_openNS, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("// Types defined within the package");
+    _builder.newLine();
+    {
+      String _name_2 = pkg.getName();
+      boolean _equals = Objects.equal(_name_2, "root");
+      if (_equals) {
+        int x = 0;
+        _builder.newLineIfNotEmpty();
+      }
+    }
+    CharSequence _CppClassTypeAndEnumPackage = CppClassTypeAndEnum.CppClassTypeAndEnumPackage(pkg);
+    _builder.append(_CppClassTypeAndEnumPackage, "");
+    _builder.newLineIfNotEmpty();
+    String _closeNS = CppGenUtils.closeNS(pkg);
+    _builder.append(_closeNS, "");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("/************************************************************");
+    _builder.newLine();
+    _builder.append("              ");
+    _builder.append("End of Pkg_");
+    String _name_3 = pkg.getName();
+    _builder.append(_name_3, "              ");
+    _builder.append(" package header");
+    _builder.newLineIfNotEmpty();
+    _builder.append(" ");
+    _builder.append("************************************************************/");
+    _builder.newLine();
+    _builder.newLine();
+    _builder.append("#endif");
+    final String code = _builder.toString();
+    return code;
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppParameter.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppParameter.java
new file mode 100644
index 00000000000..edd0c54408c
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppParameter.java
@@ -0,0 +1,115 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import com.google.common.base.Objects;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils;
+import org.eclipse.papyrus.cpp.codegen.utils.Modifier;
+import org.eclipse.uml2.uml.Behavior;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Parameter;
+import org.eclipse.uml2.uml.ParameterDirectionKind;
+import org.eclipse.uml2.uml.Type;
+import org.eclipse.uml2.uml.ValueSpecification;
+import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+@SuppressWarnings("all")
+public class CppParameter {
+  public static CharSequence CppOperationParameters(final Operation operation, final boolean showDefault) {
+    StringConcatenation _builder = new StringConcatenation();
+    {
+      EList<Parameter> _ownedParameters = operation.getOwnedParameters();
+      final Function1<Parameter, Boolean> _function = new Function1<Parameter, Boolean>() {
+        public Boolean apply(final Parameter it) {
+          ParameterDirectionKind _direction = it.getDirection();
+          return Boolean.valueOf((!Objects.equal(_direction, ParameterDirectionKind.RETURN_LITERAL)));
+        }
+      };
+      Iterable<Parameter> _filter = IterableExtensions.<Parameter>filter(_ownedParameters, _function);
+      boolean _hasElements = false;
+      for(final Parameter ownedParameter : _filter) {
+        if (!_hasElements) {
+          _hasElements = true;
+        } else {
+          _builder.appendImmediate(", ", "");
+        }
+        String _CppParameter = CppParameter.CppParameter(ownedParameter, showDefault);
+        _builder.append(_CppParameter, "");
+      }
+    }
+    return _builder;
+  }
+  
+  /**
+   * comment signature for a given behavior (e.g. effect within state machine)
+   */
+  public static CharSequence CppBehaviorParameters(final Behavior behavior, final boolean showDefault) {
+    StringConcatenation _builder = new StringConcatenation();
+    {
+      EList<Parameter> _ownedParameters = behavior.getOwnedParameters();
+      final Function1<Parameter, Boolean> _function = new Function1<Parameter, Boolean>() {
+        public Boolean apply(final Parameter it) {
+          ParameterDirectionKind _direction = it.getDirection();
+          return Boolean.valueOf((!Objects.equal(_direction, ParameterDirectionKind.RETURN_LITERAL)));
+        }
+      };
+      Iterable<Parameter> _filter = IterableExtensions.<Parameter>filter(_ownedParameters, _function);
+      boolean _hasElements = false;
+      for(final Parameter ownedParameter : _filter) {
+        if (!_hasElements) {
+          _hasElements = true;
+        } else {
+          _builder.appendImmediate(", ", "");
+        }
+        String _CppParameter = CppParameter.CppParameter(ownedParameter, showDefault);
+        _builder.append(_CppParameter, "");
+      }
+    }
+    _builder.newLineIfNotEmpty();
+    return _builder;
+  }
+  
+  /**
+   * C++ parameter. Default values are added, if parameter showDefault is true (implementation signature
+   */
+  public static String CppParameter(final Parameter parameter, final boolean showDefault) {
+    String _modCVQualifier = Modifier.modCVQualifier(parameter);
+    Type _type = parameter.getType();
+    String _cppQualifiedName = CppGenUtils.cppQualifiedName(_type);
+    String _plus = (_modCVQualifier + _cppQualifiedName);
+    String _modPtr = Modifier.modPtr(parameter);
+    String _plus_1 = (_plus + _modPtr);
+    String _modRef = Modifier.modRef(parameter);
+    String _plus_2 = (_plus_1 + _modRef);
+    String _plus_3 = (_plus_2 + " ");
+    String _name = parameter.getName();
+    String _plus_4 = (_plus_3 + _name);
+    String _modArray = Modifier.modArray(parameter);
+    String _plus_5 = (_plus_4 + _modArray);
+    String _xifexpression = null;
+    if (showDefault) {
+      _xifexpression = CppParameter.defaultValue(parameter);
+    } else {
+      _xifexpression = "";
+    }
+    return (_plus_5 + _xifexpression);
+  }
+  
+  public static String defaultValue(final Parameter parameter) {
+    String _xifexpression = null;
+    ValueSpecification _defaultValue = parameter.getDefaultValue();
+    boolean _notEquals = (!Objects.equal(_defaultValue, null));
+    if (_notEquals) {
+      ValueSpecification _defaultValue_1 = parameter.getDefaultValue();
+      String _stringValue = _defaultValue_1.stringValue();
+      _xifexpression = (" = " + _stringValue);
+    } else {
+      _xifexpression = "";
+    }
+    return _xifexpression;
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppPrimitiveTypes.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppPrimitiveTypes.java
new file mode 100644
index 00000000000..96e8f539060
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppPrimitiveTypes.java
@@ -0,0 +1,70 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import org.eclipse.papyrus.C_Cpp.Typedef;
+import org.eclipse.papyrus.acceleo.GenUtils;
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils;
+import org.eclipse.papyrus.cpp.codegen.xtend.CppDocumentation;
+import org.eclipse.uml2.uml.PrimitiveType;
+import org.eclipse.uml2.uml.util.UMLUtil;
+import org.eclipse.xtend2.lib.StringConcatenation;
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+@SuppressWarnings("all")
+public class CppPrimitiveTypes {
+  /**
+   * Support two different kinds of primitive types
+   * (1) those that are native types of the programming language such as long
+   *     For these, no additional definition has to be done and they should be referenced
+   *     with their name only
+   * (2) those that correspond to a typedef (e.g. typedef long ErrorType). These require
+   *     a typedef definition within the package and need to be referenced with their
+   *     fully qualified name (e.g. MyPackage::ErrorType)
+   * (3) Sometimes the name of the type defined by a typedef does not appear at the end, e.g.
+   *     when defining functionPointers such as "typedef int (*HandlerFct) (void*);"
+   * 	   (a function with a void* argument returning int)
+   *     Support this case via a specific 'typeName' constant that gets replaced by the name of the
+   *     type
+   */
+  public static CharSequence CppPrimitiveTypeDefinition(final PrimitiveType primitiveType) {
+    StringConcatenation _builder = new StringConcatenation();
+    CharSequence _CppElementDoc = CppDocumentation.CppElementDoc(primitiveType);
+    _builder.append(_CppElementDoc, "");
+    _builder.newLineIfNotEmpty();
+    {
+      boolean _hasStereotype = GenUtils.hasStereotype(primitiveType, Typedef.class);
+      if (_hasStereotype) {
+        _builder.append("typedef ");
+        Typedef _stereotypeApplication = UMLUtil.<Typedef>getStereotypeApplication(primitiveType, Typedef.class);
+        String _definition = _stereotypeApplication.getDefinition();
+        String _name = primitiveType.getName();
+        String _replaceAll = _definition.replaceAll("typeName", _name);
+        _builder.append(_replaceAll, "");
+        _builder.newLineIfNotEmpty();
+        _builder.append("\t");
+        {
+          Typedef _stereotypeApplication_1 = UMLUtil.<Typedef>getStereotypeApplication(primitiveType, Typedef.class);
+          String _definition_1 = _stereotypeApplication_1.getDefinition();
+          boolean _contains = _definition_1.contains("typeName");
+          boolean _not = (!_contains);
+          if (_not) {
+            String _name_1 = primitiveType.getName();
+            _builder.append(_name_1, "\t");
+          }
+        }
+        _builder.append(";");
+        _builder.newLineIfNotEmpty();
+        _builder.append("\t");
+        _builder.newLine();
+      } else {
+        String _stdtypes = CppGenUtils.getStdtypes(primitiveType);
+        _builder.append(_stdtypes, "");
+        _builder.newLineIfNotEmpty();
+        _builder.append(" ");
+        _builder.newLine();
+      }
+    }
+    return _builder;
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppTemplates.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppTemplates.java
new file mode 100644
index 00000000000..09e095d3782
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/xtend-gen/org/eclipse/papyrus/cpp/codegen/xtend/CppTemplates.java
@@ -0,0 +1,101 @@
+package org.eclipse.papyrus.cpp.codegen.xtend;
+
+import java.util.Collection;
+import org.eclipse.papyrus.acceleo.GenUtils;
+import org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.LiteralInteger;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.ParameterableElement;
+import org.eclipse.uml2.uml.TemplateParameter;
+import org.eclipse.uml2.uml.TemplateParameterSubstitution;
+import org.eclipse.xtend2.lib.StringConcatenation;
+
+/**
+ * @author Önder GÜRCAN (onder.gurcan@cea.fr)
+ */
+@SuppressWarnings("all")
+public class CppTemplates {
+  public static CharSequence templateSignature(final Operation operation) {
+    Element _owner = operation.getOwner();
+    return CppTemplates.templateSignature(((Classifier) _owner));
+  }
+  
+  public static CharSequence templateSignature(final Classifier clazz) {
+    StringConcatenation _builder = new StringConcatenation();
+    {
+      boolean _isTemplate = CppTemplates.isTemplate(clazz);
+      if (_isTemplate) {
+        _builder.append("template<");
+        {
+          Collection<TemplateParameter> _templateParameters = GenUtils.getTemplateParameters(clazz);
+          boolean _hasElements = false;
+          for(final TemplateParameter templateParam : _templateParameters) {
+            if (!_hasElements) {
+              _hasElements = true;
+            } else {
+              _builder.appendImmediate(", ", "");
+            }
+            String _templateTypeName = CppGenUtils.getTemplateTypeName(templateParam);
+            _builder.append(_templateTypeName, "");
+          }
+        }
+        _builder.append(">");
+        _builder.newLineIfNotEmpty();
+      }
+    }
+    return _builder;
+  }
+  
+  public static CharSequence templateShortSignature(final Operation operation) {
+    Element _owner = operation.getOwner();
+    return CppTemplates.templateShortSignature(((Classifier) _owner));
+  }
+  
+  public static CharSequence templateShortSignature(final Classifier clazz) {
+    StringConcatenation _builder = new StringConcatenation();
+    {
+      boolean _isTemplate = CppTemplates.isTemplate(clazz);
+      if (_isTemplate) {
+        _builder.append("<");
+        {
+          Collection<TemplateParameter> _templateParameters = GenUtils.getTemplateParameters(clazz);
+          boolean _hasElements = false;
+          for(final TemplateParameter templateParam : _templateParameters) {
+            if (!_hasElements) {
+              _hasElements = true;
+            } else {
+              _builder.appendImmediate(", ", "");
+            }
+            String _templateName = GenUtils.getTemplateName(templateParam);
+            _builder.append(_templateName, "");
+          }
+        }
+        _builder.append(">");
+        _builder.newLineIfNotEmpty();
+      }
+    }
+    return _builder;
+  }
+  
+  public static boolean isTemplate(final Classifier clazz) {
+    Collection<TemplateParameter> _templateParameters = GenUtils.getTemplateParameters(clazz);
+    int _size = _templateParameters.size();
+    return (_size > 0);
+  }
+  
+  public static Object CppTemplateBindingParameter(final TemplateParameterSubstitution tps) {
+    Object _xifexpression = null;
+    ParameterableElement _actual = tps.getActual();
+    if ((_actual instanceof LiteralInteger)) {
+      ParameterableElement _actual_1 = tps.getActual();
+      _xifexpression = Integer.valueOf(((LiteralInteger) _actual_1).getValue());
+    } else {
+      ParameterableElement _actual_2 = tps.getActual();
+      _xifexpression = ((NamedElement) _actual_2).getName();
+    }
+    return ((Comparable<?>)_xifexpression);
+  }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/META-INF/MANIFEST.MF
index c6dd36d5e8e..21eaa633054 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

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

+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/pom.xml b/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/pom.xml
index 1b85eb0d4c6..6b6136f60a9 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/pom.xml
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.cpp.examples</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF
index 72e3077be7c..8bb29efa0ff 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Export-Package: org.eclipse.papyrus.C_Cpp,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

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

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/pom.xml b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/pom.xml
index f0e2089e756..6d022ff72b0 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/pom.xml
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.cpp.profile</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF
index c493b8ba53b..9a0403ecfc6 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF
@@ -12,24 +12,24 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.runtime.emf.type.core,

  org.eclipse.cdt.core;bundle-version="5.4.0",

  org.eclipse.cdt.ui;bundle-version="5.4.0",

- org.eclipse.papyrus.cpp.codegen;bundle-version="1.0.1",

+ org.eclipse.papyrus.cpp.codegen;bundle-version="1.1.0",

  org.eclipse.cdt.codan.ui.cxx;bundle-version="3.2.0",

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

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

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

- org.eclipse.papyrus.cpp.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

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

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

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

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

+ org.eclipse.papyrus.cpp.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

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

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

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.acceleo;bundle-version="1.0.1",

- org.eclipse.papyrus.acceleo.ui;bundle-version="1.0.1",

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

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

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

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.acceleo;bundle-version="1.1.0",

+ org.eclipse.papyrus.acceleo.ui;bundle-version="1.1.0",

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

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

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

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.texteditor.cdt.Activator

diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/pom.xml b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/pom.xml
index 17066255a3b..d69d772e8a7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/pom.xml
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.texteditor.cdt</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/META-INF/MANIFEST.MF
index f636e6df7d8..3cf5f877df4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Export-Package: org.eclipse.papyrus.texteditor.model.texteditormodel,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/pom.xml b/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/pom.xml
index fdbe56375b0..9d65d2f3d62 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/pom.xml
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.texteditor.model</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF
index a814bcce34f..da4def31399 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF
@@ -9,17 +9,17 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

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

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

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

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

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

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

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

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

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

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

  org.eclipse.core.expressions;bundle-version="3.4.500",

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

  org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.3.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: %pluginProvider

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.texteditor.modelexplorer.Activat

  or

diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/pom.xml b/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/pom.xml
index 36f7afc2b63..ee7c633d8b1 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/pom.xml
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.texteditor.modelexplorer</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF
index d8916e1e946..072d8f420ba 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF
@@ -6,16 +6,16 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.ecore.edit,

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

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

- org.eclipse.papyrus.cpp.profile;bundle-version="1.0.1",

+ org.eclipse.papyrus.cpp.profile;bundle-version="1.1.0",

  org.eclipse.ui.editors;bundle-version="3.6.1",

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

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

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

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

- org.eclipse.papyrus.acceleo;bundle-version="1.0.1",

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

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

+ org.eclipse.papyrus.acceleo;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.views.cpp;

   uses:="org.eclipse.ui,

    com.cea.papyrus.views.panels,

@@ -26,7 +26,7 @@ Export-Package: org.eclipse.papyrus.views.cpp;
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

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

diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/pom.xml b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/pom.xml
index 93d21046ac2..f6185280ff8 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/pom.xml
+++ b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.cpp</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/META-INF/MANIFEST.MF b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/META-INF/MANIFEST.MF
index 007ac7a9a23..fcc01d9b2d9 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/META-INF/MANIFEST.MF
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0

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

- org.eclipse.papyrus.design.profile.architecture;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.design.profile.architecture;bundle-version="1.1.0";visibility:=reexport,

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

  org.eclipse.uml2.common.edit;visibility:=reexport,

  org.eclipse.ocl.uml.edit;bundle-version="3.1.0",

@@ -10,7 +10,7 @@ Export-Package: org.eclipse.papyrus.design.profile.architecture.provid
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.design.profile.architecture.prov

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.editor/META-INF/MANIFEST.MF b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.editor/META-INF/MANIFEST.MF
index 68ec9341c87..12e3e223c03 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.editor/META-INF/MANIFEST.MF
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.editor/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

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

  org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.design.profile.architecture.edit;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.design.profile.architecture.edit;bundle-version="1.1.0";visibility:=reexport,

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

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

  org.eclipse.ui.ide;visibility:=reexport,

@@ -12,7 +12,7 @@ Export-Package: org.eclipse.papyrus.design.profile.architecture.presen
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.design.profile.architecture.pres

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/META-INF/MANIFEST.MF b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/META-INF/MANIFEST.MF
index 9c4cfea0649..81af2250da9 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/META-INF/MANIFEST.MF
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Export-Package: org.eclipse.papyrus.design.profile.architecture,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.feature/feature.xml b/extraplugins/design/org.eclipse.papyrus.design.profile.feature/feature.xml
index 3e4bcd20d89..326f176c619 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.feature/feature.xml
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.design.profile.feature" label="Profile for software architecture design" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.design.profile.feature" label="Profile for software architecture design" provider-name="%providerName" version="1.1.0.qualifier">

 

    <description url="http://www.example.com/description">

       This feature provide utility to design software applications.

diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.core.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.core.prefs
index 11f6e462df7..e5766923962 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,281 @@
-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

+eclipse.preferences.version=1
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0
+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=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0
+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=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+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=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=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=false
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
+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=150
+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=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+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_at_end_of_file_if_missing=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=do not 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_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_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=do not 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=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not 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=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not 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=do not 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=true
+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=200
+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=0
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
+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/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..b5f980cae55
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+formatter_profile=_Zero blank Papyrus Formatter Profile CDM
+formatter_settings_version=12
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/META-INF/MANIFEST.MF b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/META-INF/MANIFEST.MF
index afff8ea3ed3..a68cda381b6 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/META-INF/MANIFEST.MF
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/META-INF/MANIFEST.MF
@@ -1,24 +1,22 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.dd.dc.provider,

- org.eclipse.papyrus.dd.dg.provider,

- org.eclipse.papyrus.dd.di.provider,

- org.eclipse.papyrus.dd.edit

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

- org.eclipse.papyrus.dd;bundle-version="1.0.1";visibility:=reexport,

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

- org.eclipse.papyrus.dd.edit;bundle-version="1.0.1";visibility:=reexport,

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

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

- org.eclipse.uml2.common.edit;visibility:=reexport

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.dd.edit.DDEditPlugin$Implementat

- ion

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

-

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.dd.edit;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.dd.edit.DDEditPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: org.eclipse.papyrus.dd.dc.provider,
+ org.eclipse.papyrus.dd.dg.provider,
+ org.eclipse.papyrus.dd.di.provider,
+ org.eclipse.papyrus.dd.edit
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.dd;visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.eclipse.papyrus.dd.edit;visibility:=reexport,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.uml2.common.edit;visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Canvas.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Canvas.gif
index 0f1a66a3248..0f1a66a3248 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Canvas.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Canvas.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Circle.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Circle.gif
index d9a8b0c6560..d9a8b0c6560 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Circle.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Circle.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_ClipPath.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_ClipPath.gif
index 2f72c3abb0f..2f72c3abb0f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_ClipPath.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_ClipPath.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Ellipse.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Ellipse.gif
index df2b32dc2d7..df2b32dc2d7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Ellipse.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Ellipse.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Group.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Group.gif
index bfcb3a1d04c..bfcb3a1d04c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Group.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Group.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Image.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Image.gif
index 0ec54208f65..0ec54208f65 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Image.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Image.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Line.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Line.gif
index 0131b567575..0131b567575 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Line.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Line.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_LinearGradient.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_LinearGradient.gif
index c128024445b..c128024445b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_LinearGradient.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_LinearGradient.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Marker.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Marker.gif
index 6b00e675037..6b00e675037 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Marker.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Marker.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Path.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Path.gif
index e03542c865b..e03542c865b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Path.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Path.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Pattern.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Pattern.gif
index 258ef9873e7..258ef9873e7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Pattern.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Pattern.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Polygon.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Polygon.gif
index 51bab8f637e..51bab8f637e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Polygon.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Polygon.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Polyline.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Polyline.gif
index dfb9f6a21cf..dfb9f6a21cf 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Polyline.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Polyline.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_RadialGradient.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_RadialGradient.gif
index 0fae0b12c2a..0fae0b12c2a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_RadialGradient.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_RadialGradient.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Rectangle.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Rectangle.gif
index c525027841f..c525027841f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Rectangle.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Rectangle.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_RootCanvas.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_RootCanvas.gif
index a75fd205d20..a75fd205d20 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_RootCanvas.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_RootCanvas.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Text.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Text.gif
index dad75922595..dad75922595 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Text.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Text.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Use.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Use.gif
index 258ef9873e7..258ef9873e7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_defnition_Use.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDefinitions_definition_Use.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateText_position_Point.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateText_bounds_Bounds.gif
index 527759b7ded..63feef5ec0a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateText_position_Point.gif
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateText_bounds_Bounds.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.properties b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.properties
index 8adaa8c5620..df5d4522438 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.properties
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.properties
@@ -272,3 +272,5 @@ _UI_Text_anchor_feature = Anchor
 _UI_TextAnchor_start_literal = start
 _UI_TextAnchor_middle_literal = middle
 _UI_TextAnchor_end_literal = end
+_UI_Text_bounds_feature = Bounds
+_UI_Definitions_definition_feature = Definition
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/BoundsItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/BoundsItemProvider.java
index 983e1ec9933..f6094025c74 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/BoundsItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/BoundsItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -27,8 +29,10 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.Bounds;
 import org.eclipse.papyrus.dd.dc.DCPackage;
+
 import org.eclipse.papyrus.dd.edit.DDEditPlugin;
 
 /**
@@ -58,7 +62,7 @@ public class BoundsItemProvider extends ItemProviderAdapter implements IEditingD
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addXPropertyDescriptor(object);
 			addYPropertyDescriptor(object);
@@ -76,8 +80,7 @@ public class BoundsItemProvider extends ItemProviderAdapter implements IEditingD
 	 * @generated
 	 */
 	protected void addXPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Bounds_x_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Bounds_x_feature", "_UI_Bounds_type"), DCPackage.Literals.BOUNDS__X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Bounds_x_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Bounds_x_feature", "_UI_Bounds_type"), DCPackage.Literals.BOUNDS__X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -88,8 +91,7 @@ public class BoundsItemProvider extends ItemProviderAdapter implements IEditingD
 	 * @generated
 	 */
 	protected void addYPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Bounds_y_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Bounds_y_feature", "_UI_Bounds_type"), DCPackage.Literals.BOUNDS__Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Bounds_y_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Bounds_y_feature", "_UI_Bounds_type"), DCPackage.Literals.BOUNDS__Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -99,8 +101,7 @@ public class BoundsItemProvider extends ItemProviderAdapter implements IEditingD
 	 * @generated
 	 */
 	protected void addWidthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Bounds_width_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Bounds_width_feature", "_UI_Bounds_type"), DCPackage.Literals.BOUNDS__WIDTH, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Bounds_width_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Bounds_width_feature", "_UI_Bounds_type"), DCPackage.Literals.BOUNDS__WIDTH, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -110,8 +111,7 @@ public class BoundsItemProvider extends ItemProviderAdapter implements IEditingD
 	 * @generated
 	 */
 	protected void addHeightPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Bounds_height_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Bounds_height_feature", "_UI_Bounds_type"), DCPackage.Literals.BOUNDS__HEIGHT, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Bounds_height_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Bounds_height_feature", "_UI_Bounds_type"), DCPackage.Literals.BOUNDS__HEIGHT, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -133,7 +133,7 @@ public class BoundsItemProvider extends ItemProviderAdapter implements IEditingD
 	 */
 	@Override
 	public String getText(Object object) {
-		Bounds bounds = (Bounds) object;
+		Bounds bounds = (Bounds)object;
 		return getString("_UI_Bounds_type") + " " + bounds.getX() + ", " + bounds.getY() + ", " + bounds.getWidth() + ", " + bounds.getHeight();
 	}
 
@@ -148,7 +148,7 @@ public class BoundsItemProvider extends ItemProviderAdapter implements IEditingD
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Bounds.class)) {
+		switch(notification.getFeatureID(Bounds.class)) {
 		case DCPackage.BOUNDS__X:
 		case DCPackage.BOUNDS__Y:
 		case DCPackage.BOUNDS__WIDTH:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DCItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DCItemProviderAdapterFactory.java
index 4764a31e476..bd778f4c9f5 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DCItemProviderAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DCItemProviderAdapterFactory.java
@@ -17,6 +17,7 @@ import java.util.Collection;
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.Notifier;
+
 import org.eclipse.emf.edit.provider.ChangeNotifier;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -28,6 +29,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
 import org.eclipse.papyrus.dd.dc.util.DCAdapterFactory;
 
 /**
@@ -98,7 +100,7 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createPointAdapter() {
-		if (pointItemProvider == null) {
+		if(pointItemProvider == null) {
 			pointItemProvider = new PointItemProvider(this);
 		}
 		return pointItemProvider;
@@ -120,7 +122,7 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createDimensionAdapter() {
-		if (dimensionItemProvider == null) {
+		if(dimensionItemProvider == null) {
 			dimensionItemProvider = new DimensionItemProvider(this);
 		}
 		return dimensionItemProvider;
@@ -143,7 +145,7 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createBoundsAdapter() {
-		if (boundsItemProvider == null) {
+		if(boundsItemProvider == null) {
 			boundsItemProvider = new BoundsItemProvider(this);
 		}
 		return boundsItemProvider;
@@ -199,9 +201,9 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements Co
 	 */
 	@Override
 	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
+		if(isFactoryForType(type)) {
 			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
+			if(!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
@@ -239,7 +241,7 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements Co
 	@Override
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
-		if (parentAdapterFactory != null) {
+		if(parentAdapterFactory != null) {
 			parentAdapterFactory.fireNotifyChanged(notification);
 		}
 	}
@@ -252,13 +254,13 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements Co
 	 */
 	@Override
 	public void dispose() {
-		if (pointItemProvider != null) {
+		if(pointItemProvider != null) {
 			pointItemProvider.dispose();
 		}
-		if (dimensionItemProvider != null) {
+		if(dimensionItemProvider != null) {
 			dimensionItemProvider.dispose();
 		}
-		if (boundsItemProvider != null) {
+		if(boundsItemProvider != null) {
 			boundsItemProvider.dispose();
 		}
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java
index ce36891ce09..546ace9d7e7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -27,8 +29,10 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCPackage;
 import org.eclipse.papyrus.dd.dc.Dimension;
+
 import org.eclipse.papyrus.dd.edit.DDEditPlugin;
 
 /**
@@ -58,7 +62,7 @@ public class DimensionItemProvider extends ItemProviderAdapter implements IEditi
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addWidthPropertyDescriptor(object);
 			addHeightPropertyDescriptor(object);
@@ -73,8 +77,7 @@ public class DimensionItemProvider extends ItemProviderAdapter implements IEditi
 	 * @generated
 	 */
 	protected void addWidthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Dimension_width_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Dimension_width_feature", "_UI_Dimension_type"), DCPackage.Literals.DIMENSION__WIDTH, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Dimension_width_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Dimension_width_feature", "_UI_Dimension_type"), DCPackage.Literals.DIMENSION__WIDTH, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -84,8 +87,7 @@ public class DimensionItemProvider extends ItemProviderAdapter implements IEditi
 	 * @generated
 	 */
 	protected void addHeightPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Dimension_height_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Dimension_height_feature", "_UI_Dimension_type"), DCPackage.Literals.DIMENSION__HEIGHT, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Dimension_height_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Dimension_height_feature", "_UI_Dimension_type"), DCPackage.Literals.DIMENSION__HEIGHT, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -107,7 +109,7 @@ public class DimensionItemProvider extends ItemProviderAdapter implements IEditi
 	 */
 	@Override
 	public String getText(Object object) {
-		Dimension dimension = (Dimension) object;
+		Dimension dimension = (Dimension)object;
 		return getString("_UI_Dimension_type") + " " + dimension.getWidth() + ", " + dimension.getHeight();
 	}
 
@@ -122,7 +124,7 @@ public class DimensionItemProvider extends ItemProviderAdapter implements IEditi
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Dimension.class)) {
+		switch(notification.getFeatureID(Dimension.class)) {
 		case DCPackage.DIMENSION__WIDTH:
 		case DCPackage.DIMENSION__HEIGHT:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/PointItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/PointItemProvider.java
index 65c1d557d03..83c79ea44e5 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/PointItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/PointItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -27,8 +29,10 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCPackage;
 import org.eclipse.papyrus.dd.dc.Point;
+
 import org.eclipse.papyrus.dd.edit.DDEditPlugin;
 
 /**
@@ -58,7 +62,7 @@ public class PointItemProvider extends ItemProviderAdapter implements IEditingDo
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addXPropertyDescriptor(object);
 			addYPropertyDescriptor(object);
@@ -74,8 +78,7 @@ public class PointItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addXPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Point_x_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Point_x_feature", "_UI_Point_type"), DCPackage.Literals.POINT__X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Point_x_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Point_x_feature", "_UI_Point_type"), DCPackage.Literals.POINT__X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -86,8 +89,7 @@ public class PointItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addYPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Point_y_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Point_y_feature", "_UI_Point_type"), DCPackage.Literals.POINT__Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Point_y_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Point_y_feature", "_UI_Point_type"), DCPackage.Literals.POINT__Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -109,7 +111,7 @@ public class PointItemProvider extends ItemProviderAdapter implements IEditingDo
 	 */
 	@Override
 	public String getText(Object object) {
-		Point point = (Point) object;
+		Point point = (Point)object;
 		return getString("_UI_Point_type") + " " + point.getX() + ", " + point.getY();
 	}
 
@@ -124,7 +126,7 @@ public class PointItemProvider extends ItemProviderAdapter implements IEditingDo
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Point.class)) {
+		switch(notification.getFeatureID(Point.class)) {
 		case DCPackage.POINT__X:
 		case DCPackage.POINT__Y:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java
index 074690c794d..d73a09b47a8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java
@@ -13,7 +13,6 @@ package org.eclipse.papyrus.dd.dg.provider;
 
 import java.util.Collection;
 import java.util.List;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -57,14 +56,15 @@ public class CanvasItemProvider extends GroupItemProvider implements IEditingDom
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -72,7 +72,7 @@ public class CanvasItemProvider extends GroupItemProvider implements IEditingDom
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.CANVAS__BOUNDS);
 		}
@@ -111,7 +111,7 @@ public class CanvasItemProvider extends GroupItemProvider implements IEditingDom
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Canvas) object).getId();
+		String label = ((Canvas)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_Canvas_type") : getString("_UI_Canvas_type") + " " + label;
 	}
 
@@ -126,7 +126,7 @@ public class CanvasItemProvider extends GroupItemProvider implements IEditingDom
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Canvas.class)) {
+		switch(notification.getFeatureID(Canvas.class)) {
 		case DGPackage.CANVAS__BOUNDS:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java
index ddf4c8213e6..d0c5251a4a3 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -28,7 +30,9 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
+
 import org.eclipse.papyrus.dd.dg.Circle;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 
@@ -59,7 +63,7 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addRadiusPropertyDescriptor(object);
 		}
@@ -73,12 +77,12 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
 	 * @generated
 	 */
 	protected void addRadiusPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Circle_radius_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Circle_radius_feature", "_UI_Circle_type"), DGPackage.Literals.CIRCLE__RADIUS, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Circle_radius_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Circle_radius_feature", "_UI_Circle_type"), DGPackage.Literals.CIRCLE__RADIUS, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -86,7 +90,7 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.CIRCLE__CENTER);
 		}
@@ -125,7 +129,7 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Circle) object).getId();
+		String label = ((Circle)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_Circle_type") : getString("_UI_Circle_type") + " " + label;
 	}
 
@@ -140,7 +144,7 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Circle.class)) {
+		switch(notification.getFeatureID(Circle.class)) {
 		case DGPackage.CIRCLE__RADIUS:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java
index 0607b976607..f027c41ad4b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java
@@ -16,6 +16,7 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -24,6 +25,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
 import org.eclipse.papyrus.dd.dg.ClipPath;
 
 /**
@@ -53,7 +55,7 @@ public class ClipPathItemProvider extends GroupItemProvider implements IEditingD
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
@@ -79,7 +81,7 @@ public class ClipPathItemProvider extends GroupItemProvider implements IEditingD
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((ClipPath) object).getId();
+		String label = ((ClipPath)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_ClipPath_type") : getString("_UI_ClipPath_type") + " " + label;
 	}
 
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java
index dc7fc69fbe8..a2efe4b72e3 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java
@@ -16,6 +16,7 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -24,6 +25,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
 import org.eclipse.papyrus.dd.dg.ClosePath;
 
 /**
@@ -53,7 +55,7 @@ public class ClosePathItemProvider extends PathCommandItemProvider implements IE
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
@@ -79,7 +81,7 @@ public class ClosePathItemProvider extends PathCommandItemProvider implements IE
 	 */
 	@Override
 	public String getText(Object object) {
-		ClosePath closePath = (ClosePath) object;
+		ClosePath closePath = (ClosePath)object;
 		return getString("_UI_ClosePath_type") + " " + closePath.isRelative();
 	}
 
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java
index 2e75778a9d6..1e92cb4f43c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -26,7 +28,9 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
+
 import org.eclipse.papyrus.dd.dg.CubicCurveTo;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 
@@ -57,14 +61,15 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -72,7 +77,7 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL);
 			childrenFeatures.add(DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL);
@@ -113,7 +118,7 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
 	 */
 	@Override
 	public String getText(Object object) {
-		CubicCurveTo cubicCurveTo = (CubicCurveTo) object;
+		CubicCurveTo cubicCurveTo = (CubicCurveTo)object;
 		return getString("_UI_CubicCurveTo_type") + " " + cubicCurveTo.isRelative();
 	}
 
@@ -128,7 +133,7 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(CubicCurveTo.class)) {
+		switch(notification.getFeatureID(CubicCurveTo.class)) {
 		case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
 		case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
 		case DGPackage.CUBIC_CURVE_TO__POINT:
@@ -164,8 +169,8 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
 		Object childFeature = feature;
 		Object childObject = child;
 		boolean qualify = childFeature == DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL || childFeature == DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL || childFeature == DGPackage.Literals.CUBIC_CURVE_TO__POINT;
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		if(qualify) {
+			return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java
index 4fab4ac1631..525c0a2f06d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java
@@ -17,6 +17,7 @@ import java.util.Collection;
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.Notifier;
+
 import org.eclipse.emf.edit.provider.ChangeNotifier;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -30,6 +31,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
 import org.eclipse.papyrus.dd.dg.util.DGAdapterFactory;
 
 /**
@@ -102,7 +104,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createCanvasAdapter() {
-		if (canvasItemProvider == null) {
+		if(canvasItemProvider == null) {
 			canvasItemProvider = new CanvasItemProvider(this);
 		}
 		return canvasItemProvider;
@@ -125,7 +127,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createGroupAdapter() {
-		if (groupItemProvider == null) {
+		if(groupItemProvider == null) {
 			groupItemProvider = new GroupItemProvider(this);
 		}
 		return groupItemProvider;
@@ -148,7 +150,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createMoveToAdapter() {
-		if (moveToItemProvider == null) {
+		if(moveToItemProvider == null) {
 			moveToItemProvider = new MoveToItemProvider(this);
 		}
 		return moveToItemProvider;
@@ -171,7 +173,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createClipPathAdapter() {
-		if (clipPathItemProvider == null) {
+		if(clipPathItemProvider == null) {
 			clipPathItemProvider = new ClipPathItemProvider(this);
 		}
 		return clipPathItemProvider;
@@ -194,7 +196,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createStyleAdapter() {
-		if (styleItemProvider == null) {
+		if(styleItemProvider == null) {
 			styleItemProvider = new StyleItemProvider(this);
 		}
 		return styleItemProvider;
@@ -217,7 +219,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createPaintAdapter() {
-		if (paintItemProvider == null) {
+		if(paintItemProvider == null) {
 			paintItemProvider = new PaintItemProvider(this);
 		}
 		return paintItemProvider;
@@ -240,7 +242,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createCircleAdapter() {
-		if (circleItemProvider == null) {
+		if(circleItemProvider == null) {
 			circleItemProvider = new CircleItemProvider(this);
 		}
 		return circleItemProvider;
@@ -262,7 +264,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createClosePathAdapter() {
-		if (closePathItemProvider == null) {
+		if(closePathItemProvider == null) {
 			closePathItemProvider = new ClosePathItemProvider(this);
 		}
 		return closePathItemProvider;
@@ -285,7 +287,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createCubicCurveToAdapter() {
-		if (cubicCurveToItemProvider == null) {
+		if(cubicCurveToItemProvider == null) {
 			cubicCurveToItemProvider = new CubicCurveToItemProvider(this);
 		}
 		return cubicCurveToItemProvider;
@@ -308,7 +310,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createDefinitionsAdapter() {
-		if (definitionsItemProvider == null) {
+		if(definitionsItemProvider == null) {
 			definitionsItemProvider = new DefinitionsItemProvider(this);
 		}
 		return definitionsItemProvider;
@@ -331,7 +333,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createStyleSheetAdapter() {
-		if (styleSheetItemProvider == null) {
+		if(styleSheetItemProvider == null) {
 			styleSheetItemProvider = new StyleSheetItemProvider(this);
 		}
 		return styleSheetItemProvider;
@@ -353,7 +355,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createStyleRuleAdapter() {
-		if (styleRuleItemProvider == null) {
+		if(styleRuleItemProvider == null) {
 			styleRuleItemProvider = new StyleRuleItemProvider(this);
 		}
 		return styleRuleItemProvider;
@@ -376,7 +378,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createStyleSelectorAdapter() {
-		if (styleSelectorItemProvider == null) {
+		if(styleSelectorItemProvider == null) {
 			styleSelectorItemProvider = new StyleSelectorItemProvider(this);
 		}
 		return styleSelectorItemProvider;
@@ -399,7 +401,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createEllipseAdapter() {
-		if (ellipseItemProvider == null) {
+		if(ellipseItemProvider == null) {
 			ellipseItemProvider = new EllipseItemProvider(this);
 		}
 		return ellipseItemProvider;
@@ -422,7 +424,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createEllipticalArcToAdapter() {
-		if (ellipticalArcToItemProvider == null) {
+		if(ellipticalArcToItemProvider == null) {
 			ellipticalArcToItemProvider = new EllipticalArcToItemProvider(this);
 		}
 		return ellipticalArcToItemProvider;
@@ -445,7 +447,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createQuadraticCurveToAdapter() {
-		if (quadraticCurveToItemProvider == null) {
+		if(quadraticCurveToItemProvider == null) {
 			quadraticCurveToItemProvider = new QuadraticCurveToItemProvider(this);
 		}
 		return quadraticCurveToItemProvider;
@@ -468,7 +470,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createGradientStopAdapter() {
-		if (gradientStopItemProvider == null) {
+		if(gradientStopItemProvider == null) {
 			gradientStopItemProvider = new GradientStopItemProvider(this);
 		}
 		return gradientStopItemProvider;
@@ -491,7 +493,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createImageAdapter() {
-		if (imageItemProvider == null) {
+		if(imageItemProvider == null) {
 			imageItemProvider = new ImageItemProvider(this);
 		}
 		return imageItemProvider;
@@ -514,7 +516,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createLineAdapter() {
-		if (lineItemProvider == null) {
+		if(lineItemProvider == null) {
 			lineItemProvider = new LineItemProvider(this);
 		}
 		return lineItemProvider;
@@ -537,7 +539,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createMarkerAdapter() {
-		if (markerItemProvider == null) {
+		if(markerItemProvider == null) {
 			markerItemProvider = new MarkerItemProvider(this);
 		}
 		return markerItemProvider;
@@ -560,7 +562,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createLinearGradientAdapter() {
-		if (linearGradientItemProvider == null) {
+		if(linearGradientItemProvider == null) {
 			linearGradientItemProvider = new LinearGradientItemProvider(this);
 		}
 		return linearGradientItemProvider;
@@ -583,7 +585,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createLineToAdapter() {
-		if (lineToItemProvider == null) {
+		if(lineToItemProvider == null) {
 			lineToItemProvider = new LineToItemProvider(this);
 		}
 		return lineToItemProvider;
@@ -606,7 +608,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createMatrixAdapter() {
-		if (matrixItemProvider == null) {
+		if(matrixItemProvider == null) {
 			matrixItemProvider = new MatrixItemProvider(this);
 		}
 		return matrixItemProvider;
@@ -629,7 +631,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createPathAdapter() {
-		if (pathItemProvider == null) {
+		if(pathItemProvider == null) {
 			pathItemProvider = new PathItemProvider(this);
 		}
 		return pathItemProvider;
@@ -652,7 +654,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createPatternAdapter() {
-		if (patternItemProvider == null) {
+		if(patternItemProvider == null) {
 			patternItemProvider = new PatternItemProvider(this);
 		}
 		return patternItemProvider;
@@ -675,7 +677,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createPolygonAdapter() {
-		if (polygonItemProvider == null) {
+		if(polygonItemProvider == null) {
 			polygonItemProvider = new PolygonItemProvider(this);
 		}
 		return polygonItemProvider;
@@ -698,7 +700,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createPolylineAdapter() {
-		if (polylineItemProvider == null) {
+		if(polylineItemProvider == null) {
 			polylineItemProvider = new PolylineItemProvider(this);
 		}
 		return polylineItemProvider;
@@ -721,7 +723,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createRadialGradientAdapter() {
-		if (radialGradientItemProvider == null) {
+		if(radialGradientItemProvider == null) {
 			radialGradientItemProvider = new RadialGradientItemProvider(this);
 		}
 		return radialGradientItemProvider;
@@ -743,7 +745,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createRectangleAdapter() {
-		if (rectangleItemProvider == null) {
+		if(rectangleItemProvider == null) {
 			rectangleItemProvider = new RectangleItemProvider(this);
 		}
 		return rectangleItemProvider;
@@ -766,7 +768,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createRootCanvasAdapter() {
-		if (rootCanvasItemProvider == null) {
+		if(rootCanvasItemProvider == null) {
 			rootCanvasItemProvider = new RootCanvasItemProvider(this);
 		}
 		return rootCanvasItemProvider;
@@ -789,7 +791,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createRotateAdapter() {
-		if (rotateItemProvider == null) {
+		if(rotateItemProvider == null) {
 			rotateItemProvider = new RotateItemProvider(this);
 		}
 		return rotateItemProvider;
@@ -812,7 +814,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createScaleAdapter() {
-		if (scaleItemProvider == null) {
+		if(scaleItemProvider == null) {
 			scaleItemProvider = new ScaleItemProvider(this);
 		}
 		return scaleItemProvider;
@@ -835,7 +837,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createSkewAdapter() {
-		if (skewItemProvider == null) {
+		if(skewItemProvider == null) {
 			skewItemProvider = new SkewItemProvider(this);
 		}
 		return skewItemProvider;
@@ -858,7 +860,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createTextAdapter() {
-		if (textItemProvider == null) {
+		if(textItemProvider == null) {
 			textItemProvider = new TextItemProvider(this);
 		}
 		return textItemProvider;
@@ -880,7 +882,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createTranslateAdapter() {
-		if (translateItemProvider == null) {
+		if(translateItemProvider == null) {
 			translateItemProvider = new TranslateItemProvider(this);
 		}
 		return translateItemProvider;
@@ -903,7 +905,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createUseAdapter() {
-		if (useItemProvider == null) {
+		if(useItemProvider == null) {
 			useItemProvider = new UseItemProvider(this);
 		}
 		return useItemProvider;
@@ -959,9 +961,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
+		if(isFactoryForType(type)) {
 			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
+			if(!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
@@ -999,7 +1001,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	@Override
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
-		if (parentAdapterFactory != null) {
+		if(parentAdapterFactory != null) {
 			parentAdapterFactory.fireNotifyChanged(notification);
 		}
 	}
@@ -1012,112 +1014,112 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public void dispose() {
-		if (canvasItemProvider != null) {
+		if(canvasItemProvider != null) {
 			canvasItemProvider.dispose();
 		}
-		if (groupItemProvider != null) {
+		if(groupItemProvider != null) {
 			groupItemProvider.dispose();
 		}
-		if (moveToItemProvider != null) {
+		if(moveToItemProvider != null) {
 			moveToItemProvider.dispose();
 		}
-		if (clipPathItemProvider != null) {
+		if(clipPathItemProvider != null) {
 			clipPathItemProvider.dispose();
 		}
-		if (styleItemProvider != null) {
+		if(styleItemProvider != null) {
 			styleItemProvider.dispose();
 		}
-		if (paintItemProvider != null) {
+		if(paintItemProvider != null) {
 			paintItemProvider.dispose();
 		}
-		if (circleItemProvider != null) {
+		if(circleItemProvider != null) {
 			circleItemProvider.dispose();
 		}
-		if (closePathItemProvider != null) {
+		if(closePathItemProvider != null) {
 			closePathItemProvider.dispose();
 		}
-		if (cubicCurveToItemProvider != null) {
+		if(cubicCurveToItemProvider != null) {
 			cubicCurveToItemProvider.dispose();
 		}
-		if (definitionsItemProvider != null) {
+		if(definitionsItemProvider != null) {
 			definitionsItemProvider.dispose();
 		}
-		if (styleSheetItemProvider != null) {
+		if(styleSheetItemProvider != null) {
 			styleSheetItemProvider.dispose();
 		}
-		if (styleRuleItemProvider != null) {
+		if(styleRuleItemProvider != null) {
 			styleRuleItemProvider.dispose();
 		}
-		if (styleSelectorItemProvider != null) {
+		if(styleSelectorItemProvider != null) {
 			styleSelectorItemProvider.dispose();
 		}
-		if (ellipseItemProvider != null) {
+		if(ellipseItemProvider != null) {
 			ellipseItemProvider.dispose();
 		}
-		if (ellipticalArcToItemProvider != null) {
+		if(ellipticalArcToItemProvider != null) {
 			ellipticalArcToItemProvider.dispose();
 		}
-		if (quadraticCurveToItemProvider != null) {
+		if(quadraticCurveToItemProvider != null) {
 			quadraticCurveToItemProvider.dispose();
 		}
-		if (gradientStopItemProvider != null) {
+		if(gradientStopItemProvider != null) {
 			gradientStopItemProvider.dispose();
 		}
-		if (imageItemProvider != null) {
+		if(imageItemProvider != null) {
 			imageItemProvider.dispose();
 		}
-		if (lineItemProvider != null) {
+		if(lineItemProvider != null) {
 			lineItemProvider.dispose();
 		}
-		if (markerItemProvider != null) {
+		if(markerItemProvider != null) {
 			markerItemProvider.dispose();
 		}
-		if (linearGradientItemProvider != null) {
+		if(linearGradientItemProvider != null) {
 			linearGradientItemProvider.dispose();
 		}
-		if (lineToItemProvider != null) {
+		if(lineToItemProvider != null) {
 			lineToItemProvider.dispose();
 		}
-		if (matrixItemProvider != null) {
+		if(matrixItemProvider != null) {
 			matrixItemProvider.dispose();
 		}
-		if (pathItemProvider != null) {
+		if(pathItemProvider != null) {
 			pathItemProvider.dispose();
 		}
-		if (patternItemProvider != null) {
+		if(patternItemProvider != null) {
 			patternItemProvider.dispose();
 		}
-		if (polygonItemProvider != null) {
+		if(polygonItemProvider != null) {
 			polygonItemProvider.dispose();
 		}
-		if (polylineItemProvider != null) {
+		if(polylineItemProvider != null) {
 			polylineItemProvider.dispose();
 		}
-		if (radialGradientItemProvider != null) {
+		if(radialGradientItemProvider != null) {
 			radialGradientItemProvider.dispose();
 		}
-		if (rectangleItemProvider != null) {
+		if(rectangleItemProvider != null) {
 			rectangleItemProvider.dispose();
 		}
-		if (rootCanvasItemProvider != null) {
+		if(rootCanvasItemProvider != null) {
 			rootCanvasItemProvider.dispose();
 		}
-		if (rotateItemProvider != null) {
+		if(rotateItemProvider != null) {
 			rotateItemProvider.dispose();
 		}
-		if (scaleItemProvider != null) {
+		if(scaleItemProvider != null) {
 			scaleItemProvider.dispose();
 		}
-		if (skewItemProvider != null) {
+		if(skewItemProvider != null) {
 			skewItemProvider.dispose();
 		}
-		if (textItemProvider != null) {
+		if(textItemProvider != null) {
 			textItemProvider.dispose();
 		}
-		if (translateItemProvider != null) {
+		if(translateItemProvider != null) {
 			translateItemProvider.dispose();
 		}
-		if (useItemProvider != null) {
+		if(useItemProvider != null) {
 			useItemProvider.dispose();
 		}
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java
index eab7b7dc639..c9422976e24 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -29,8 +31,10 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Definition;
+
 import org.eclipse.papyrus.dd.edit.DDEditPlugin;
 
 /**
@@ -60,7 +64,7 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements IEdit
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addIdPropertyDescriptor(object);
 		}
@@ -75,8 +79,7 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements IEdit
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Definition_id_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Definition_id_feature", "_UI_Definition_type"), DGPackage.Literals.DEFINITION__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Definition_id_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Definition_id_feature", "_UI_Definition_type"), DGPackage.Literals.DEFINITION__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -88,7 +91,7 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements IEdit
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Definition) object).getId();
+		String label = ((Definition)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_Definition_type") : getString("_UI_Definition_type") + " " + label;
 	}
 
@@ -103,7 +106,7 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements IEdit
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Definition.class)) {
+		switch(notification.getFeatureID(Definition.class)) {
 		case DGPackage.DEFINITION__ID:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java
index 401ff888e46..b862ce2b3a1 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java
@@ -16,8 +16,11 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -28,9 +31,11 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dg.DGFactory;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Definitions;
+
 import org.eclipse.papyrus.dd.edit.DDEditPlugin;
 
 /**
@@ -60,14 +65,15 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements IEdi
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -75,9 +81,9 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements IEdi
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(DGPackage.Literals.DEFINITIONS__DEFNITION);
+			childrenFeatures.add(DGPackage.Literals.DEFINITIONS__DEFINITION);
 			childrenFeatures.add(DGPackage.Literals.DEFINITIONS__STYLE_SHEET);
 		}
 		return childrenFeatures;
@@ -129,8 +135,8 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements IEdi
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Definitions.class)) {
-		case DGPackage.DEFINITIONS__DEFNITION:
+		switch(notification.getFeatureID(Definitions.class)) {
+		case DGPackage.DEFINITIONS__DEFINITION:
 		case DGPackage.DEFINITIONS__STYLE_SHEET:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
@@ -148,24 +154,24 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements IEdi
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createGroup()));
-		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createCanvas()));
-		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createClipPath()));
-		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createCircle()));
-		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createEllipse()));
-		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createImage()));
-		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createLine()));
-		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createMarker()));
-		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createLinearGradient()));
-		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createPath()));
-		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createPattern()));
-		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createPolygon()));
-		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createPolyline()));
-		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createRadialGradient()));
-		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createRectangle()));
-		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createRootCanvas()));
-		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createText()));
-		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createUse()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createGroup()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createCanvas()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createClipPath()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createCircle()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createEllipse()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createImage()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createLine()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createMarker()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createLinearGradient()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createPath()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createPattern()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createPolygon()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createPolyline()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createRadialGradient()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createRectangle()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createRootCanvas()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createText()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createUse()));
 		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__STYLE_SHEET, DGFactory.eINSTANCE.createStyleSheet()));
 	}
 
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java
index a29e61953a9..7cc335418ad 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -26,7 +28,9 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Ellipse;
 
@@ -57,14 +61,15 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -72,7 +77,7 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.ELLIPSE__CENTER);
 			childrenFeatures.add(DGPackage.Literals.ELLIPSE__RADII);
@@ -112,7 +117,7 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Ellipse) object).getId();
+		String label = ((Ellipse)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_Ellipse_type") : getString("_UI_Ellipse_type") + " " + label;
 	}
 
@@ -127,7 +132,7 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Ellipse.class)) {
+		switch(notification.getFeatureID(Ellipse.class)) {
 		case DGPackage.ELLIPSE__CENTER:
 		case DGPackage.ELLIPSE__RADII:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java
index d5815e9d89d..b2e4f76cc32 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -28,7 +30,9 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.EllipticalArcTo;
 
@@ -59,7 +63,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider impleme
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addRotationPropertyDescriptor(object);
 			addIsLargeArcPropertyDescriptor(object);
@@ -75,8 +79,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider impleme
 	 * @generated
 	 */
 	protected void addRotationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_EllipticalArcTo_rotation_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_rotation_feature", "_UI_EllipticalArcTo_type"), DGPackage.Literals.ELLIPTICAL_ARC_TO__ROTATION, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_EllipticalArcTo_rotation_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_rotation_feature", "_UI_EllipticalArcTo_type"), DGPackage.Literals.ELLIPTICAL_ARC_TO__ROTATION, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -86,9 +89,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider impleme
 	 * @generated
 	 */
 	protected void addIsLargeArcPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_EllipticalArcTo_isLargeArc_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_isLargeArc_feature", "_UI_EllipticalArcTo_type"), DGPackage.Literals.ELLIPTICAL_ARC_TO__IS_LARGE_ARC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null,
-				null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_EllipticalArcTo_isLargeArc_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_isLargeArc_feature", "_UI_EllipticalArcTo_type"), DGPackage.Literals.ELLIPTICAL_ARC_TO__IS_LARGE_ARC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -98,12 +99,12 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider impleme
 	 * @generated
 	 */
 	protected void addIsSweepPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_EllipticalArcTo_isSweep_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_isSweep_feature", "_UI_EllipticalArcTo_type"), DGPackage.Literals.ELLIPTICAL_ARC_TO__IS_SWEEP, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_EllipticalArcTo_isSweep_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_isSweep_feature", "_UI_EllipticalArcTo_type"), DGPackage.Literals.ELLIPTICAL_ARC_TO__IS_SWEEP, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -111,7 +112,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider impleme
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.ELLIPTICAL_ARC_TO__RADII);
 			childrenFeatures.add(DGPackage.Literals.ELLIPTICAL_ARC_TO__POINT);
@@ -152,7 +153,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider impleme
 	 */
 	@Override
 	public String getText(Object object) {
-		EllipticalArcTo ellipticalArcTo = (EllipticalArcTo) object;
+		EllipticalArcTo ellipticalArcTo = (EllipticalArcTo)object;
 		return getString("_UI_EllipticalArcTo_type") + " " + ellipticalArcTo.isRelative();
 	}
 
@@ -167,7 +168,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider impleme
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(EllipticalArcTo.class)) {
+		switch(notification.getFeatureID(EllipticalArcTo.class)) {
 		case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
 		case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
 		case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java
index dd72fbbc60c..57bc0b8f735 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java
@@ -13,7 +13,6 @@ package org.eclipse.papyrus.dd.dg.provider;
 
 import java.util.Collection;
 import java.util.List;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -57,14 +56,15 @@ public class GradientItemProvider extends PaintServerItemProvider implements IEd
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -72,7 +72,7 @@ public class GradientItemProvider extends PaintServerItemProvider implements IEd
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.GRADIENT__STOP);
 		}
@@ -100,7 +100,7 @@ public class GradientItemProvider extends PaintServerItemProvider implements IEd
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Gradient) object).getId();
+		String label = ((Gradient)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_Gradient_type") : getString("_UI_Gradient_type") + " " + label;
 	}
 
@@ -115,7 +115,7 @@ public class GradientItemProvider extends PaintServerItemProvider implements IEd
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Gradient.class)) {
+		switch(notification.getFeatureID(Gradient.class)) {
 		case DGPackage.GRADIENT__STOP:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java
index f0210465dd6..9299073ebfd 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java
@@ -12,12 +12,15 @@
 package org.eclipse.papyrus.dd.dg.provider;
 
 import java.awt.Color;
+
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -30,8 +33,10 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.GradientStop;
+
 import org.eclipse.papyrus.dd.edit.DDEditPlugin;
 
 /**
@@ -61,7 +66,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements IEd
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addColorPropertyDescriptor(object);
 			addOffsetPropertyDescriptor(object);
@@ -77,8 +82,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements IEd
 	 * @generated
 	 */
 	protected void addColorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GradientStop_color_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_color_feature", "_UI_GradientStop_type"), DGPackage.Literals.GRADIENT_STOP__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GradientStop_color_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_color_feature", "_UI_GradientStop_type"), DGPackage.Literals.GRADIENT_STOP__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -88,8 +92,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements IEd
 	 * @generated
 	 */
 	protected void addOffsetPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GradientStop_offset_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_offset_feature", "_UI_GradientStop_type"), DGPackage.Literals.GRADIENT_STOP__OFFSET, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GradientStop_offset_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_offset_feature", "_UI_GradientStop_type"), DGPackage.Literals.GRADIENT_STOP__OFFSET, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -99,8 +102,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements IEd
 	 * @generated
 	 */
 	protected void addOpacityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GradientStop_opacity_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_opacity_feature", "_UI_GradientStop_type"), DGPackage.Literals.GRADIENT_STOP__OPACITY, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GradientStop_opacity_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_opacity_feature", "_UI_GradientStop_type"), DGPackage.Literals.GRADIENT_STOP__OPACITY, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -123,7 +125,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements IEd
 	 */
 	@Override
 	public String getText(Object object) {
-		Color labelValue = ((GradientStop) object).getColor();
+		Color labelValue = ((GradientStop)object).getColor();
 		String label = labelValue == null ? null : labelValue.toString();
 		return label == null || label.length() == 0 ? getString("_UI_GradientStop_type") : getString("_UI_GradientStop_type") + " " + label;
 	}
@@ -139,7 +141,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements IEd
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(GradientStop.class)) {
+		switch(notification.getFeatureID(GradientStop.class)) {
 		case DGPackage.GRADIENT_STOP__COLOR:
 		case DGPackage.GRADIENT_STOP__OFFSET:
 		case DGPackage.GRADIENT_STOP__OPACITY:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java
index 7baa45c9ace..3421e88e0e5 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java
@@ -58,7 +58,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider impleme
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addClipPathPropertyDescriptor(object);
 			addClassPropertyDescriptor(object);
@@ -74,8 +74,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider impleme
 	 * @generated
 	 */
 	protected void addClipPathPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GraphicalElement_clipPath_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_clipPath_feature", "_UI_GraphicalElement_type"), DGPackage.Literals.GRAPHICAL_ELEMENT__CLIP_PATH, true, false, true, null, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GraphicalElement_clipPath_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_clipPath_feature", "_UI_GraphicalElement_type"), DGPackage.Literals.GRAPHICAL_ELEMENT__CLIP_PATH, true, false, true, null, null, null));
 	}
 
 	/**
@@ -85,8 +84,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider impleme
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GraphicalElement_class_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_class_feature", "_UI_GraphicalElement_type"), DGPackage.Literals.GRAPHICAL_ELEMENT__CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GraphicalElement_class_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_class_feature", "_UI_GraphicalElement_type"), DGPackage.Literals.GRAPHICAL_ELEMENT__CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -97,13 +95,12 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider impleme
 	 * @generated
 	 */
 	protected void addLayoutDataPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GraphicalElement_layoutData_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_layoutData_feature", "_UI_GraphicalElement_type"), DGPackage.Literals.GRAPHICAL_ELEMENT__LAYOUT_DATA, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-				null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GraphicalElement_layoutData_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_layoutData_feature", "_UI_GraphicalElement_type"), DGPackage.Literals.GRAPHICAL_ELEMENT__LAYOUT_DATA, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -111,7 +108,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider impleme
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.GRAPHICAL_ELEMENT__STYLE);
 			childrenFeatures.add(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM);
@@ -140,7 +137,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider impleme
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = getLabel((GraphicalElement) object);
+		String label = getLabel((GraphicalElement)object);
 		return label == null || label.length() == 0 ? getString("_UI_GraphicalElement_type") : getString("_UI_GraphicalElement_type") + " " + label;
 	}
 
@@ -148,16 +145,16 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider impleme
 	 * Get the label of the given graphical element
 	 *
 	 * @param element
-	 *            The graphical element
+	 *        The graphical element
 	 * @return String label of the graphical element
 	 */
 	protected String getLabel(GraphicalElement element) {
 		String label = "";
-		if (element.getId() != null) {
+		if(element.getId() != null) {
 			label += "id=" + element.getId();
 		}
-		if (!element.getClasses().isEmpty()) {
-			if (label.length() > 0) {
+		if(!element.getClasses().isEmpty()) {
+			if(label.length() > 0) {
 				label += ", ";
 			}
 			label += joinString("class", element.getClasses(), ",");
@@ -167,7 +164,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider impleme
 
 	private String joinString(String key, Collection<String> values, String sep) {
 		String s = "";
-		for (String v : values) {
+		for(String v : values) {
 			s += (s.length() > 0) ? ", " + v : v;
 		}
 		return key + "=" + s;
@@ -184,7 +181,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider impleme
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(GraphicalElement.class)) {
+		switch(notification.getFeatureID(GraphicalElement.class)) {
 		case DGPackage.GRAPHICAL_ELEMENT__CLASS:
 		case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java
index 0fb67d18452..af3a328cf61 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -28,6 +30,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dg.DGFactory;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Group;
@@ -59,7 +62,7 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements I
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addLayoutPropertyDescriptor(object);
 		}
@@ -74,12 +77,12 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements I
 	 * @generated
 	 */
 	protected void addLayoutPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Group_layout_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Group_layout_feature", "_UI_Group_type"), DGPackage.Literals.GROUP__LAYOUT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Group_layout_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Group_layout_feature", "_UI_Group_type"), DGPackage.Literals.GROUP__LAYOUT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -87,7 +90,7 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements I
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.GROUP__MEMBER);
 		}
@@ -126,7 +129,7 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements I
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = getLabel((Group) object);
+		String label = getLabel((Group)object);
 		return label == null || label.length() == 0 ? getString("_UI_Group_type") : getString("_UI_Group_type") + " " + label;
 	}
 
@@ -141,7 +144,7 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements I
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Group.class)) {
+		switch(notification.getFeatureID(Group.class)) {
 		case DGPackage.GROUP__LAYOUT:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java
index 21796e8c30f..da886cf32af 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -28,7 +30,9 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Image;
 
@@ -59,7 +63,7 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements I
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addSourcePropertyDescriptor(object);
 			addIsAspectRatioPreservedPropertyDescriptor(object);
@@ -74,8 +78,7 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements I
 	 * @generated
 	 */
 	protected void addSourcePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Image_source_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Image_source_feature", "_UI_Image_type"), DGPackage.Literals.IMAGE__SOURCE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Image_source_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Image_source_feature", "_UI_Image_type"), DGPackage.Literals.IMAGE__SOURCE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -85,12 +88,12 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements I
 	 * @generated
 	 */
 	protected void addIsAspectRatioPreservedPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Image_isAspectRatioPreserved_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Image_isAspectRatioPreserved_feature", "_UI_Image_type"), DGPackage.Literals.IMAGE__IS_ASPECT_RATIO_PRESERVED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Image_isAspectRatioPreserved_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Image_isAspectRatioPreserved_feature", "_UI_Image_type"), DGPackage.Literals.IMAGE__IS_ASPECT_RATIO_PRESERVED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -98,7 +101,7 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements I
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.IMAGE__BOUNDS);
 		}
@@ -137,7 +140,7 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements I
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Image) object).getId();
+		String label = ((Image)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_Image_type") : getString("_UI_Image_type") + " " + label;
 	}
 
@@ -152,7 +155,7 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements I
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Image.class)) {
+		switch(notification.getFeatureID(Image.class)) {
 		case DGPackage.IMAGE__SOURCE:
 		case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java
index 5034bd870f1..d774b67915f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -26,7 +28,9 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Line;
 
@@ -57,14 +61,15 @@ public class LineItemProvider extends MarkedElementItemProvider implements IEdit
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -72,7 +77,7 @@ public class LineItemProvider extends MarkedElementItemProvider implements IEdit
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.LINE__START);
 			childrenFeatures.add(DGPackage.Literals.LINE__END);
@@ -112,7 +117,7 @@ public class LineItemProvider extends MarkedElementItemProvider implements IEdit
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Line) object).getId();
+		String label = ((Line)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_Line_type") : getString("_UI_Line_type") + " " + label;
 	}
 
@@ -127,7 +132,7 @@ public class LineItemProvider extends MarkedElementItemProvider implements IEdit
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Line.class)) {
+		switch(notification.getFeatureID(Line.class)) {
 		case DGPackage.LINE__START:
 		case DGPackage.LINE__END:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
@@ -161,8 +166,8 @@ public class LineItemProvider extends MarkedElementItemProvider implements IEdit
 		Object childFeature = feature;
 		Object childObject = child;
 		boolean qualify = childFeature == DGPackage.Literals.LINE__START || childFeature == DGPackage.Literals.LINE__END;
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		if(qualify) {
+			return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java
index 8f22bb620f5..f67bf88b210 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -26,7 +28,9 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.LineTo;
 
@@ -57,14 +61,15 @@ public class LineToItemProvider extends PathCommandItemProvider implements IEdit
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -72,7 +77,7 @@ public class LineToItemProvider extends PathCommandItemProvider implements IEdit
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.LINE_TO__POINT);
 		}
@@ -111,7 +116,7 @@ public class LineToItemProvider extends PathCommandItemProvider implements IEdit
 	 */
 	@Override
 	public String getText(Object object) {
-		LineTo lineTo = (LineTo) object;
+		LineTo lineTo = (LineTo)object;
 		return getString("_UI_LineTo_type") + " " + lineTo.isRelative();
 	}
 
@@ -126,7 +131,7 @@ public class LineToItemProvider extends PathCommandItemProvider implements IEdit
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(LineTo.class)) {
+		switch(notification.getFeatureID(LineTo.class)) {
 		case DGPackage.LINE_TO__POINT:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java
index 64545d5edb5..5f86fd32d3f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java
@@ -13,7 +13,6 @@ package org.eclipse.papyrus.dd.dg.provider;
 
 import java.util.Collection;
 import java.util.List;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -57,14 +56,15 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -72,7 +72,7 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.LINEAR_GRADIENT__START);
 			childrenFeatures.add(DGPackage.Literals.LINEAR_GRADIENT__END);
@@ -113,7 +113,7 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((LinearGradient) object).getId();
+		String label = ((LinearGradient)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_LinearGradient_type") : getString("_UI_LinearGradient_type") + " " + label;
 	}
 
@@ -128,7 +128,7 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(LinearGradient.class)) {
+		switch(notification.getFeatureID(LinearGradient.class)) {
 		case DGPackage.LINEAR_GRADIENT__START:
 		case DGPackage.LINEAR_GRADIENT__END:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
@@ -162,8 +162,8 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
 		Object childFeature = feature;
 		Object childObject = child;
 		boolean qualify = childFeature == DGPackage.Literals.LINEAR_GRADIENT__START || childFeature == DGPackage.Literals.LINEAR_GRADIENT__END;
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		if(qualify) {
+			return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java
index 8826109e9ac..7d79f6a6e18 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java
@@ -16,6 +16,7 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -25,6 +26,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.MarkedElement;
 
@@ -55,7 +57,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider impl
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addEndMarkerPropertyDescriptor(object);
 			addMidMarkerPropertyDescriptor(object);
@@ -71,8 +73,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider impl
 	 * @generated
 	 */
 	protected void addEndMarkerPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MarkedElement_endMarker_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_endMarker_feature", "_UI_MarkedElement_type"), DGPackage.Literals.MARKED_ELEMENT__END_MARKER, true, false, true, null, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MarkedElement_endMarker_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_endMarker_feature", "_UI_MarkedElement_type"), DGPackage.Literals.MARKED_ELEMENT__END_MARKER, true, false, true, null, null, null));
 	}
 
 	/**
@@ -82,8 +83,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider impl
 	 * @generated
 	 */
 	protected void addMidMarkerPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MarkedElement_midMarker_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_midMarker_feature", "_UI_MarkedElement_type"), DGPackage.Literals.MARKED_ELEMENT__MID_MARKER, true, false, true, null, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MarkedElement_midMarker_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_midMarker_feature", "_UI_MarkedElement_type"), DGPackage.Literals.MARKED_ELEMENT__MID_MARKER, true, false, true, null, null, null));
 	}
 
 	/**
@@ -93,8 +93,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider impl
 	 * @generated
 	 */
 	protected void addStartMarkerPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MarkedElement_startMarker_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_startMarker_feature", "_UI_MarkedElement_type"), DGPackage.Literals.MARKED_ELEMENT__START_MARKER, true, false, true, null, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MarkedElement_startMarker_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_startMarker_feature", "_UI_MarkedElement_type"), DGPackage.Literals.MARKED_ELEMENT__START_MARKER, true, false, true, null, null, null));
 	}
 
 	/**
@@ -106,7 +105,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider impl
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((MarkedElement) object).getId();
+		String label = ((MarkedElement)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_MarkedElement_type") : getString("_UI_MarkedElement_type") + " " + label;
 	}
 
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java
index 4e6d4b36b0a..da25267e1c7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -26,7 +28,9 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Marker;
 
@@ -57,14 +61,15 @@ public class MarkerItemProvider extends GroupItemProvider implements IEditingDom
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -72,7 +77,7 @@ public class MarkerItemProvider extends GroupItemProvider implements IEditingDom
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.MARKER__SIZE);
 			childrenFeatures.add(DGPackage.Literals.MARKER__REFERENCE);
@@ -112,7 +117,7 @@ public class MarkerItemProvider extends GroupItemProvider implements IEditingDom
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Marker) object).getId();
+		String label = ((Marker)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_Marker_type") : getString("_UI_Marker_type") + " " + label;
 	}
 
@@ -127,7 +132,7 @@ public class MarkerItemProvider extends GroupItemProvider implements IEditingDom
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Marker.class)) {
+		switch(notification.getFeatureID(Marker.class)) {
 		case DGPackage.MARKER__SIZE:
 		case DGPackage.MARKER__REFERENCE:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java
index 536f93e59ce..cc635b37052 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java
@@ -16,6 +16,7 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -27,6 +28,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Matrix;
 
@@ -57,7 +59,7 @@ public class MatrixItemProvider extends TransformItemProvider implements IEditin
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addAPropertyDescriptor(object);
 			addBPropertyDescriptor(object);
@@ -77,8 +79,7 @@ public class MatrixItemProvider extends TransformItemProvider implements IEditin
 	 * @generated
 	 */
 	protected void addAPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_a_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Matrix_a_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__A, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_a_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_a_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__A, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -89,8 +90,7 @@ public class MatrixItemProvider extends TransformItemProvider implements IEditin
 	 * @generated
 	 */
 	protected void addBPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_b_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Matrix_b_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__B, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_b_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_b_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__B, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -101,8 +101,7 @@ public class MatrixItemProvider extends TransformItemProvider implements IEditin
 	 * @generated
 	 */
 	protected void addCPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_c_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Matrix_c_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__C, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_c_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_c_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__C, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -113,8 +112,7 @@ public class MatrixItemProvider extends TransformItemProvider implements IEditin
 	 * @generated
 	 */
 	protected void addDPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_d_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Matrix_d_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__D, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_d_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_d_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__D, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -125,8 +123,7 @@ public class MatrixItemProvider extends TransformItemProvider implements IEditin
 	 * @generated
 	 */
 	protected void addEPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_e_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Matrix_e_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__E, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_e_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_e_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__E, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -137,8 +134,7 @@ public class MatrixItemProvider extends TransformItemProvider implements IEditin
 	 * @generated
 	 */
 	protected void addFPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_f_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Matrix_f_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__F, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_f_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_f_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__F, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -161,7 +157,7 @@ public class MatrixItemProvider extends TransformItemProvider implements IEditin
 	 */
 	@Override
 	public String getText(Object object) {
-		Matrix matrix = (Matrix) object;
+		Matrix matrix = (Matrix)object;
 		return getString("_UI_Matrix_type") + " " + matrix.getA();
 	}
 
@@ -176,7 +172,7 @@ public class MatrixItemProvider extends TransformItemProvider implements IEditin
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Matrix.class)) {
+		switch(notification.getFeatureID(Matrix.class)) {
 		case DGPackage.MATRIX__A:
 		case DGPackage.MATRIX__B:
 		case DGPackage.MATRIX__C:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java
index a0493f978e1..7a452720b4f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -26,7 +28,9 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.MoveTo;
 
@@ -57,14 +61,15 @@ public class MoveToItemProvider extends PathCommandItemProvider implements IEdit
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -72,7 +77,7 @@ public class MoveToItemProvider extends PathCommandItemProvider implements IEdit
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.MOVE_TO__POINT);
 		}
@@ -111,7 +116,7 @@ public class MoveToItemProvider extends PathCommandItemProvider implements IEdit
 	 */
 	@Override
 	public String getText(Object object) {
-		MoveTo moveTo = (MoveTo) object;
+		MoveTo moveTo = (MoveTo)object;
 		return getString("_UI_MoveTo_type") + " " + moveTo.isRelative();
 	}
 
@@ -126,7 +131,7 @@ public class MoveToItemProvider extends PathCommandItemProvider implements IEdit
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(MoveTo.class)) {
+		switch(notification.getFeatureID(MoveTo.class)) {
 		case DGPackage.MOVE_TO__POINT:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java
index 2809a9399e8..eb47124fcb1 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java
@@ -12,12 +12,15 @@
 package org.eclipse.papyrus.dd.dg.provider;
 
 import java.awt.Color;
+
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -30,8 +33,10 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Paint;
+
 import org.eclipse.papyrus.dd.edit.DDEditPlugin;
 
 /**
@@ -61,7 +66,7 @@ public class PaintItemProvider extends ItemProviderAdapter implements IEditingDo
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addColorPropertyDescriptor(object);
 			addPaintServerPropertyDescriptor(object);
@@ -76,8 +81,7 @@ public class PaintItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addColorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Paint_color_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Paint_color_feature", "_UI_Paint_type"), DGPackage.Literals.PAINT__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Paint_color_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Paint_color_feature", "_UI_Paint_type"), DGPackage.Literals.PAINT__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -87,8 +91,7 @@ public class PaintItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addPaintServerPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Paint_paintServer_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Paint_paintServer_feature", "_UI_Paint_type"), DGPackage.Literals.PAINT__PAINT_SERVER, true, false, true, null, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Paint_paintServer_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Paint_paintServer_feature", "_UI_Paint_type"), DGPackage.Literals.PAINT__PAINT_SERVER, true, false, true, null, null, null));
 	}
 
 	/**
@@ -111,7 +114,7 @@ public class PaintItemProvider extends ItemProviderAdapter implements IEditingDo
 	 */
 	@Override
 	public String getText(Object object) {
-		Color labelValue = ((Paint) object).getColor();
+		Color labelValue = ((Paint)object).getColor();
 		String label = labelValue == null ? null : labelValue.toString();
 		return label == null || label.length() == 0 ? getString("_UI_Paint_type") : getString("_UI_Paint_type") + " " + label;
 	}
@@ -127,7 +130,7 @@ public class PaintItemProvider extends ItemProviderAdapter implements IEditingDo
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Paint.class)) {
+		switch(notification.getFeatureID(Paint.class)) {
 		case DGPackage.PAINT__COLOR:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java
index d9120757a29..b8ba9a9ca8b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -26,6 +28,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dg.DGFactory;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.PaintServer;
@@ -57,14 +60,15 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements I
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -72,7 +76,7 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements I
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.PAINT_SERVER__TRANSFORM);
 		}
@@ -100,7 +104,7 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements I
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((PaintServer) object).getId();
+		String label = ((PaintServer)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_PaintServer_type") : getString("_UI_PaintServer_type") + " " + label;
 	}
 
@@ -115,7 +119,7 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements I
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(PaintServer.class)) {
+		switch(notification.getFeatureID(PaintServer.class)) {
 		case DGPackage.PAINT_SERVER__TRANSFORM:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java
index 564ed12a14a..45f01fd11d6 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -29,8 +31,10 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.PathCommand;
+
 import org.eclipse.papyrus.dd.edit.DDEditPlugin;
 
 /**
@@ -60,7 +64,7 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements IEdi
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addIsRelativePropertyDescriptor(object);
 		}
@@ -74,8 +78,7 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements IEdi
 	 * @generated
 	 */
 	protected void addIsRelativePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_PathCommand_isRelative_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_PathCommand_isRelative_feature", "_UI_PathCommand_type"), DGPackage.Literals.PATH_COMMAND__IS_RELATIVE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_PathCommand_isRelative_feature"), getString("_UI_PropertyDescriptor_description", "_UI_PathCommand_isRelative_feature", "_UI_PathCommand_type"), DGPackage.Literals.PATH_COMMAND__IS_RELATIVE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -87,7 +90,7 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements IEdi
 	 */
 	@Override
 	public String getText(Object object) {
-		PathCommand pathCommand = (PathCommand) object;
+		PathCommand pathCommand = (PathCommand)object;
 		return getString("_UI_PathCommand_type") + " " + pathCommand.isRelative();
 	}
 
@@ -102,7 +105,7 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements IEdi
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(PathCommand.class)) {
+		switch(notification.getFeatureID(PathCommand.class)) {
 		case DGPackage.PATH_COMMAND__IS_RELATIVE:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java
index f3b6cd8166a..3a25413ec3b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -26,6 +28,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dg.DGFactory;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Path;
@@ -57,14 +60,15 @@ public class PathItemProvider extends MarkedElementItemProvider implements IEdit
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -72,7 +76,7 @@ public class PathItemProvider extends MarkedElementItemProvider implements IEdit
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.PATH__COMMAND);
 		}
@@ -111,7 +115,7 @@ public class PathItemProvider extends MarkedElementItemProvider implements IEdit
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Path) object).getId();
+		String label = ((Path)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_Path_type") : getString("_UI_Path_type") + " " + label;
 	}
 
@@ -126,7 +130,7 @@ public class PathItemProvider extends MarkedElementItemProvider implements IEdit
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Path.class)) {
+		switch(notification.getFeatureID(Path.class)) {
 		case DGPackage.PATH__COMMAND:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java
index eeb4d7b1f0c..3d8d0b36677 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -26,7 +28,9 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
+
 import org.eclipse.papyrus.dd.dg.DGFactory;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Pattern;
@@ -58,14 +62,15 @@ public class PatternItemProvider extends PaintServerItemProvider implements IEdi
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -73,7 +78,7 @@ public class PatternItemProvider extends PaintServerItemProvider implements IEdi
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.PATTERN__BOUNDS);
 			childrenFeatures.add(DGPackage.Literals.PATTERN__TILE);
@@ -113,7 +118,7 @@ public class PatternItemProvider extends PaintServerItemProvider implements IEdi
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Pattern) object).getId();
+		String label = ((Pattern)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_Pattern_type") : getString("_UI_Pattern_type") + " " + label;
 	}
 
@@ -128,7 +133,7 @@ public class PatternItemProvider extends PaintServerItemProvider implements IEdi
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Pattern.class)) {
+		switch(notification.getFeatureID(Pattern.class)) {
 		case DGPackage.PATTERN__BOUNDS:
 		case DGPackage.PATTERN__TILE:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java
index dae4c16ad9a..7de11e6f552 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -26,7 +28,9 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Polygon;
 
@@ -57,14 +61,15 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements IE
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -72,7 +77,7 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements IE
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.POLYGON__POINT);
 		}
@@ -111,7 +116,7 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements IE
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Polygon) object).getId();
+		String label = ((Polygon)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_Polygon_type") : getString("_UI_Polygon_type") + " " + label;
 	}
 
@@ -126,7 +131,7 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements IE
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Polygon.class)) {
+		switch(notification.getFeatureID(Polygon.class)) {
 		case DGPackage.POLYGON__POINT:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java
index 34ca08c49ae..f354d09bd63 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -26,7 +28,9 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Polyline;
 
@@ -57,14 +61,15 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements I
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -72,7 +77,7 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements I
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.POLYLINE__POINT);
 		}
@@ -111,7 +116,7 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements I
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Polyline) object).getId();
+		String label = ((Polyline)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_Polyline_type") : getString("_UI_Polyline_type") + " " + label;
 	}
 
@@ -126,7 +131,7 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements I
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Polyline.class)) {
+		switch(notification.getFeatureID(Polyline.class)) {
 		case DGPackage.POLYLINE__POINT:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java
index 49727d5bdb0..29872e25422 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -26,7 +28,9 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.QuadraticCurveTo;
 
@@ -56,14 +60,15 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider implem
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -71,7 +76,7 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider implem
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL);
 			childrenFeatures.add(DGPackage.Literals.QUADRATIC_CURVE_TO__POINT);
@@ -112,7 +117,7 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider implem
 	 */
 	@Override
 	public String getText(Object object) {
-		QuadraticCurveTo quadraticCurveTo = (QuadraticCurveTo) object;
+		QuadraticCurveTo quadraticCurveTo = (QuadraticCurveTo)object;
 		return getString("_UI_QuadraticCurveTo_type") + " " + quadraticCurveTo.isRelative();
 	}
 
@@ -127,7 +132,7 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider implem
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(QuadraticCurveTo.class)) {
+		switch(notification.getFeatureID(QuadraticCurveTo.class)) {
 		case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
 		case DGPackage.QUADRATIC_CURVE_TO__POINT:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
@@ -161,8 +166,8 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider implem
 		Object childFeature = feature;
 		Object childObject = child;
 		boolean qualify = childFeature == DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL || childFeature == DGPackage.Literals.QUADRATIC_CURVE_TO__POINT;
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		if(qualify) {
+			return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java
index f807d4425b0..70b3d1be845 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java
@@ -16,6 +16,7 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
@@ -28,6 +29,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.RadialGradient;
@@ -59,7 +61,7 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addRadiusPropertyDescriptor(object);
 		}
@@ -73,12 +75,12 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
 	 * @generated
 	 */
 	protected void addRadiusPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RadialGradient_radius_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_RadialGradient_radius_feature", "_UI_RadialGradient_type"), DGPackage.Literals.RADIAL_GRADIENT__RADIUS, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RadialGradient_radius_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RadialGradient_radius_feature", "_UI_RadialGradient_type"), DGPackage.Literals.RADIAL_GRADIENT__RADIUS, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -86,7 +88,7 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.RADIAL_GRADIENT__CENTER);
 			childrenFeatures.add(DGPackage.Literals.RADIAL_GRADIENT__FOCUS);
@@ -127,7 +129,7 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((RadialGradient) object).getId();
+		String label = ((RadialGradient)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_RadialGradient_type") : getString("_UI_RadialGradient_type") + " " + label;
 	}
 
@@ -142,7 +144,7 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(RadialGradient.class)) {
+		switch(notification.getFeatureID(RadialGradient.class)) {
 		case DGPackage.RADIAL_GRADIENT__RADIUS:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
@@ -179,8 +181,8 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
 		Object childFeature = feature;
 		Object childObject = child;
 		boolean qualify = childFeature == DGPackage.Literals.RADIAL_GRADIENT__CENTER || childFeature == DGPackage.Literals.RADIAL_GRADIENT__FOCUS;
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		if(qualify) {
+			return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java
index a5a8ab39434..9398a0a7dfd 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -28,7 +30,9 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Rectangle;
 
@@ -59,7 +63,7 @@ public class RectangleItemProvider extends GraphicalElementItemProvider implemen
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addCornerRadiusPropertyDescriptor(object);
 		}
@@ -73,12 +77,12 @@ public class RectangleItemProvider extends GraphicalElementItemProvider implemen
 	 * @generated
 	 */
 	protected void addCornerRadiusPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rectangle_cornerRadius_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Rectangle_cornerRadius_feature", "_UI_Rectangle_type"), DGPackage.Literals.RECTANGLE__CORNER_RADIUS, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rectangle_cornerRadius_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Rectangle_cornerRadius_feature", "_UI_Rectangle_type"), DGPackage.Literals.RECTANGLE__CORNER_RADIUS, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -86,7 +90,7 @@ public class RectangleItemProvider extends GraphicalElementItemProvider implemen
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.RECTANGLE__BOUNDS);
 		}
@@ -125,7 +129,7 @@ public class RectangleItemProvider extends GraphicalElementItemProvider implemen
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Rectangle) object).getId();
+		String label = ((Rectangle)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_Rectangle_type") : getString("_UI_Rectangle_type") + " " + label;
 	}
 
@@ -140,7 +144,7 @@ public class RectangleItemProvider extends GraphicalElementItemProvider implemen
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Rectangle.class)) {
+		switch(notification.getFeatureID(Rectangle.class)) {
 		case DGPackage.RECTANGLE__CORNER_RADIUS:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java
index 995aaada5b5..5444450ed87 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -28,6 +30,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dg.DGFactory;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.RootCanvas;
@@ -59,7 +62,7 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements IEditi
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addBackgroundColorPropertyDescriptor(object);
 			addExternalStyleSheetPropertyDescriptor(object);
@@ -75,8 +78,7 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements IEditi
 	 * @generated
 	 */
 	protected void addBackgroundColorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RootCanvas_backgroundColor_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_backgroundColor_feature", "_UI_RootCanvas_type"), DGPackage.Literals.ROOT_CANVAS__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RootCanvas_backgroundColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_backgroundColor_feature", "_UI_RootCanvas_type"), DGPackage.Literals.ROOT_CANVAS__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -86,8 +88,7 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements IEditi
 	 * @generated
 	 */
 	protected void addExternalStyleSheetPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RootCanvas_externalStyleSheet_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_externalStyleSheet_feature", "_UI_RootCanvas_type"), DGPackage.Literals.ROOT_CANVAS__EXTERNAL_STYLE_SHEET, true, false, true, null, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RootCanvas_externalStyleSheet_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_externalStyleSheet_feature", "_UI_RootCanvas_type"), DGPackage.Literals.ROOT_CANVAS__EXTERNAL_STYLE_SHEET, true, false, true, null, null, null));
 	}
 
 	/**
@@ -98,12 +99,12 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements IEditi
 	 * @generated
 	 */
 	protected void addScriptPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RootCanvas_script_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_script_feature", "_UI_RootCanvas_type"), DGPackage.Literals.ROOT_CANVAS__SCRIPT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RootCanvas_script_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_script_feature", "_UI_RootCanvas_type"), DGPackage.Literals.ROOT_CANVAS__SCRIPT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -111,7 +112,7 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements IEditi
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.ROOT_CANVAS__DEFINITIONS);
 		}
@@ -150,7 +151,7 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements IEditi
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((RootCanvas) object).getId();
+		String label = ((RootCanvas)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_RootCanvas_type") : getString("_UI_RootCanvas_type") + " " + label;
 	}
 
@@ -165,7 +166,7 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements IEditi
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(RootCanvas.class)) {
+		switch(notification.getFeatureID(RootCanvas.class)) {
 		case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
 		case DGPackage.ROOT_CANVAS__SCRIPT:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java
index 640ab6426be..82b23b067ec 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -28,7 +30,9 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Rotate;
 
@@ -59,7 +63,7 @@ public class RotateItemProvider extends TransformItemProvider implements IEditin
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addAnglePropertyDescriptor(object);
 		}
@@ -73,12 +77,12 @@ public class RotateItemProvider extends TransformItemProvider implements IEditin
 	 * @generated
 	 */
 	protected void addAnglePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rotate_angle_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Rotate_angle_feature", "_UI_Rotate_type"), DGPackage.Literals.ROTATE__ANGLE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rotate_angle_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Rotate_angle_feature", "_UI_Rotate_type"), DGPackage.Literals.ROTATE__ANGLE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -86,7 +90,7 @@ public class RotateItemProvider extends TransformItemProvider implements IEditin
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.ROTATE__CENTER);
 		}
@@ -125,7 +129,7 @@ public class RotateItemProvider extends TransformItemProvider implements IEditin
 	 */
 	@Override
 	public String getText(Object object) {
-		Rotate rotate = (Rotate) object;
+		Rotate rotate = (Rotate)object;
 		return getString("_UI_Rotate_type") + " " + rotate.getAngle();
 	}
 
@@ -140,7 +144,7 @@ public class RotateItemProvider extends TransformItemProvider implements IEditin
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Rotate.class)) {
+		switch(notification.getFeatureID(Rotate.class)) {
 		case DGPackage.ROTATE__ANGLE:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java
index 7b5e34cee65..5d1b4f8ede6 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java
@@ -16,6 +16,7 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -27,6 +28,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Scale;
 
@@ -57,7 +59,7 @@ public class ScaleItemProvider extends TransformItemProvider implements IEditing
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addFactorXPropertyDescriptor(object);
 			addFactorYPropertyDescriptor(object);
@@ -72,8 +74,7 @@ public class ScaleItemProvider extends TransformItemProvider implements IEditing
 	 * @generated
 	 */
 	protected void addFactorXPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Scale_factorX_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Scale_factorX_feature", "_UI_Scale_type"), DGPackage.Literals.SCALE__FACTOR_X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Scale_factorX_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Scale_factorX_feature", "_UI_Scale_type"), DGPackage.Literals.SCALE__FACTOR_X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -83,8 +84,7 @@ public class ScaleItemProvider extends TransformItemProvider implements IEditing
 	 * @generated
 	 */
 	protected void addFactorYPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Scale_factorY_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Scale_factorY_feature", "_UI_Scale_type"), DGPackage.Literals.SCALE__FACTOR_Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Scale_factorY_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Scale_factorY_feature", "_UI_Scale_type"), DGPackage.Literals.SCALE__FACTOR_Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -107,7 +107,7 @@ public class ScaleItemProvider extends TransformItemProvider implements IEditing
 	 */
 	@Override
 	public String getText(Object object) {
-		Scale scale = (Scale) object;
+		Scale scale = (Scale)object;
 		return getString("_UI_Scale_type") + " " + scale.getFactorX();
 	}
 
@@ -122,7 +122,7 @@ public class ScaleItemProvider extends TransformItemProvider implements IEditing
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Scale.class)) {
+		switch(notification.getFeatureID(Scale.class)) {
 		case DGPackage.SCALE__FACTOR_X:
 		case DGPackage.SCALE__FACTOR_Y:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java
index 5bbfe988f82..f7a09d2d58d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java
@@ -16,6 +16,7 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -27,6 +28,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Skew;
 
@@ -57,7 +59,7 @@ public class SkewItemProvider extends TransformItemProvider implements IEditingD
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addAngleXPropertyDescriptor(object);
 			addAngleYPropertyDescriptor(object);
@@ -72,8 +74,7 @@ public class SkewItemProvider extends TransformItemProvider implements IEditingD
 	 * @generated
 	 */
 	protected void addAngleXPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Skew_angleX_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Skew_angleX_feature", "_UI_Skew_type"), DGPackage.Literals.SKEW__ANGLE_X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Skew_angleX_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Skew_angleX_feature", "_UI_Skew_type"), DGPackage.Literals.SKEW__ANGLE_X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -83,8 +84,7 @@ public class SkewItemProvider extends TransformItemProvider implements IEditingD
 	 * @generated
 	 */
 	protected void addAngleYPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Skew_angleY_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Skew_angleY_feature", "_UI_Skew_type"), DGPackage.Literals.SKEW__ANGLE_Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Skew_angleY_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Skew_angleY_feature", "_UI_Skew_type"), DGPackage.Literals.SKEW__ANGLE_Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -107,7 +107,7 @@ public class SkewItemProvider extends TransformItemProvider implements IEditingD
 	 */
 	@Override
 	public String getText(Object object) {
-		Skew skew = (Skew) object;
+		Skew skew = (Skew)object;
 		return getString("_UI_Skew_type") + " " + skew.getAngleX();
 	}
 
@@ -122,7 +122,7 @@ public class SkewItemProvider extends TransformItemProvider implements IEditingD
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Skew.class)) {
+		switch(notification.getFeatureID(Skew.class)) {
 		case DGPackage.SKEW__ANGLE_X:
 		case DGPackage.SKEW__ANGLE_Y:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java
index 4ecc2f6b5ba..20ec6337737 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java
@@ -16,8 +16,11 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -30,9 +33,11 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dg.DGFactory;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Style;
+
 import org.eclipse.papyrus.dd.edit.DDEditPlugin;
 
 /**
@@ -62,7 +67,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addFillPropertyDescriptor(object);
 			addFillOpacityPropertyDescriptor(object);
@@ -87,8 +92,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addFillPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fill_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Style_fill_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FILL, true, false, false, null, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fill_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fill_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FILL, true, false, false, null, null, null));
 	}
 
 	/**
@@ -98,8 +102,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addFillOpacityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fillOpacity_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Style_fillOpacity_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FILL_OPACITY, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fillOpacity_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fillOpacity_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FILL_OPACITY, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -109,8 +112,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addStrokePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_stroke_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Style_stroke_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE, true, false, false, null, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_stroke_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_stroke_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE, true, false, false, null, null, null));
 	}
 
 	/**
@@ -120,8 +122,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addStrokeWidthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_strokeWidth_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeWidth_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE_WIDTH, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_strokeWidth_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeWidth_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE_WIDTH, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -131,8 +132,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addStrokeOpacityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_strokeOpacity_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeOpacity_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE_OPACITY, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_strokeOpacity_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeOpacity_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE_OPACITY, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -142,8 +142,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addStrokeDashLengthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_strokeDashLength_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeDashLength_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE_DASH_LENGTH, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_strokeDashLength_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeDashLength_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE_DASH_LENGTH, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -153,8 +152,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addFontSizePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontSize_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Style_fontSize_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontSize_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontSize_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -164,8 +162,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addFontNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontName_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Style_fontName_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontName_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontName_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -175,8 +172,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addFontItalicPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontItalic_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Style_fontItalic_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontItalic_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontItalic_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -186,8 +182,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addFontBoldPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontBold_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Style_fontBold_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontBold_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontBold_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -197,12 +192,12 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addFontDecorationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontDecoration_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Style_fontDecoration_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_DECORATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontDecoration_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontDecoration_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_DECORATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -210,7 +205,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.STYLE__FILL);
 			childrenFeatures.add(DGPackage.Literals.STYLE__STROKE);
@@ -250,7 +245,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Style) object).getFontName();
+		String label = ((Style)object).getFontName();
 		return label == null || label.length() == 0 ? getString("_UI_Style_type") : getString("_UI_Style_type") + " " + label;
 	}
 
@@ -265,7 +260,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Style.class)) {
+		switch(notification.getFeatureID(Style.class)) {
 		case DGPackage.STYLE__FILL_OPACITY:
 		case DGPackage.STYLE__STROKE_WIDTH:
 		case DGPackage.STYLE__STROKE_OPACITY:
@@ -310,8 +305,8 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 		Object childFeature = feature;
 		Object childObject = child;
 		boolean qualify = childFeature == DGPackage.Literals.STYLE__FILL || childFeature == DGPackage.Literals.STYLE__STROKE;
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		if(qualify) {
+			return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java
index 8709873c1df..e0bc9fba2a9 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java
@@ -16,8 +16,11 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -28,9 +31,11 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dg.DGFactory;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.StyleRule;
+
 import org.eclipse.papyrus.dd.edit.DDEditPlugin;
 
 /**
@@ -60,14 +65,15 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements IEditi
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -75,7 +81,7 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements IEditi
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.STYLE_RULE__SELECTOR);
 			childrenFeatures.add(DGPackage.Literals.STYLE_RULE__STYLE);
@@ -129,7 +135,7 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements IEditi
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(StyleRule.class)) {
+		switch(notification.getFeatureID(StyleRule.class)) {
 		case DGPackage.STYLE_RULE__SELECTOR:
 		case DGPackage.STYLE_RULE__STYLE:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java
index 04d2078d08f..e99d2c9df5e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -29,9 +31,11 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.ElementKind;
 import org.eclipse.papyrus.dd.dg.StyleSelector;
+
 import org.eclipse.papyrus.dd.edit.DDEditPlugin;
 
 /**
@@ -61,7 +65,7 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements IE
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addKindPropertyDescriptor(object);
 			addClassPropertyDescriptor(object);
@@ -77,8 +81,7 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements IE
 	 * @generated
 	 */
 	protected void addKindPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_StyleSelector_kind_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_StyleSelector_kind_feature", "_UI_StyleSelector_type"), DGPackage.Literals.STYLE_SELECTOR__KIND, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_StyleSelector_kind_feature"), getString("_UI_PropertyDescriptor_description", "_UI_StyleSelector_kind_feature", "_UI_StyleSelector_type"), DGPackage.Literals.STYLE_SELECTOR__KIND, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -88,8 +91,7 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements IE
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_StyleSelector_class_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_StyleSelector_class_feature", "_UI_StyleSelector_type"), DGPackage.Literals.STYLE_SELECTOR__CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_StyleSelector_class_feature"), getString("_UI_PropertyDescriptor_description", "_UI_StyleSelector_class_feature", "_UI_StyleSelector_type"), DGPackage.Literals.STYLE_SELECTOR__CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -112,7 +114,7 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements IE
 	 */
 	@Override
 	public String getText(Object object) {
-		ElementKind labelValue = ((StyleSelector) object).getKind();
+		ElementKind labelValue = ((StyleSelector)object).getKind();
 		String label = labelValue == null ? null : labelValue.toString();
 		return label == null || label.length() == 0 ? getString("_UI_StyleSelector_type") : getString("_UI_StyleSelector_type") + " " + label;
 	}
@@ -128,7 +130,7 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements IE
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(StyleSelector.class)) {
+		switch(notification.getFeatureID(StyleSelector.class)) {
 		case DGPackage.STYLE_SELECTOR__KIND:
 		case DGPackage.STYLE_SELECTOR__CLASS:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java
index a856d31f53f..955238c75ff 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java
@@ -16,8 +16,11 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -28,9 +31,11 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dg.DGFactory;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.StyleSheet;
+
 import org.eclipse.papyrus.dd.edit.DDEditPlugin;
 
 /**
@@ -60,14 +65,15 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements IEdit
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -75,7 +81,7 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements IEdit
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.STYLE_SHEET__RULE);
 		}
@@ -128,7 +134,7 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements IEdit
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(StyleSheet.class)) {
+		switch(notification.getFeatureID(StyleSheet.class)) {
 		case DGPackage.STYLE_SHEET__RULE:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java
index 24ba53368d3..035d7c93325 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -28,7 +30,9 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Text;
 
@@ -59,7 +63,7 @@ public class TextItemProvider extends GraphicalElementItemProvider implements IE
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addDataPropertyDescriptor(object);
 			addAnchorPropertyDescriptor(object);
@@ -75,8 +79,7 @@ public class TextItemProvider extends GraphicalElementItemProvider implements IE
 	 * @generated
 	 */
 	protected void addDataPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Text_data_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Text_data_feature", "_UI_Text_type"), DGPackage.Literals.TEXT__DATA, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Text_data_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Text_data_feature", "_UI_Text_type"), DGPackage.Literals.TEXT__DATA, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -87,12 +90,12 @@ public class TextItemProvider extends GraphicalElementItemProvider implements IE
 	 * @generated
 	 */
 	protected void addAnchorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Text_anchor_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Text_anchor_feature", "_UI_Text_type"), DGPackage.Literals.TEXT__ANCHOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Text_anchor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Text_anchor_feature", "_UI_Text_type"), DGPackage.Literals.TEXT__ANCHOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -100,9 +103,9 @@ public class TextItemProvider extends GraphicalElementItemProvider implements IE
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(DGPackage.Literals.TEXT__POSITION);
+			childrenFeatures.add(DGPackage.Literals.TEXT__BOUNDS);
 		}
 		return childrenFeatures;
 	}
@@ -139,7 +142,7 @@ public class TextItemProvider extends GraphicalElementItemProvider implements IE
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Text) object).getId();
+		String label = ((Text)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_Text_type") : getString("_UI_Text_type") + " " + label;
 	}
 
@@ -154,12 +157,12 @@ public class TextItemProvider extends GraphicalElementItemProvider implements IE
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Text.class)) {
+		switch(notification.getFeatureID(Text.class)) {
 		case DGPackage.TEXT__DATA:
 		case DGPackage.TEXT__ANCHOR:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
-		case DGPackage.TEXT__POSITION:
+		case DGPackage.TEXT__BOUNDS:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
 		}
@@ -176,6 +179,6 @@ public class TextItemProvider extends GraphicalElementItemProvider implements IE
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-		newChildDescriptors.add(createChildParameter(DGPackage.Literals.TEXT__POSITION, DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.TEXT__BOUNDS, DCFactory.eINSTANCE.createBounds()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java
index 41b7d40ad84..058fac78790 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -26,6 +28,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+
 import org.eclipse.papyrus.dd.edit.DDEditPlugin;
 
 /**
@@ -55,7 +58,7 @@ public class TransformItemProvider extends ItemProviderAdapter implements IEditi
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java
index 0d31128ab0e..b93d9540432 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java
@@ -16,6 +16,7 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -27,6 +28,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Translate;
 
@@ -57,7 +59,7 @@ public class TranslateItemProvider extends TransformItemProvider implements IEdi
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addDeltaXPropertyDescriptor(object);
 			addDeltaYPropertyDescriptor(object);
@@ -72,8 +74,7 @@ public class TranslateItemProvider extends TransformItemProvider implements IEdi
 	 * @generated
 	 */
 	protected void addDeltaXPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Translate_deltaX_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Translate_deltaX_feature", "_UI_Translate_type"), DGPackage.Literals.TRANSLATE__DELTA_X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Translate_deltaX_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Translate_deltaX_feature", "_UI_Translate_type"), DGPackage.Literals.TRANSLATE__DELTA_X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -83,8 +84,7 @@ public class TranslateItemProvider extends TransformItemProvider implements IEdi
 	 * @generated
 	 */
 	protected void addDeltaYPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Translate_deltaY_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Translate_deltaY_feature", "_UI_Translate_type"), DGPackage.Literals.TRANSLATE__DELTA_Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Translate_deltaY_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Translate_deltaY_feature", "_UI_Translate_type"), DGPackage.Literals.TRANSLATE__DELTA_Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -107,7 +107,7 @@ public class TranslateItemProvider extends TransformItemProvider implements IEdi
 	 */
 	@Override
 	public String getText(Object object) {
-		Translate translate = (Translate) object;
+		Translate translate = (Translate)object;
 		return getString("_UI_Translate_type") + " " + translate.getDeltaX();
 	}
 
@@ -122,7 +122,7 @@ public class TranslateItemProvider extends TransformItemProvider implements IEdi
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Translate.class)) {
+		switch(notification.getFeatureID(Translate.class)) {
 		case DGPackage.TRANSLATE__DELTA_X:
 		case DGPackage.TRANSLATE__DELTA_Y:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java
index 015d8bf6c86..6ec237471a2 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -27,7 +29,9 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Use;
 
@@ -57,7 +61,7 @@ public class UseItemProvider extends GraphicalElementItemProvider implements IEd
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addReferencedElementPropertyDescriptor(object);
 		}
@@ -71,12 +75,12 @@ public class UseItemProvider extends GraphicalElementItemProvider implements IEd
 	 * @generated
 	 */
 	protected void addReferencedElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Use_referencedElement_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Use_referencedElement_feature", "_UI_Use_type"), DGPackage.Literals.USE__REFERENCED_ELEMENT, true, false, true, null, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Use_referencedElement_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Use_referencedElement_feature", "_UI_Use_type"), DGPackage.Literals.USE__REFERENCED_ELEMENT, true, false, true, null, null, null));
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -84,7 +88,7 @@ public class UseItemProvider extends GraphicalElementItemProvider implements IEd
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.USE__BOUNDS);
 		}
@@ -123,7 +127,7 @@ public class UseItemProvider extends GraphicalElementItemProvider implements IEd
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Use) object).getId();
+		String label = ((Use)object).getId();
 		return label == null || label.length() == 0 ? getString("_UI_Use_type") : getString("_UI_Use_type") + " " + label;
 	}
 
@@ -138,7 +142,7 @@ public class UseItemProvider extends GraphicalElementItemProvider implements IEd
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Use.class)) {
+		switch(notification.getFeatureID(Use.class)) {
 		case DGPackage.USE__BOUNDS:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java
index 187596115a8..cd217dd44d0 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java
@@ -17,6 +17,7 @@ import java.util.Collection;
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.Notifier;
+
 import org.eclipse.emf.edit.provider.ChangeNotifier;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -30,6 +31,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
 import org.eclipse.papyrus.dd.di.util.DIAdapterFactory;
 
 /**
@@ -135,9 +137,9 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements Co
 	 */
 	@Override
 	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
+		if(isFactoryForType(type)) {
 			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
+			if(!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
@@ -175,7 +177,7 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements Co
 	@Override
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
-		if (parentAdapterFactory != null) {
+		if(parentAdapterFactory != null) {
 			parentAdapterFactory.fireNotifyChanged(notification);
 		}
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java
index 9a12e4c3046..05bb100d7f6 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java
@@ -13,7 +13,6 @@ package org.eclipse.papyrus.dd.di.provider;
 
 import java.util.Collection;
 import java.util.List;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.ResourceLocator;
@@ -55,7 +54,7 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements I
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java
index 5267f529963..cee6bb9a11f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java
@@ -16,6 +16,7 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -27,6 +28,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.di.DIPackage;
 import org.eclipse.papyrus.dd.di.Diagram;
 
@@ -57,7 +59,7 @@ public class DiagramItemProvider extends ShapeItemProvider implements IEditingDo
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addNamePropertyDescriptor(object);
 			addDocumentationPropertyDescriptor(object);
@@ -74,8 +76,7 @@ public class DiagramItemProvider extends ShapeItemProvider implements IEditingDo
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_name_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Diagram_name_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Diagram_name_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -85,8 +86,7 @@ public class DiagramItemProvider extends ShapeItemProvider implements IEditingDo
 	 * @generated
 	 */
 	protected void addDocumentationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_documentation_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Diagram_documentation_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__DOCUMENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_documentation_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Diagram_documentation_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__DOCUMENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -96,8 +96,7 @@ public class DiagramItemProvider extends ShapeItemProvider implements IEditingDo
 	 * @generated
 	 */
 	protected void addResolutionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_resolution_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Diagram_resolution_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__RESOLUTION, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_resolution_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Diagram_resolution_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__RESOLUTION, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -109,7 +108,7 @@ public class DiagramItemProvider extends ShapeItemProvider implements IEditingDo
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Diagram) object).getName();
+		String label = ((Diagram)object).getName();
 		return label == null || label.length() == 0 ? getString("_UI_Diagram_type") : getString("_UI_Diagram_type") + " " + label;
 	}
 
@@ -124,7 +123,7 @@ public class DiagramItemProvider extends ShapeItemProvider implements IEditingDo
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Diagram.class)) {
+		switch(notification.getFeatureID(Diagram.class)) {
 		case DIPackage.DIAGRAM__NAME:
 		case DIPackage.DIAGRAM__DOCUMENTATION:
 		case DIPackage.DIAGRAM__RESOLUTION:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java
index 93341de8db8..8bdfad715e5 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java
@@ -13,7 +13,6 @@ package org.eclipse.papyrus.dd.di.provider;
 
 import java.util.Collection;
 import java.util.List;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -57,14 +56,15 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements IEdi
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -72,7 +72,7 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements IEdi
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DIPackage.Literals.EDGE__WAYPOINT);
 		}
@@ -114,7 +114,7 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements IEdi
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Edge.class)) {
+		switch(notification.getFeatureID(Edge.class)) {
 		case DIPackage.EDGE__WAYPOINT:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java
index d1cde4c45cf..48342b3d0cb 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -26,7 +28,9 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
+
 import org.eclipse.papyrus.dd.di.DIPackage;
 import org.eclipse.papyrus.dd.di.Shape;
 
@@ -57,14 +61,15 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements IEd
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -72,7 +77,7 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements IEd
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DIPackage.Literals.SHAPE__BOUNDS);
 		}
@@ -114,7 +119,7 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements IEd
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Shape.class)) {
+		switch(notification.getFeatureID(Shape.class)) {
 		case DIPackage.SHAPE__BOUNDS:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java
index ba459e2b1ae..d66a66cd32f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -26,6 +28,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+
 import org.eclipse.papyrus.dd.edit.DDEditPlugin;
 
 /**
@@ -55,7 +58,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java
index 97c075906c0..34f29420a11 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java
@@ -12,6 +12,7 @@
 package org.eclipse.papyrus.dd.edit;
 
 import org.eclipse.emf.common.EMFPlugin;
+
 import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
 
@@ -46,7 +47,7 @@ public final class DDEditPlugin extends EMFPlugin {
 	 * @generated NOT
 	 */
 	public DDEditPlugin() {
-		super(new ResourceLocator[] { EcoreEditPlugin.INSTANCE, });
+		super(new ResourceLocator[]{ EcoreEditPlugin.INSTANCE, });
 	}
 
 	/**
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/META-INF/MANIFEST.MF b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/META-INF/MANIFEST.MF
index b6b641a71de..e89f541aa21 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/META-INF/MANIFEST.MF
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/META-INF/MANIFEST.MF
@@ -1,55 +1,53 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.dd.dg.editor,

- org.eclipse.papyrus.dd.editor

-Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,

- org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.dd.edit;bundle-version="1.0.1";visibility:=reexport,

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

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

- org.eclipse.ui.ide;visibility:=reexport,

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

- org.eclipse.ui.forms;bundle-version="3.6.1";visibility:=reexport,

- org.eclipse.jface.text;bundle-version="3.8.101";visibility:=reexport,

- org.eclipse.help;bundle-version="3.6.0";visibility:=reexport

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .,

- batik-1.7/batik-rasterizer.jar,

- batik-1.7/batik-slideshow.jar,

- batik-1.7/batik-squiggle.jar,

- batik-1.7/batik-svgpp.jar,

- batik-1.7/batik-ttf2svg.jar,

- batik-1.7/batik.jar,

- batik-1.7/lib/batik-anim.jar,

- batik-1.7/lib/batik-awt-util.jar,

- batik-1.7/lib/batik-bridge.jar,

- batik-1.7/lib/batik-codec.jar,

- batik-1.7/lib/batik-css.jar,

- batik-1.7/lib/batik-dom.jar,

- batik-1.7/lib/batik-ext.jar,

- batik-1.7/lib/batik-extension.jar,

- batik-1.7/lib/batik-gui-util.jar,

- batik-1.7/lib/batik-gvt.jar,

- batik-1.7/lib/batik-parser.jar,

- batik-1.7/lib/batik-script.jar,

- batik-1.7/lib/batik-svg-dom.jar,

- batik-1.7/lib/batik-svggen.jar,

- batik-1.7/lib/batik-swing.jar,

- batik-1.7/lib/batik-transcoder.jar,

- batik-1.7/lib/batik-util.jar,

- batik-1.7/lib/batik-xml.jar,

- batik-1.7/lib/js.jar,

- batik-1.7/lib/pdf-transcoder.jar,

- batik-1.7/lib/xalan-2.6.0.jar,

- batik-1.7/lib/xerces_2_5_0.jar,

- batik-1.7/lib/xml-apis-ext.jar,

- batik-1.7/lib/xml-apis.jar

-Bundle-Version: 1.0.1.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.dd.editor.DDEditorPlugin$Impleme

- ntation

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

-

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.dd.editor;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .,
+ batik-1.7/batik-rasterizer.jar,
+ batik-1.7/batik-slideshow.jar,
+ batik-1.7/batik-squiggle.jar,
+ batik-1.7/batik-svgpp.jar,
+ batik-1.7/batik-ttf2svg.jar,
+ batik-1.7/batik.jar,
+ batik-1.7/lib/batik-anim.jar,
+ batik-1.7/lib/batik-awt-util.jar,
+ batik-1.7/lib/batik-bridge.jar,
+ batik-1.7/lib/batik-codec.jar,
+ batik-1.7/lib/batik-css.jar,
+ batik-1.7/lib/batik-dom.jar,
+ batik-1.7/lib/batik-ext.jar,
+ batik-1.7/lib/batik-extension.jar,
+ batik-1.7/lib/batik-gui-util.jar,
+ batik-1.7/lib/batik-gvt.jar,
+ batik-1.7/lib/batik-parser.jar,
+ batik-1.7/lib/batik-script.jar,
+ batik-1.7/lib/batik-svg-dom.jar,
+ batik-1.7/lib/batik-svggen.jar,
+ batik-1.7/lib/batik-swing.jar,
+ batik-1.7/lib/batik-transcoder.jar,
+ batik-1.7/lib/batik-util.jar,
+ batik-1.7/lib/batik-xml.jar,
+ batik-1.7/lib/js.jar,
+ batik-1.7/lib/pdf-transcoder.jar,
+ batik-1.7/lib/xalan-2.6.0.jar,
+ batik-1.7/lib/xerces_2_5_0.jar,
+ batik-1.7/lib/xml-apis-ext.jar,
+ batik-1.7/lib/xml-apis.jar
+Bundle-Activator: org.eclipse.papyrus.dd.editor.DDEditorPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: org.eclipse.papyrus.dd.dg.editor,
+ org.eclipse.papyrus.dd.editor
+Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
+ org.eclipse.core.resources;visibility:=reexport,
+ org.eclipse.papyrus.dd.edit;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.emf.edit.ui;visibility:=reexport,
+ org.eclipse.ui.ide;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.ui.forms;bundle-version="3.6.1";visibility:=reexport,
+ org.eclipse.jface.text;bundle-version="3.8.101";visibility:=reexport,
+ org.eclipse.help;bundle-version="3.6.0";visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/scripts/Layout.js b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/scripts/Layout.js
new file mode 100644
index 00000000000..96576986b95
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/scripts/Layout.js
@@ -0,0 +1,156 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+
+function validate(parent) {
+	layout(parent);
+	var children = getChildren(parent);
+	for (var i=0; i<children.length; i++)
+		validate(children[i]);
+}
+
+function layout(parent) {
+	var lm = parent.getAttribute("layout");
+	if (lm != null && lm.length>0)
+		eval(lm);
+	else if (parent.tagName == "text")
+		layoutText(parent);
+}
+
+function getChildren(parent) {
+	var children = [];
+	var elements = parent.childNodes;
+	for (var i=0; i<elements.length; i++) {
+		var element = elements.item(i);
+		if (element.tagName != "script" && element.tagName != "defs" && element.nodeType != 3)
+			children.push(element);
+	}
+	return children;
+}
+
+function getPreferredSize(parent) {
+	var lm = parent.getAttribute("layout");
+	if (lm != null && lm.length>0) {
+		var prefSize = eval("getPreferredSize_"+lm);
+		return prefSize;
+	} 
+	var bbox = parent.getBBox();
+	return new Dimension(bbox.width+10, bbox.height+10);
+}
+
+function getBounds(element) {
+	var bbox = element.getBBox();
+	return new Rectangle(bbox.x, bbox.y, bbox.width, bbox.height);
+}
+
+function setBounds(element, x, y, width, height) {
+	
+	if (element.tagName == "rect")
+		setRectBounds(element, x, y, width, height);
+	else if (element.tagName == "svg")
+		setSvgBounds(element, x, y, width, height);
+	else if (element.tagName == "g")
+		setGBounds(element, x, y, width, height);
+	else if (element.tagName == "circle")
+		setCircleBounds(element, x, y, width, height);
+	else if (element.tagName == "text")
+		setTextBounds(element, x, y, width, height);
+}
+
+function setSvgBounds(element, x, y, width, height) {
+	element.setAttribute("x", x);
+	element.setAttribute("y", y);
+	element.setAttribute("width", width+1);
+	element.setAttribute("height", height);
+}
+
+function setGBounds(element, x, y, width, height) {
+	element.setAttribute("x", x);
+	element.setAttribute("y", y);
+	element.setAttribute("width", width);
+	element.setAttribute("height", height);
+}
+
+function setRectBounds(element, x, y, width, height) {
+	element.setAttribute("x", x);
+	element.setAttribute("y", y);
+	element.setAttribute("width", width);
+	element.setAttribute("height", height);
+}
+
+function setCircleBounds(element, x, y, width, height) {
+	element.setAttribute("cx", x+width/2);
+	element.setAttribute("cy", y+height/2);
+	if (width <= height)
+		element.setAttribute("r", width/2);
+	else
+		element.setAttribute("r", height/2);
+}
+
+function setTextBounds(element, x, y, width, height) {
+	var bbox = element.getBBox();
+	var anchor = element.getAttribute("text-anchor");
+	if (anchor == "middle")
+		element.setAttribute("x", x+width/2);
+	else if (anchor == "end")
+		element.setAttribute("x", x+width);
+	else
+		element.setAttribute("x", x);
+	element.setAttribute("y", y+height/2);
+}
+
+function layoutText(element) {
+	var x = +element.getAttribute("x");
+	var y = +element.getAttribute("y");
+	var width = +element.getAttribute("width");
+	var height = +element.getAttribute("height");
+	var anchor = element.getAttribute("text-anchor");
+	var text = element.getTextContent();
+
+	if (anchor == "middle")
+		x = x+width/2;
+	else if (anchor == "end")
+		x = x+width;
+
+	element.setAttribute("x", x);
+	element.setAttribute("y", y);
+	//element.setAttribute("dx", "0.2em");
+	element.setAttribute("dy", "0.9em");
+
+	var split = text.split("\\n");
+	element.setTextContent("");
+	for (var i=0; i<split.length; i++) {
+		var tspan = document.createElementNS("http://www.w3.org/2000/svg", "tspan");
+		tspan.setTextContent(split[i]);
+		if (i > 0) {
+			tspan.setAttribute("x", x);
+			tspan.setAttribute("dy", "1em");
+		}
+		element.appendChild(tspan);
+	}
+}
+
+function Rectangle(x, y, width, height) {
+	this.x = x;
+	this.y = y;
+	this.width = width;
+	this.height = height;
+}
+
+function Point(x, y) {
+	this.x = x;
+	this.y = y;
+}
+
+function Dimension(width, height) {
+	this.width = width;
+	this.height = height;
+}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGModelWizard.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGModelWizard.java
index dbf8ff4739d..faf21f109b9 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGModelWizard.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGModelWizard.java
@@ -21,53 +21,78 @@ import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.StringTokenizer;
 
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.common.CommonPlugin;
+
 import org.eclipse.emf.common.util.URI;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
+
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
+
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
 import org.eclipse.emf.ecore.xmi.XMLResource;
+
 import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
+
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
+
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.papyrus.dd.dg.DGFactory;
-import org.eclipse.papyrus.dd.dg.DGPackage;
-import org.eclipse.papyrus.dd.edit.DDEditPlugin;
-import org.eclipse.papyrus.dd.editor.DDEditorPlugin;
+
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
+
 import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.ModifyEvent;
+
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
+
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
+
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
 import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+
 import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.part.ISetSelectionTarget;
 
+import org.eclipse.papyrus.dd.dg.DGFactory;
+import org.eclipse.papyrus.dd.dg.DGPackage;
+import org.eclipse.papyrus.dd.edit.DDEditPlugin;
+
+import org.eclipse.core.runtime.Path;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+
+import org.eclipse.papyrus.dd.editor.DDEditorPlugin;
+
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+
 /**
  * This is a wizard to create a new DG model file.
  */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGToSVGConverter.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGToSVGConverter.java
index be412eb9118..1ae98db187f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGToSVGConverter.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGToSVGConverter.java
@@ -1047,6 +1047,19 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
 			svgDocument.insertBefore(pi, svgDocument.getDocumentElement());
 		}
 
+		try {
+			URL url = DDEditorPlugin.getPlugin().getBundle()
+					.getEntry("/scripts/Layout.js");
+			url = FileLocator.toFileURL(url);
+			Element script = svgDocument.createElementNS(SVG_NAMESPACE_URI,
+					SVG_SCRIPT_TAG);
+			script.setAttributeNS(XLINK_NAMESPACE_URI, XLINK_HREF_QNAME,
+					url.toString());
+			svg.appendChild(script);
+		} catch (IOException e) {
+			DDEditorPlugin.getPlugin().log(e);
+		}
+
 		for (String s : object.getScripts()) {
 			try {
 				URL url = FileLocator.toFileURL(new URL(s));
@@ -1314,15 +1327,23 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
 			text.setTextContent(object.getData());
 		}
 
-		if (object.getPosition() != null) {
-			Point position = object.getPosition();
-			if (position.eIsSet(DCPackage.Literals.POINT__X)) {
+		if (object.getBounds() != null) {
+			Bounds bounds = object.getBounds();
+			if (bounds.eIsSet(DCPackage.Literals.BOUNDS__X)) {
 				text.setAttribute(SVG_X_ATTRIBUTE,
-						convertDoubleToString(position.getX()));
+						convertDoubleToString(bounds.getX()));
 			}
-			if (position.eIsSet(DCPackage.Literals.POINT__Y)) {
+			if (bounds.eIsSet(DCPackage.Literals.BOUNDS__Y)) {
 				text.setAttribute(SVG_Y_ATTRIBUTE,
-						convertDoubleToString(position.getY()));
+						convertDoubleToString(bounds.getY()));
+			}
+			if (bounds.eIsSet(DCPackage.Literals.BOUNDS__WIDTH)) {
+				text.setAttribute(SVG_WIDTH_ATTRIBUTE,
+						convertDoubleToString(bounds.getWidth()));
+			}
+			if (bounds.eIsSet(DCPackage.Literals.BOUNDS__HEIGHT)) {
+				text.setAttribute(SVG_HEIGHT_ATTRIBUTE,
+						convertDoubleToString(bounds.getHeight()));
 			}
 		}
 
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/.project b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/.project
new file mode 100644
index 00000000000..fd438078f32
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.dd.examples</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Basic Shapes.dg b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Basic Shapes.dg
new file mode 100644
index 00000000000..8b644c7eccd
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Basic Shapes.dg
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dg:RootCanvas xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dg="http://www.omg.org/spec/DD/20110901/DG">
+  <member xsi:type="dg:Circle" radius="40.0">
+    <center x="50.0" y="50.0"/>
+  </member>
+  <member xsi:type="dg:Ellipse">
+    <center x="150.0" y="50.0"/>
+    <radii width="50.0" height="30.0"/>
+  </member>
+  <member xsi:type="dg:Rectangle">
+    <bounds x="210.0" y="25.0" width="80.0" height="50.0"/>
+  </member>
+  <member xsi:type="dg:Rectangle" cornerRadius="10.0">
+    <bounds x="300.0" y="25.0" width="80.0" height="50.0"/>
+  </member>
+  <member xsi:type="dg:Line">
+    <style>
+      <stroke color="#000000"/>
+    </style>
+    <start x="390.0" y="80.0"/>
+    <end x="440.0" y="20.0"/>
+  </member>
+  <member xsi:type="dg:Polyline">
+    <style>
+      <fill/>
+      <stroke color="#000000"/>
+    </style>
+    <point x="450.0" y="80.0"/>
+    <point x="450.0" y="20.0"/>
+    <point x="480.0" y="50.0"/>
+    <point x="510.0" y="20.0"/>
+    <point x="510.0" y="80.0"/>
+  </member>
+  <member xsi:type="dg:Polygon">
+    <point x="520.0" y="40.0"/>
+    <point x="550.0" y="20.0"/>
+    <point x="580.0" y="40.0"/>
+    <point x="580.0" y="70.0"/>
+    <point x="550.0" y="90.0"/>
+    <point x="520.0" y="70.0"/>
+  </member>
+  <member xsi:type="dg:Path">
+    <command xsi:type="dg:MoveTo">
+      <point x="10.0" y="100.0"/>
+    </command>
+    <command xsi:type="dg:LineTo">
+      <point x="90.0" y="100.0"/>
+    </command>
+    <command xsi:type="dg:LineTo">
+      <point x="50.0" y="150.0"/>
+    </command>
+    <command xsi:type="dg:ClosePath"/>
+  </member>
+  <member xsi:type="dg:Path">
+    <command xsi:type="dg:MoveTo" isRelative="true">
+      <point x="140.0" y="100.0"/>
+    </command>
+    <command xsi:type="dg:LineTo" isRelative="true">
+      <point x="40.0" y="50.0"/>
+    </command>
+    <command xsi:type="dg:LineTo" isRelative="true">
+      <point x="-80.0" y="0.0"/>
+    </command>
+    <command xsi:type="dg:ClosePath" isRelative="true"/>
+  </member>
+  <member xsi:type="dg:Path">
+    <style>
+      <fill/>
+      <stroke color="#000000"/>
+    </style>
+    <command xsi:type="dg:MoveTo">
+      <point x="200.0" y="125.0"/>
+    </command>
+    <command xsi:type="dg:CubicCurveTo" isRelative="true">
+      <startControl x="0.0" y="-50.0"/>
+      <endControl x="75.0" y="50.0"/>
+      <point x="75.0" y="0.0"/>
+    </command>
+  </member>
+  <member xsi:type="dg:Path">
+    <style>
+      <fill/>
+      <stroke color="#000000"/>
+    </style>
+    <command xsi:type="dg:MoveTo">
+      <point x="300.0" y="150.0"/>
+    </command>
+    <command xsi:type="dg:QuadraticCurveTo" isRelative="true">
+      <control x="25.0" y="-100.0"/>
+      <point x="50.0" y="0.0"/>
+    </command>
+  </member>
+  <member xsi:type="dg:Path">
+    <command xsi:type="dg:MoveTo">
+      <point x="400.0" y="125.0"/>
+    </command>
+    <command xsi:type="dg:LineTo" isRelative="true">
+      <point x="-25.0" y="0.0"/>
+    </command>
+    <command xsi:type="dg:EllipticalArcTo" isRelative="true" isLargeArc="true">
+      <radii width="25.0" height="25.0"/>
+      <point x="25.0" y="-25.0"/>
+    </command>
+    <command xsi:type="dg:ClosePath" isRelative="true"/>
+  </member>
+  <member xsi:type="dg:Text" data="Hello World!">
+    <bounds x="450.0" y="100.0"/>
+  </member>
+  <member xsi:type="dg:Image" source="Tiger.jpg" isAspectRatioPreserved="true">
+    <bounds x="10.0" y="180.0" width="300.0" height="200.0"/>
+  </member>
+  <definitions>
+    <styleSheet>
+      <rule>
+        <selector/>
+        <style>
+          <fill color="#0000FF"/>
+          <stroke color="#FF0000"/>
+        </style>
+      </rule>
+      <rule>
+        <selector kind="text"/>
+        <style fontSize="40.0" fontName="Times New Roman" fontItalic="true" fontBold="true" fontDecoration="underline"/>
+      </rule>
+      <rule>
+        <selector kind="ellipse"/>
+        <style fillOpacity="0.25" strokeWidth="5.0" strokeOpacity="0.5">
+          <strokeDashLength>5.0</strokeDashLength>
+          <strokeDashLength>5.0</strokeDashLength>
+        </style>
+      </rule>
+    </styleSheet>
+  </definitions>
+</dg:RootCanvas>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Group Shapes.dg b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Group Shapes.dg
new file mode 100644
index 00000000000..660d91f3468
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Group Shapes.dg
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dg:RootCanvas xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dg="http://www.omg.org/spec/DD/20110901/DG" backgroundColor="#00FFFF">
+  <member xsi:type="dg:Group">
+    <member xsi:type="dg:Use" referencedElement="head"/>
+  </member>
+  <member xsi:type="dg:Canvas">
+    <member xsi:type="dg:Use" referencedElement="head"/>
+    <bounds x="120.0"/>
+  </member>
+  <member xsi:type="dg:Use" clipPath="clip1" referencedElement="head">
+    <bounds x="240.0" y="0.0"/>
+  </member>
+  <member xsi:type="dg:Use" referencedElement="head">
+    <style strokeWidth="3.0"/>
+    <bounds x="360.0"/>
+  </member>
+  <member xsi:type="dg:Use" referencedElement="head">
+    <transform xsi:type="dg:Translate" deltaY="100.0"/>
+    <transform xsi:type="dg:Scale" factorX="2.0" factorY="2.0"/>
+    <transform xsi:type="dg:Rotate" angle="90.0">
+      <center x="50.0" y="50.0"/>
+    </transform>
+    <transform xsi:type="dg:Skew" angleX="20.0"/>
+  </member>
+  <member xsi:type="dg:Use" referencedElement="head">
+    <transform xsi:type="dg:Matrix" a="2.0" d="2.0" e="200.0" f="100.0"/>
+  </member>
+  <definitions>
+    <definition xsi:type="dg:Group" id="head">
+      <member xsi:type="dg:Ellipse">
+        <class>ear</class>
+        <center x="92.0" y="50.0"/>
+        <radii width="5.0" height="10.0"/>
+      </member>
+      <member xsi:type="dg:Ellipse">
+        <class>ear</class>
+        <center x="8.0" y="50.0"/>
+        <radii width="5.0" height="10.0"/>
+      </member>
+      <member xsi:type="dg:Circle" radius="40.0">
+        <class>face</class>
+        <center x="50.0" y="50.0"/>
+      </member>
+      <member xsi:type="dg:Ellipse">
+        <class>eye</class>
+        <center x="30.0" y="40.0"/>
+        <radii width="10.0" height="5.0"/>
+      </member>
+      <member xsi:type="dg:Ellipse">
+        <class>eye</class>
+        <center x="70.0" y="40.0"/>
+        <radii width="10.0" height="5.0"/>
+      </member>
+      <member xsi:type="dg:Circle" radius="5.0">
+        <class>pupil</class>
+        <center x="30.0" y="40.0"/>
+      </member>
+      <member xsi:type="dg:Circle" radius="5.0">
+        <class>pupil</class>
+        <center x="70.0" y="40.0"/>
+      </member>
+      <member xsi:type="dg:Polygon">
+        <class>nose</class>
+        <point x="50.0" y="50.0"/>
+        <point x="55.0" y="60.0"/>
+        <point x="45.0" y="60.0"/>
+      </member>
+      <member xsi:type="dg:Path">
+        <class>mouth</class>
+        <command xsi:type="dg:MoveTo">
+          <point x="60.0" y="70.0"/>
+        </command>
+        <command xsi:type="dg:LineTo" isRelative="true">
+          <point x="-20.0"/>
+        </command>
+        <command xsi:type="dg:EllipticalArcTo" isRelative="true" isLargeArc="true">
+          <radii width="10.0" height="10.0"/>
+          <point x="20.0"/>
+        </command>
+      </member>
+      <member xsi:type="dg:Path">
+        <class>eyebrow</class>
+        <command xsi:type="dg:MoveTo">
+          <point x="22.0" y="28.0"/>
+        </command>
+        <command xsi:type="dg:CubicCurveTo" isRelative="true">
+          <startControl y="-10.0"/>
+          <endControl x="20.0" y="10.0"/>
+          <point x="20.0"/>
+        </command>
+      </member>
+      <member xsi:type="dg:Path">
+        <class>eyebrow</class>
+        <command xsi:type="dg:MoveTo">
+          <point x="58.0" y="28.0"/>
+        </command>
+        <command xsi:type="dg:CubicCurveTo" isRelative="true">
+          <startControl y="10.0"/>
+          <endControl x="20.0" y="-10.0"/>
+          <point x="20.0"/>
+        </command>
+      </member>
+    </definition>
+    <definition xsi:type="dg:ClipPath" id="clip1">
+      <member xsi:type="dg:Rectangle">
+        <bounds x="0.5" width="0.5" height="1.0"/>
+      </member>
+    </definition>
+    <styleSheet>
+      <rule>
+        <selector/>
+        <style>
+          <fill/>
+          <stroke color="#000000"/>
+        </style>
+      </rule>
+      <rule>
+        <selector>
+          <class>face</class>
+        </selector>
+        <style>
+          <fill color="#FFD197"/>
+        </style>
+      </rule>
+      <rule>
+        <selector>
+          <class>eye</class>
+        </selector>
+        <style>
+          <fill color="#FFFFFF"/>
+        </style>
+      </rule>
+      <rule>
+        <selector>
+          <class>pupil</class>
+        </selector>
+        <style>
+          <fill color="#0000FF"/>
+        </style>
+      </rule>
+      <rule>
+        <selector>
+          <class>nose</class>
+        </selector>
+        <selector>
+          <class>ear</class>
+        </selector>
+        <style>
+          <fill color="#FFCC00"/>
+        </style>
+      </rule>
+      <rule>
+        <selector>
+          <class>mouth</class>
+        </selector>
+        <style>
+          <fill color="#FF0000"/>
+        </style>
+      </rule>
+    </styleSheet>
+  </definitions>
+</dg:RootCanvas>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Markers.dg b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Markers.dg
new file mode 100644
index 00000000000..1f6ae2e562c
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Markers.dg
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dg:RootCanvas xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dg="http://www.omg.org/spec/DD/20110901/DG">
+  <member xsi:type="dg:Line" endMarker="white-closed-arrow">
+    <start x="0.0" y="30.0"/>
+    <end x="90.0" y="30.0"/>
+  </member>
+  <member xsi:type="dg:Polyline" endMarker="open-arrow" midMarker="white-circle">
+    <transform xsi:type="dg:Translate" deltaX="100.0"/>
+    <point x="0.0" y="30.0"/>
+    <point x="70.0" y="30.0"/>
+    <point x="90.0" y="60.0"/>
+  </member>
+  <member xsi:type="dg:Path" endMarker="black-closed-arrow" midMarker="black-circle" startMarker="black-diamond">
+    <transform xsi:type="dg:Translate" deltaX="200.0"/>
+    <command xsi:type="dg:MoveTo">
+      <point x="0.0" y="60.0"/>
+    </command>
+    <command xsi:type="dg:LineTo">
+      <point x="50.0" y="30.0"/>
+    </command>
+    <command xsi:type="dg:LineTo">
+      <point x="90.0" y="60.0"/>
+    </command>
+  </member>
+  <member xsi:type="dg:Path" endMarker="black-closed-arrow" startMarker="white-diamond">
+    <transform xsi:type="dg:Translate" deltaX="300.0"/>
+    <command xsi:type="dg:MoveTo">
+      <point x="0.0" y="60.0"/>
+    </command>
+    <command xsi:type="dg:LineTo">
+      <point x="50.0" y="30.0"/>
+    </command>
+  </member>
+  <member xsi:type="dg:Path" endMarker="black-closed-arrow" midMarker="white-circle" startMarker="black-diamond">
+    <style strokeWidth="3.0"/>
+    <transform xsi:type="dg:Translate" deltaX="10.0" deltaY="50.0"/>
+    <command xsi:type="dg:MoveTo">
+      <point x="0.0" y="60.0"/>
+    </command>
+    <command xsi:type="dg:LineTo">
+      <point x="100.0" y="30.0"/>
+    </command>
+    <command xsi:type="dg:LineTo">
+      <point x="200.0" y="60.0"/>
+    </command>
+  </member>
+  <definitions>
+    <definition xsi:type="dg:Marker" id="open-arrow">
+      <member xsi:type="dg:Polyline">
+        <point/>
+        <point x="12.0" y="5.0"/>
+        <point y="10.0"/>
+      </member>
+      <size width="12.0" height="10.0"/>
+      <reference x="12.0" y="5.0"/>
+    </definition>
+    <definition xsi:type="dg:Marker" id="white-closed-arrow">
+      <member xsi:type="dg:Polygon">
+        <style>
+          <fill color="#FFFFFF"/>
+        </style>
+        <point/>
+        <point x="12.0" y="5.0"/>
+        <point y="10.0"/>
+      </member>
+      <size width="12.0" height="10.0"/>
+      <reference x="12.0" y="5.0"/>
+    </definition>
+    <definition xsi:type="dg:Marker" id="black-closed-arrow">
+      <member xsi:type="dg:Polygon">
+        <style>
+          <fill color="#000000"/>
+        </style>
+        <point/>
+        <point x="12.0" y="5.0"/>
+        <point y="10.0"/>
+      </member>
+      <size width="12.0" height="10.0"/>
+      <reference x="12.0" y="5.0"/>
+    </definition>
+    <definition xsi:type="dg:Marker" id="white-diamond">
+      <member xsi:type="dg:Polygon">
+        <style>
+          <fill color="#FFFFFF"/>
+        </style>
+        <point y="5.0"/>
+        <point x="8.0" y="0.0"/>
+        <point x="16.0" y="5.0"/>
+        <point x="8.0" y="10.0"/>
+      </member>
+      <size width="16.0" height="10.0"/>
+      <reference x="0.0" y="5.0"/>
+    </definition>
+    <definition xsi:type="dg:Marker" id="black-diamond">
+      <member xsi:type="dg:Polygon">
+        <style>
+          <fill color="#000000"/>
+        </style>
+        <point y="5.0"/>
+        <point x="8.0" y="0.0"/>
+        <point x="16.0" y="5.0"/>
+        <point x="8.0" y="10.0"/>
+      </member>
+      <size width="16.0" height="10.0"/>
+      <reference x="0.0" y="5.0"/>
+    </definition>
+    <definition xsi:type="dg:Marker" id="white-circle">
+      <member xsi:type="dg:Circle" radius="5.0">
+        <style>
+          <fill color="#FFFFFF"/>
+        </style>
+        <center x="5.0" y="5.0"/>
+      </member>
+      <size width="10.0" height="10.0"/>
+      <reference x="5.0" y="5.0"/>
+    </definition>
+    <definition xsi:type="dg:Marker" id="black-circle">
+      <member xsi:type="dg:Circle" radius="5.0">
+        <style>
+          <fill color="#000000"/>
+        </style>
+        <center x="5.0" y="5.0"/>
+      </member>
+      <size width="10.0" height="10.0"/>
+      <reference x="5.0" y="5.0"/>
+    </definition>
+    <styleSheet>
+      <rule>
+        <selector/>
+        <style strokeWidth="1.0">
+          <fill/>
+          <stroke color="#000000"/>
+        </style>
+      </rule>
+    </styleSheet>
+  </definitions>
+</dg:RootCanvas>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Paints.dg b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Paints.dg
new file mode 100644
index 00000000000..d222bfe2e22
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Paints.dg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dg:RootCanvas xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dg="http://www.omg.org/spec/DD/20110901/DG">
+  <member xsi:type="dg:Rectangle">
+    <style strokeWidth="2.0">
+      <fill paintServer="linear1"/>
+      <stroke color="#000000"/>
+    </style>
+    <bounds x="10.0" y="10.0" width="200.0" height="100.0"/>
+  </member>
+  <member xsi:type="dg:Ellipse">
+    <style strokeWidth="2.0">
+      <fill paintServer="radial1"/>
+      <stroke color="#000000"/>
+    </style>
+    <center x="300.0" y="60.0"/>
+    <radii width="50.0" height="50.0"/>
+  </member>
+  <member xsi:type="dg:Ellipse">
+    <style strokeWidth="2.0">
+      <fill paintServer="pattern1"/>
+      <stroke color="#000000"/>
+    </style>
+    <center x="450.0" y="60.0"/>
+    <radii width="75.0" height="50.0"/>
+  </member>
+  <definitions>
+    <definition xsi:type="dg:LinearGradient" id="linear1">
+      <transform xsi:type="dg:Rotate" angle="10.0"/>
+      <stop color="#FF0000" offset="5.0"/>
+      <stop color="#00FF00" offset="95.0"/>
+      <start x="10.0" y="10.0"/>
+      <end x="90.0" y="90.0"/>
+    </definition>
+    <definition xsi:type="dg:RadialGradient" id="radial1" radius="50.0">
+      <stop color="#FF0000" offset="0.0"/>
+      <stop color="#0000FF" offset="50.0"/>
+      <stop color="#FF0000" offset="100.0"/>
+      <center x="50.0" y="50.0"/>
+      <focus x="50.0" y="50.0"/>
+    </definition>
+    <definition xsi:type="dg:Pattern" id="pattern1">
+      <transform xsi:type="dg:Rotate" angle="45.0"/>
+      <bounds x="0.0" y="0.0" width="20.0" height="20.0"/>
+      <tile xsi:type="dg:Polygon">
+        <style>
+          <fill color="#FF0000"/>
+          <stroke color="#0000FF"/>
+        </style>
+        <point/>
+        <point x="10.0"/>
+        <point x="5.0" y="10.0"/>
+      </tile>
+    </definition>
+  </definitions>
+</dg:RootCanvas>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Tiger.jpg b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Tiger.jpg
new file mode 100644
index 00000000000..687e5de4875
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.examples/Tiger.jpg
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/.classpath b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/.classpath
index 3bc247511f0..098194ca4b7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/.classpath
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/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/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/.project b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/.project
new file mode 100644
index 00000000000..07633c20b27
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.dd.qvt</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/.settings/org.eclipse.jdt.core.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f42de363afa
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/META-INF/MANIFEST.MF b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..305a4edb0b5
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.dd.qvt;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Require-Bundle: org.eclipse.m2m.qvt.oml,
+ org.eclipse.papyrus.dd
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Vendor: %providerName
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/build.properties b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/build.properties
new file mode 100644
index 00000000000..0b993cf881f
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/build.properties
@@ -0,0 +1,17 @@
+# Copyright (c) 2014 CEA LIST.
+#  
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#  
+# Contributors:
+#  CEA LIST - Initial API and implementation
+
+bin.includes = .,\
+			   META-INF/,\
+               plugin.xml,\
+               plugin.properties
+source.. = src/
+output.. = bin
+               
\ No newline at end of file
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/plugin.properties b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/plugin.properties
new file mode 100644
index 00000000000..fc3566417d1
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/plugin.properties
@@ -0,0 +1,13 @@
+###############################################################################
+# Copyright (c) 2008, 2009 Borland Software Corporation and others.
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#   
+# Contributors:
+#     Borland Software Corporation - initial API and implementation
+###############################################################################
+pluginName=DD QVT Plugin
+providerName=CEA LIST
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/plugin.xml b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/plugin.xml
index 76a4c4fdba5..db5235c3244 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/plugin.xml
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/plugin.xml
@@ -15,8 +15,8 @@
 
 <plugin>
 	<extension point="org.eclipse.m2m.qvt.oml.javaBlackboxUnits">
-   		<unit name="UtilitiesLibrary" namespace="org.eclipse.papyrus.umldi2dg">
-    		<library name="UtilitiesLibrary" class="org.eclipse.papyrus.umldi2dg.UtilitiesLibrary">
+   		<unit name="UtilitiesLibrary" namespace="org.eclipse.papyrus.dd.qvt">
+    		<library name="UtilitiesLibrary" class="org.eclipse.papyrus.dd.qvt.UtilitiesLibrary">
     			<metamodel nsURI="http://www.omg.org/spec/DD/20110901/DC"/>
     		</library>
 		</unit>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/src/org/eclipse/papyrus/umldi2dg/UtilitiesLibrary.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/src/org/eclipse/papyrus/dd/qvt/UtilitiesLibrary.java
index 57539f0fd21..5c0a657be60 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/src/org/eclipse/papyrus/umldi2dg/UtilitiesLibrary.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt/src/org/eclipse/papyrus/dd/qvt/UtilitiesLibrary.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2014 CEA LIST.
- *
+ *  
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- *
+ *  
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.umldi2dg;
+package org.eclipse.papyrus.dd.qvt;
 
 import java.awt.Color;
 
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.core.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.core.prefs
index 11f6e462df7..56b6907735f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,287 @@
-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

+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=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0
+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=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0
+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=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+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=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=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=false
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
+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=150
+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=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+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_at_end_of_file_if_missing=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=do not 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_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_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=do not 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=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not 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=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not 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=do not 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=true
+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=200
+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=0
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
+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/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..b5f980cae55
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+formatter_profile=_Zero blank Papyrus Formatter Profile CDM
+formatter_settings_version=12
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/META-INF/MANIFEST.MF b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/META-INF/MANIFEST.MF
index 1a07b40bd72..cc32e5a6f2b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/META-INF/MANIFEST.MF
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/META-INF/MANIFEST.MF
@@ -1,25 +1,24 @@
-Manifest-Version: 1.0

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

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

- org.eclipse.papyrus.dd;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.uml2.common;visibility:=reexport,

- org.eclipse.ocl.ecore;visibility:=reexport

-Export-Package: org.eclipse.papyrus.dd.dc,

- org.eclipse.papyrus.dd.dc.impl,

- org.eclipse.papyrus.dd.dc.util,

- org.eclipse.papyrus.dd.dg,

- org.eclipse.papyrus.dd.dg.impl,

- org.eclipse.papyrus.dd.dg.util,

- org.eclipse.papyrus.dd.di,

- org.eclipse.papyrus.dd.di.impl,

- org.eclipse.papyrus.dd.di.util

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

-

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.dd;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.papyrus.dd;visibility:=reexport,
+ org.eclipse.uml2.common;visibility:=reexport,
+ org.eclipse.ocl.ecore;visibility:=reexport
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: org.eclipse.papyrus.dd.dc,
+ org.eclipse.papyrus.dd.dc.impl,
+ org.eclipse.papyrus.dd.dc.util,
+ org.eclipse.papyrus.dd.dg,
+ org.eclipse.papyrus.dd.dg.impl,
+ org.eclipse.papyrus.dd.dg.util,
+ org.eclipse.papyrus.dd.di,
+ org.eclipse.papyrus.dd.di.impl,
+ org.eclipse.papyrus.dd.di.util
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.ecore b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.ecore
index 6dd9995ef00..c3b26ebe8ed 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.ecore
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.ecore
@@ -463,7 +463,7 @@
     </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Definitions">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="defnition" upperBound="-1"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="definition" upperBound="-1"
         eType="#//Definition" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="A set of clip paths that are referenced by graphical elements in the containing canvas."/>
@@ -1241,8 +1241,8 @@
         <details key="documentation" value="the text as a string of characters."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="position" ordered="false"
-        lowerBound="1" eType="ecore:EClass DC.ecore#//Point" containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="bounds" ordered="false"
+        lowerBound="1" eType="ecore:EClass DC.ecore#//Bounds" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="the bounds inside which the text is rendered (possibly wrapped into multiple lines)"/>
       </eAnnotations>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.genmodel b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.genmodel
index 709d716ee4f..cc2d3052b22 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.genmodel
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.genmodel
@@ -170,7 +170,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//Definitions">
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
-          createChild="true" ecoreFeature="ecore:EReference DG.ecore#//Definitions/defnition"/>
+          createChild="true" ecoreFeature="ecore:EReference DG.ecore#//Definitions/definition"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
           createChild="true" ecoreFeature="ecore:EReference DG.ecore#//Definitions/styleSheet"/>
     </genClasses>
@@ -368,7 +368,7 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//Text">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//Text/data"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
-          createChild="true" ecoreFeature="ecore:EReference DG.ecore#//Text/position"/>
+          createChild="true" ecoreFeature="ecore:EReference DG.ecore#//Text/bounds"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//Text/anchor"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DG.ecore#//Text/dataCannotBeEmpty">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Text/dataCannotBeEmpty/diagnostics"/>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.uml b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.uml
index d1b4b920849..9933394853b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.uml
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.uml
@@ -1,25 +1,25 @@
 <?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: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/4.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="_0" name="DG" URI="http://www.omg.org/spec/DD/20110901/DG">
-    <ownedComment xmi:id="_ownedComment.0" annotatedElement="_0">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_ownedComment.0" annotatedElement="_0">
       <body>The Diagram Graphics (DG) package contains a model of graphical primitives that can be instantiated when mapping from a language abstract syntax models and diagram interchange (DI) models to visual presentations. The mapping effectively defines the concrete syntax of a language. This specification does not restrict how the mappings are done, or what languages are used to define them.</body>
     </ownedComment>
-    <packageImport xmi:id="_packageImport.0">
-      <importedPackage href="DC.uml#_0"/>
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_packageImport.0">
+      <importedPackage xmi:type="uml:Package" href="DC.uml#_0"/>
     </packageImport>
     <packagedElement xmi:type="uml:Class" xmi:id="Canvas" name="Canvas">
-      <ownedComment xmi:id="Canvas-_ownedComment.0" annotatedElement="Canvas">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Canvas-_ownedComment.0" annotatedElement="Canvas">
         <body>Canvas is a kind of group that has bounds.</body>
       </ownedComment>
-      <ownedRule xmi:id="_roVmMOjLEeO6TvQHODg78w" name="canvas_cannot_have_transforms" constrainedElement="Canvas">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="_roVmMOjLEeO6TvQHODg78w" name="canvas_cannot_have_transforms" constrainedElement="Canvas">
         <specification xmi:type="uml:OpaqueExpression" xmi:id="_roVmMejLEeO6TvQHODg78w">
           <language>OCL</language>
           <body>transform->isEmpty()</body>
         </specification>
       </ownedRule>
-      <generalization xmi:id="_2PhcIPo2EeOw_Nx9vOEGaA" general="Group"/>
-      <ownedAttribute xmi:id="_loGuQNTkEeO3TMM_EGdzeA" name="bounds" visibility="public">
-        <ownedComment xmi:id="_loGuQdTkEeO3TMM_EGdzeA" annotatedElement="_loGuQNTkEeO3TMM_EGdzeA">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcIPo2EeOw_Nx9vOEGaA" general="Group"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_loGuQNTkEeO3TMM_EGdzeA" name="bounds" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_loGuQdTkEeO3TMM_EGdzeA" annotatedElement="_loGuQNTkEeO3TMM_EGdzeA">
           <body>the bounds of the canvas in the x-y coordinate system.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Bounds"/>
@@ -27,11 +27,11 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Circle" name="Circle">
-      <ownedComment xmi:id="Circle-_ownedComment.0" annotatedElement="Circle">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Circle-_ownedComment.0" annotatedElement="Circle">
         <body>Circle is a graphical element that defines a circular shape with a given center point and a radius.</body>
       </ownedComment>
-      <ownedRule xmi:id="Circle-non_negative_radius" name="non_negative_radius" constrainedElement="Circle">
-        <ownedComment xmi:id="Circle-non_negative_radius-_ownedComment.0" annotatedElement="Circle-non_negative_radius">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="Circle-non_negative_radius" name="non_negative_radius" constrainedElement="Circle">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Circle-non_negative_radius-_ownedComment.0" annotatedElement="Circle-non_negative_radius">
           <body>The radius of a circle cannot be negative</body>
         </ownedComment>
         <specification xmi:type="uml:OpaqueExpression" xmi:id="Circle-non_negative_radius-_specification">
@@ -39,15 +39,15 @@
           <body>radius >= 0</body>
         </specification>
       </ownedRule>
-      <generalization xmi:id="_2PhcIfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
-      <ownedAttribute xmi:id="Circle-center" name="center" visibility="public">
-        <ownedComment xmi:id="Circle-center-_ownedComment.0" annotatedElement="Circle-center">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcIfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Circle-center" name="center" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Circle-center-_ownedComment.0" annotatedElement="Circle-center">
           <body>the center point of the circle in the x-y coordinate system.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Circle-radius" name="radius" visibility="public">
-        <ownedComment xmi:id="Circle-radius-_ownedComment.0" annotatedElement="Circle-radius">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Circle-radius" name="radius" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Circle-radius-_ownedComment.0" annotatedElement="Circle-radius">
           <body>a real number (>=0) that represents the radius of the circle.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
@@ -55,53 +55,53 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="ClipPath" name="ClipPath">
-      <ownedComment xmi:id="ClipPath-_ownedComment.0" annotatedElement="ClipPath">
+      <ownedComment xmi:type="uml:Comment" xmi:id="ClipPath-_ownedComment.0" annotatedElement="ClipPath">
         <body>ClipPath is a kind of group whose members collectively define a painting mask for its referencing graphical elements.</body>
       </ownedComment>
-      <generalization xmi:id="_2PhcIvo2EeOw_Nx9vOEGaA" general="Group"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcIvo2EeOw_Nx9vOEGaA" general="Group"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="ClosePath" name="ClosePath">
-      <ownedComment xmi:id="ClosePath-_ownedComment.0" annotatedElement="ClosePath">
+      <ownedComment xmi:type="uml:Comment" xmi:id="ClosePath-_ownedComment.0" annotatedElement="ClosePath">
         <body>ClosePath is a kind of path command that ends the current subpath and causes an automatic straight line to be drawn from the current point to the initial point of the current subpath.</body>
       </ownedComment>
-      <generalization xmi:id="_2PhcI_o2EeOw_Nx9vOEGaA" general="PathCommand"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcI_o2EeOw_Nx9vOEGaA" general="PathCommand"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="CubicCurveTo" name="CubicCurveTo">
-      <ownedComment xmi:id="CubicCurveTo-_ownedComment.0" annotatedElement="CubicCurveTo">
-        <body>CubicCurveTo is a kind of path command that draws a cubic bézier curve from the current point to a new point using a start and an end control points.</body>
+      <ownedComment xmi:type="uml:Comment" xmi:id="CubicCurveTo-_ownedComment.0" annotatedElement="CubicCurveTo">
+        <body>CubicCurveTo is a kind of path command that draws a cubic b��zier curve from the current point to a new point using a start and an end control points.</body>
       </ownedComment>
-      <generalization xmi:id="_2PhcJPo2EeOw_Nx9vOEGaA" general="PathCommand"/>
-      <ownedAttribute xmi:id="CubicCurveTo-startControl" name="startControl" visibility="public">
-        <ownedComment xmi:id="CubicCurveTo-startControl-_ownedComment.0" annotatedElement="CubicCurveTo-startControl">
-          <body>the start control point of the cubic bézier curve.</body>
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcJPo2EeOw_Nx9vOEGaA" general="PathCommand"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="CubicCurveTo-startControl" name="startControl" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="CubicCurveTo-startControl-_ownedComment.0" annotatedElement="CubicCurveTo-startControl">
+          <body>the start control point of the cubic b��zier curve.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="CubicCurveTo-endControl" name="endControl" visibility="public">
-        <ownedComment xmi:id="CubicCurveTo-endControl-_ownedComment.0" annotatedElement="CubicCurveTo-endControl">
-          <body>the end control point of the cubic bézier curve.</body>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="CubicCurveTo-endControl" name="endControl" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="CubicCurveTo-endControl-_ownedComment.0" annotatedElement="CubicCurveTo-endControl">
+          <body>the end control point of the cubic b��zier curve.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="CubicCurveTo-point" name="point" visibility="public">
-        <ownedComment xmi:id="CubicCurveTo-point-_ownedComment.0" annotatedElement="CubicCurveTo-point">
-          <body>a point to draw a cubic bézier curve to from the current point in the coordinate system.</body>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="CubicCurveTo-point" name="point" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="CubicCurveTo-point-_ownedComment.0" annotatedElement="CubicCurveTo-point">
+          <body>a point to draw a cubic b��zier curve to from the current point in the coordinate system.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_CwockM6jEeOqlr8E3pzO9g" name="Definition" isAbstract="true">
-      <ownedComment xmi:id="_k77BMM6jEeOqlr8E3pzO9g" annotatedElement="MoveTo">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_k77BMM6jEeOqlr8E3pzO9g" annotatedElement="MoveTo">
         <body>Definition is an object with an id that can be nested under Definitions.</body>
       </ownedComment>
-      <ownedRule xmi:id="_0yDOEO08EeOCPtJ2AfZp5A" name="id_cannot_be_empty" constrainedElement="_CwockM6jEeOqlr8E3pzO9g">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="_0yDOEO08EeOCPtJ2AfZp5A" name="id_cannot_be_empty" constrainedElement="_CwockM6jEeOqlr8E3pzO9g">
         <specification xmi:type="uml:OpaqueExpression" xmi:id="_0yDOEe08EeOCPtJ2AfZp5A">
           <language>OCL</language>
           <body>id->notEmpty() implies id.size() > 0</body>
         </specification>
       </ownedRule>
-      <ownedAttribute xmi:id="_3JUlwM6jEeOqlr8E3pzO9g" name="id" visibility="public" isID="true">
-        <ownedComment xmi:id="_3JUlwc6jEeOqlr8E3pzO9g" annotatedElement="_3JUlwM6jEeOqlr8E3pzO9g">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_3JUlwM6jEeOqlr8E3pzO9g" name="id" visibility="public" isID="true">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_3JUlwc6jEeOqlr8E3pzO9g" annotatedElement="_3JUlwM6jEeOqlr8E3pzO9g">
           <body>a point to move to in the coordinate system</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
@@ -109,84 +109,84 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_DH0DwM5yEeOqlr8E3pzO9g" name="Definitions">
-      <ownedComment xmi:id="_dKczUM5_EeOqlr8E3pzO9g" annotatedElement="CubicCurveTo">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_dKczUM5_EeOqlr8E3pzO9g" annotatedElement="CubicCurveTo">
         <body>Definitions nests definitions that are commonly referenced in the containing canvas. It can also nest an embedded stylesheet.</body>
       </ownedComment>
-      <ownedAttribute xmi:id="_zSdxIM5wEeOqlr8E3pzO9g" name="defnition" visibility="public" type="_CwockM6jEeOqlr8E3pzO9g" isOrdered="true" aggregation="composite" association="_Nti6EM53EeOqlr8E3pzO9g">
-        <ownedComment xmi:id="_zSdxIc5wEeOqlr8E3pzO9g" annotatedElement="_zSdxIM5wEeOqlr8E3pzO9g">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_zSdxIM5wEeOqlr8E3pzO9g" name="definition" visibility="public" type="_CwockM6jEeOqlr8E3pzO9g" isOrdered="true" aggregation="composite" association="_Nti6EM53EeOqlr8E3pzO9g">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_zSdxIc5wEeOqlr8E3pzO9g" annotatedElement="_zSdxIM5wEeOqlr8E3pzO9g">
           <body>A set of clip paths that are referenced by graphical elements in the containing canvas.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pb8kvo2EeOw_Nx9vOEGaA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pb8k_o2EeOw_Nx9vOEGaA" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Canvas-packagedStyle" name="styleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" aggregation="composite" association="_packagedElement.47">
-        <ownedComment xmi:id="Canvas-packagedStyle-_ownedComment.0" annotatedElement="Canvas-packagedStyle">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Canvas-packagedStyle" name="styleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" aggregation="composite" association="_packagedElement.47">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Canvas-packagedStyle-_ownedComment.0" annotatedElement="Canvas-packagedStyle">
           <body>An optional embdded style sheet that that apply to graphical elements in the containing canvas.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pb8lPo2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Ellipse" name="Ellipse">
-      <ownedComment xmi:id="Ellipse-_ownedComment.0" annotatedElement="Ellipse">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Ellipse-_ownedComment.0" annotatedElement="Ellipse">
         <body>Ellipse is a graphical element that defines an elliptical shape with a given center point and two radii on the x and y axes.</body>
       </ownedComment>
-      <generalization xmi:id="_2PhcJfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
-      <ownedAttribute xmi:id="Ellipse-center" name="center" visibility="public">
-        <ownedComment xmi:id="Ellipse-center-_ownedComment.0" annotatedElement="Ellipse-center">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcJfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Ellipse-center" name="center" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Ellipse-center-_ownedComment.0" annotatedElement="Ellipse-center">
           <body>the center point of the ellipse in the x-y coordinate system.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Ellipse-radii" name="radii" visibility="public">
-        <ownedComment xmi:id="Ellipse-radii-_ownedComment.0" annotatedElement="Ellipse-radii">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Ellipse-radii" name="radii" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Ellipse-radii-_ownedComment.0" annotatedElement="Ellipse-radii">
           <body>a dimension that specifies the two radii of the ellipse (a width along the x-axis and a height along the y-axis)</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Dimension"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="EllipticalArcTo" name="EllipticalArcTo">
-      <ownedComment xmi:id="EllipticalArcTo-_ownedComment.0" annotatedElement="CubicCurveTo QuadraticCurveTo">
+      <ownedComment xmi:type="uml:Comment" xmi:id="EllipticalArcTo-_ownedComment.0" annotatedElement="CubicCurveTo QuadraticCurveTo">
         <body>EllipticalArcTo is a kind of path command that draws an elliptical arc from the current point to a new point in the coordinate system.</body>
       </ownedComment>
-      <generalization xmi:id="_2PhcJvo2EeOw_Nx9vOEGaA" general="PathCommand"/>
-      <ownedAttribute xmi:id="EllipticalArcTo-radii" name="radii" visibility="public">
-        <ownedComment xmi:id="EllipticalArcTo-radii-_ownedComment.0" annotatedElement="EllipticalArcTo-radii">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcJvo2EeOw_Nx9vOEGaA" general="PathCommand"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="EllipticalArcTo-radii" name="radii" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="EllipticalArcTo-radii-_ownedComment.0" annotatedElement="EllipticalArcTo-radii">
           <body>the two radii of the ellipse from which the arc is created.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Dimension"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="EllipticalArcTo-rotation" name="rotation" visibility="public">
-        <ownedComment xmi:id="EllipticalArcTo-rotation-_ownedComment.0" annotatedElement="EllipticalArcTo-rotation">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="EllipticalArcTo-rotation" name="rotation" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="EllipticalArcTo-rotation-_ownedComment.0" annotatedElement="EllipticalArcTo-rotation">
           <body>a real number representing a rotation (in degrees) of the ellipse from which the arc is created.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="EllipticalArcTo-isLargeArc" name="isLargeArc" visibility="public">
-        <ownedComment xmi:id="EllipticalArcTo-isLargeArc-_ownedComment.0" annotatedElement="EllipticalArcTo-isLargeArc">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="EllipticalArcTo-isLargeArc" name="isLargeArc" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="EllipticalArcTo-isLargeArc-_ownedComment.0" annotatedElement="EllipticalArcTo-isLargeArc">
           <body>whether the arc sweep is equal to or greater than 180 degrees (the large arc).</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Boolean"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="EllipticalArcTo-isSweep" name="isSweep" visibility="public">
-        <ownedComment xmi:id="EllipticalArcTo-isSweep-_ownedComment.0" annotatedElement="EllipticalArcTo-isSweep">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="EllipticalArcTo-isSweep" name="isSweep" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="EllipticalArcTo-isSweep-_ownedComment.0" annotatedElement="EllipticalArcTo-isSweep">
           <body>whether the arc is drawn in a positive-angle direction</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Boolean"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="EllipticalArcTo-point" name="point" visibility="public">
-        <ownedComment xmi:id="EllipticalArcTo-point-_ownedComment.0" annotatedElement="EllipticalArcTo-point">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="EllipticalArcTo-point" name="point" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="EllipticalArcTo-point-_ownedComment.0" annotatedElement="EllipticalArcTo-point">
           <body>a point to draw an elliptical arc to from the current point in the coordinate system.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Gradient" name="Gradient" isAbstract="true">
-      <ownedComment xmi:id="Gradient-_ownedComment.0" annotatedElement="Gradient">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Gradient-_ownedComment.0" annotatedElement="Gradient">
         <body>Gradient is a kind of paint server that serves a continuously smooth color transition along the gradient range from one color to the next.</body>
       </ownedComment>
-      <generalization xmi:id="_2PhcJ_o2EeOw_Nx9vOEGaA" general="Fill"/>
-      <ownedAttribute xmi:id="Gradient-stop" name="stop" visibility="public" type="GradientStop" isOrdered="true" aggregation="composite" association="_hQOVgM41EeOqlr8E3pzO9g">
-        <ownedComment xmi:id="Gradient-stop-_ownedComment.0" annotatedElement="Gradient-stop">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcJ_o2EeOw_Nx9vOEGaA" general="Fill"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Gradient-stop" name="stop" visibility="public" type="GradientStop" isOrdered="true" aggregation="composite" association="_hQOVgM41EeOqlr8E3pzO9g">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Gradient-stop-_ownedComment.0" annotatedElement="Gradient-stop">
           <body>a list of two or more gradient stops defining the color transitions of the gradient.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PcjoPo2EeOw_Nx9vOEGaA" value="2"/>
@@ -194,11 +194,11 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="GradientStop" name="GradientStop">
-      <ownedComment xmi:id="GradientStop-_ownedComment.0" annotatedElement="GradientStop">
+      <ownedComment xmi:type="uml:Comment" xmi:id="GradientStop-_ownedComment.0" annotatedElement="GradientStop">
         <body>GradientStop defines a color transition along the distance from a gradient's start to its end offsets.</body>
       </ownedComment>
-      <ownedRule xmi:id="GradientStop-valid_offset" name="valid_offset" constrainedElement="GradientStop">
-        <ownedComment xmi:id="GradientStop-valid_offset-_ownedComment.0" annotatedElement="GradientStop-valid_offset">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="GradientStop-valid_offset" name="valid_offset" constrainedElement="GradientStop">
+        <ownedComment xmi:type="uml:Comment" xmi:id="GradientStop-valid_offset-_ownedComment.0" annotatedElement="GradientStop-valid_offset">
           <body>the offset must be between 0 and 1.</body>
         </ownedComment>
         <specification xmi:type="uml:OpaqueExpression" xmi:id="GradientStop-valid_offset-_specification">
@@ -206,8 +206,8 @@
           <body>offset>=0 and offset&lt;=1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="GradientStop-valid_opacity" name="valid_opacity" constrainedElement="GradientStop">
-        <ownedComment xmi:id="GradientStop-valid_opacity-_ownedComment.0" annotatedElement="GradientStop-valid_opacity">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="GradientStop-valid_opacity" name="valid_opacity" constrainedElement="GradientStop">
+        <ownedComment xmi:type="uml:Comment" xmi:id="GradientStop-valid_opacity-_ownedComment.0" annotatedElement="GradientStop-valid_opacity">
           <body>the opacity must be between 0 and 1.</body>
         </ownedComment>
         <specification xmi:type="uml:OpaqueExpression" xmi:id="GradientStop-valid_opacity-_specification">
@@ -215,22 +215,22 @@
           <body>opacity>=0 and opacity&lt;=1</body>
         </specification>
       </ownedRule>
-      <ownedAttribute xmi:id="GradientStop-color" name="color" visibility="public">
-        <ownedComment xmi:id="GradientStop-color-_ownedComment.0" annotatedElement="GradientStop-color">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="GradientStop-color" name="color" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="GradientStop-color-_ownedComment.0" annotatedElement="GradientStop-color">
           <body>the color to use at this gradient stop.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Color"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pcjovo2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="GradientStop-offset" name="offset" visibility="public">
-        <ownedComment xmi:id="GradientStop-offset-_ownedComment.0" annotatedElement="GradientStop-offset">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="GradientStop-offset" name="offset" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="GradientStop-offset-_ownedComment.0" annotatedElement="GradientStop-offset">
           <body>an offset of this gradient stop represented as a percentage of the distance between the start and end positions of the gradient along the x and y axes.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pcjo_o2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="GradientStop-opacity" name="opacity" visibility="public">
-        <ownedComment xmi:id="GradientStop-opacity-_ownedComment.0" annotatedElement="GradientStop-opacity">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="GradientStop-opacity" name="opacity" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="GradientStop-opacity-_ownedComment.0" annotatedElement="GradientStop-opacity">
           <body>a real number (>=0 and&lt;=1) representing the opacity of the color at the stop. A value of 0 means totally transparent, while a value of 1 means totally opaque.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
@@ -238,50 +238,50 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="GraphicalElement" name="GraphicalElement" isAbstract="true">
-      <ownedComment xmi:id="GraphicalElement-_ownedComment.0" annotatedElement="GraphicalElement">
+      <ownedComment xmi:type="uml:Comment" xmi:id="GraphicalElement-_ownedComment.0" annotatedElement="GraphicalElement">
         <body>GraphicalElement is the abstract superclass of all graphical elements that can be nested in a canvas.</body>
       </ownedComment>
-      <ownedRule xmi:id="_-a2yAOhzEeO6TvQHODg78w" name="referenced_clippath_has_id" constrainedElement="GraphicalElement">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="_-a2yAOhzEeO6TvQHODg78w" name="referenced_clippath_has_id" constrainedElement="GraphicalElement">
         <specification xmi:type="uml:OpaqueExpression" xmi:id="_I9m_EOh0EeO6TvQHODg78w">
           <language>OCL</language>
           <body>clipPath->notEmpty() implies clipPath.id->notEmpty()</body>
         </specification>
       </ownedRule>
-      <generalization xmi:id="_2PhcKPo2EeOw_Nx9vOEGaA" general="_CwockM6jEeOqlr8E3pzO9g"/>
-      <ownedAttribute xmi:id="GraphicalElement-clipPath" name="clipPath" visibility="public" type="ClipPath" association="A_clipPath_clippedElement">
-        <ownedComment xmi:id="GraphicalElement-clipPath-_ownedComment.0" annotatedElement="GraphicalElement-clipPath">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcKPo2EeOw_Nx9vOEGaA" general="_CwockM6jEeOqlr8E3pzO9g"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="GraphicalElement-clipPath" name="clipPath" visibility="public" type="ClipPath" association="A_clipPath_clippedElement">
+        <ownedComment xmi:type="uml:Comment" xmi:id="GraphicalElement-clipPath-_ownedComment.0" annotatedElement="GraphicalElement-clipPath">
           <body>A clip path that masks the painting of this graphical element.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pcjpfo2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="GraphicalElement-group" name="group" visibility="public" type="Group" association="A_member_group">
-        <ownedComment xmi:id="GraphicalElement-group-_ownedComment.0" annotatedElement="GraphicalElement-group">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="GraphicalElement-group" name="group" visibility="public" type="Group" association="A_member_group">
+        <ownedComment xmi:type="uml:Comment" xmi:id="GraphicalElement-group-_ownedComment.0" annotatedElement="GraphicalElement-group">
           <body>The group that owns this graphical element.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pcjpvo2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_yyXeMM2TEeOtK5GsJlm5Mw" name="class" visibility="public" isOrdered="true">
-        <ownedComment xmi:id="_yyXeMc2TEeOtK5GsJlm5Mw" annotatedElement="_yyXeMM2TEeOtK5GsJlm5Mw">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_yyXeMM2TEeOtK5GsJlm5Mw" name="class" visibility="public" isOrdered="true">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yyXeMc2TEeOtK5GsJlm5Mw" annotatedElement="_yyXeMM2TEeOtK5GsJlm5Mw">
           <body>A list of strings representing classes of the graphical element.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdKsPo2EeOw_Nx9vOEGaA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2PdKsfo2EeOw_Nx9vOEGaA" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="GraphicalElement-localStyle" name="style" visibility="public" type="Style" isOrdered="true" aggregation="composite" association="A_localStyle_styledElement">
-        <ownedComment xmi:id="GraphicalElement-localStyle-_ownedComment.0" annotatedElement="GraphicalElement-localStyle">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="GraphicalElement-localStyle" name="style" visibility="public" type="Style" isOrdered="true" aggregation="composite" association="A_localStyle_styledElement">
+        <ownedComment xmi:type="uml:Comment" xmi:id="GraphicalElement-localStyle-_ownedComment.0" annotatedElement="GraphicalElement-localStyle">
           <body>An inline style that applies on this graphical element.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdKsvo2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="GraphicalElement-transform" name="transform" visibility="public" type="Transform" isOrdered="true" aggregation="composite" association="_TVnmYM42EeOqlr8E3pzO9g">
-        <ownedComment xmi:id="GraphicalElement-transform-_ownedComment.0" annotatedElement="GraphicalElement-transform">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="GraphicalElement-transform" name="transform" visibility="public" type="Transform" isOrdered="true" aggregation="composite" association="_TVnmYM42EeOqlr8E3pzO9g">
+        <ownedComment xmi:type="uml:Comment" xmi:id="GraphicalElement-transform-_ownedComment.0" annotatedElement="GraphicalElement-transform">
           <body>A list of transforms that apply to this graphical element.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdKs_o2EeOw_Nx9vOEGaA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2PdKtPo2EeOw_Nx9vOEGaA" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_V0HkgBMTEeSVwtSTQ1YVCg" name="layoutData" visibility="public">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_V0HkgBMTEeSVwtSTQ1YVCg" name="layoutData" visibility="public">
         <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WEKLoBMTEeSVwtSTQ1YVCg"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WEKLoRMTEeSVwtSTQ1YVCg" value="1"/>
@@ -291,18 +291,18 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Group" name="Group">
-      <ownedComment xmi:id="Group-_ownedComment.0" annotatedElement="Group">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Group-_ownedComment.0" annotatedElement="Group">
         <body>Group defines a group of graphical elements that can be styled, clipped and/or transformed together.</body>
       </ownedComment>
-      <generalization xmi:id="_2PhcKfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
-      <ownedAttribute xmi:id="Group-member" name="member" visibility="public" type="GraphicalElement" isOrdered="true" aggregation="composite" association="A_member_group">
-        <ownedComment xmi:id="Group-member-_ownedComment.0" annotatedElement="Group-member">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcKfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Group-member" name="member" visibility="public" type="GraphicalElement" isOrdered="true" aggregation="composite" association="A_member_group">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Group-member-_ownedComment.0" annotatedElement="Group-member">
           <body>A list of graphical elements that are members of this group.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdKtfo2EeOw_Nx9vOEGaA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2PdKtvo2EeOw_Nx9vOEGaA" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_wT0y8BMSEeSVwtSTQ1YVCg" name="layout" visibility="public">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_wT0y8BMSEeSVwtSTQ1YVCg" name="layout" visibility="public">
         <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wmhsgBMSEeSVwtSTQ1YVCg"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wmiTkBMSEeSVwtSTQ1YVCg" value="1"/>
@@ -312,30 +312,30 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Image" name="Image">
-      <ownedComment xmi:id="Image-_ownedComment.0" annotatedElement="Image">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Image-_ownedComment.0" annotatedElement="Image">
         <body>Image is a graphical element that defines a shape that paints an image with a given URL within given bounds.</body>
       </ownedComment>
-      <ownedRule xmi:id="_6903kOjNEeO6TvQHODg78w" name="source_cannot_be_empty" constrainedElement="Image">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="_6903kOjNEeO6TvQHODg78w" name="source_cannot_be_empty" constrainedElement="Image">
         <specification xmi:type="uml:OpaqueExpression" xmi:id="_6903kejNEeO6TvQHODg78w">
           <language>OCL</language>
           <body>source->notEmpty() implies source.size() > 0</body>
         </specification>
       </ownedRule>
-      <generalization xmi:id="_2PhcKvo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
-      <ownedAttribute xmi:id="Image-source" name="source" visibility="public">
-        <ownedComment xmi:id="Image-source-_ownedComment.0" annotatedElement="Image-source">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcKvo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Image-source" name="source" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Image-source-_ownedComment.0" annotatedElement="Image-source">
           <body>the URL of a referenced image file.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Image-bounds" name="bounds" visibility="public">
-        <ownedComment xmi:id="Image-bounds-_ownedComment.0" annotatedElement="Image-bounds">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Image-bounds" name="bounds" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Image-bounds-_ownedComment.0" annotatedElement="Image-bounds">
           <body>the bounds within which the image is rendered.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Bounds"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Image-isAspectRatioPreserved" name="isAspectRatioPreserved" visibility="public">
-        <ownedComment xmi:id="Image-isAspectRatioPreserved-_ownedComment.0" annotatedElement="Image-isAspectRatioPreserved">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Image-isAspectRatioPreserved" name="isAspectRatioPreserved" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Image-isAspectRatioPreserved-_ownedComment.0" annotatedElement="Image-isAspectRatioPreserved">
           <body>wether to preserve the aspect ratio of the image upon scaling, i.e. the same scale factor for width and height.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Boolean"/>
@@ -343,29 +343,29 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Line" name="Line">
-      <ownedComment xmi:id="Line-_ownedComment.0" annotatedElement="Line">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Line-_ownedComment.0" annotatedElement="Line">
         <body>Line is a marked element that defines a shape consisting of one straight line between two points.</body>
       </ownedComment>
-      <generalization xmi:id="_2PhcK_o2EeOw_Nx9vOEGaA" general="MarkedElement"/>
-      <ownedAttribute xmi:id="Line-start" name="start" visibility="public">
-        <ownedComment xmi:id="Line-start-_ownedComment.0" annotatedElement="Line-start">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcK_o2EeOw_Nx9vOEGaA" general="MarkedElement"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Line-start" name="start" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Line-start-_ownedComment.0" annotatedElement="Line-start">
           <body>the starting point of the line in the x-y coordinate system.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Line-end" name="end" visibility="public">
-        <ownedComment xmi:id="Line-end-_ownedComment.0" annotatedElement="Line-end">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Line-end" name="end" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Line-end-_ownedComment.0" annotatedElement="Line-end">
           <body>the ending point of the line in the x-y coordinate system.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="LinearGradient" name="LinearGradient">
-      <ownedComment xmi:id="LinearGradient-_ownedComment.0" annotatedElement="LinearGradient">
+      <ownedComment xmi:type="uml:Comment" xmi:id="LinearGradient-_ownedComment.0" annotatedElement="LinearGradient">
         <body>LinearGradient is a kind of gradient that fills a graphical element by smoothly changing color values along a vector.</body>
       </ownedComment>
-      <ownedRule xmi:id="LinearGradient-valid_gradient_vector" name="valid_gradient_vector" constrainedElement="LinearGradient">
-        <ownedComment xmi:id="LinearGradient-valid_gradient_vector-_ownedComment.0" annotatedElement="LinearGradient-valid_gradient_vector">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="LinearGradient-valid_gradient_vector" name="valid_gradient_vector" constrainedElement="LinearGradient">
+        <ownedComment xmi:type="uml:Comment" xmi:id="LinearGradient-valid_gradient_vector-_ownedComment.0" annotatedElement="LinearGradient-valid_gradient_vector">
           <body>all the components of the gradient vector must be between 0 and 1.</body>
         </ownedComment>
         <specification xmi:type="uml:OpaqueExpression" xmi:id="LinearGradient-valid_gradient_vector-_specification">
@@ -373,177 +373,177 @@
           <body>start.x>=0 and start.x&lt;=1 and end.x>=0 and end.x&lt;=1 and start.y>=0 and start.y&lt;=1 and end.y>=0 and end.y&lt;=1</body>
         </specification>
       </ownedRule>
-      <generalization xmi:id="_2PhcLPo2EeOw_Nx9vOEGaA" general="Gradient"/>
-      <ownedAttribute xmi:id="_nIr7gNpbEeOltvy1wTDHDA" name="start" visibility="public">
-        <ownedComment xmi:id="_nIr7gdpbEeOltvy1wTDHDA" annotatedElement="_nIr7gNpbEeOltvy1wTDHDA">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcLPo2EeOw_Nx9vOEGaA" general="Gradient"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_nIr7gNpbEeOltvy1wTDHDA" name="start" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_nIr7gdpbEeOltvy1wTDHDA" annotatedElement="_nIr7gNpbEeOltvy1wTDHDA">
           <body>a starting point for the linear gradient expressed as a percentage along the x and y axes.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_oaTUYNpbEeOltvy1wTDHDA" name="end" visibility="public">
-        <ownedComment xmi:id="_oaTUYdpbEeOltvy1wTDHDA" annotatedElement="_oaTUYNpbEeOltvy1wTDHDA">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_oaTUYNpbEeOltvy1wTDHDA" name="end" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_oaTUYdpbEeOltvy1wTDHDA" annotatedElement="_oaTUYNpbEeOltvy1wTDHDA">
           <body>an ending point for the linear gradient expressed as a percentage along the x and y axes.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="LineTo" name="LineTo">
-      <ownedComment xmi:id="LineTo-_ownedComment.0" annotatedElement="LineTo">
+      <ownedComment xmi:type="uml:Comment" xmi:id="LineTo-_ownedComment.0" annotatedElement="LineTo">
         <body>LineTo is a kind of path command that draw a straight line from the current point to a new point.</body>
       </ownedComment>
-      <generalization xmi:id="_2PhcLfo2EeOw_Nx9vOEGaA" general="PathCommand"/>
-      <ownedAttribute xmi:id="LineTo-point" name="point" visibility="public">
-        <ownedComment xmi:id="LineTo-point-_ownedComment.0" annotatedElement="LineTo-point">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcLfo2EeOw_Nx9vOEGaA" general="PathCommand"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="LineTo-point" name="point" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="LineTo-point-_ownedComment.0" annotatedElement="LineTo-point">
           <body>a point to draw a straight line to from the current point in the coordinate system.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="MarkedElement" name="MarkedElement" isAbstract="true">
-      <ownedComment xmi:id="MarkedElement-_ownedComment.0" annotatedElement="MarkedElement">
+      <ownedComment xmi:type="uml:Comment" xmi:id="MarkedElement-_ownedComment.0" annotatedElement="MarkedElement">
         <body>MarkedElement is a graphic element that can be decorated at its vertices with markers (e.g. arrowheads).</body>
       </ownedComment>
-      <ownedRule xmi:id="_wycJoOh1EeO6TvQHODg78w" name="referenced_start_marker_has_id" constrainedElement="MarkedElement">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="_wycJoOh1EeO6TvQHODg78w" name="referenced_start_marker_has_id" constrainedElement="MarkedElement">
         <specification xmi:type="uml:OpaqueExpression" xmi:id="_wycJoeh1EeO6TvQHODg78w">
           <language>OCL</language>
           <body>startMarker->notEmpty() implies startMarker.id->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8rYGgOh1EeO6TvQHODg78w" name="referenced_mid_marker_has_id" constrainedElement="MarkedElement">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="_8rYGgOh1EeO6TvQHODg78w" name="referenced_mid_marker_has_id" constrainedElement="MarkedElement">
         <specification xmi:type="uml:OpaqueExpression" xmi:id="_8rYGgeh1EeO6TvQHODg78w">
           <language>OCL</language>
           <body>midMarker->notEmpty() implies midMarker.id->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_B10LEOh2EeO6TvQHODg78w" name="referenced_end_marker_has_id" constrainedElement="MarkedElement">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="_B10LEOh2EeO6TvQHODg78w" name="referenced_end_marker_has_id" constrainedElement="MarkedElement">
         <specification xmi:type="uml:OpaqueExpression" xmi:id="_B10LEeh2EeO6TvQHODg78w">
           <language>OCL</language>
           <body>endMarker->notEmpty() implies endMarker.id->notEmpty()</body>
         </specification>
       </ownedRule>
-      <generalization xmi:id="_2PhcLvo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
-      <ownedAttribute xmi:id="MarkedElement-endMarker" name="endMarker" visibility="public" type="Marker" association="A_endMarker_markedElement">
-        <ownedComment xmi:id="MarkedElement-endMarker-_ownedComment.0" annotatedElement="MarkedElement-endMarker">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcLvo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="MarkedElement-endMarker" name="endMarker" visibility="public" type="Marker" association="A_endMarker_markedElement">
+        <ownedComment xmi:type="uml:Comment" xmi:id="MarkedElement-endMarker-_ownedComment.0" annotatedElement="MarkedElement-endMarker">
           <body>an optional end marker that aligns with the last vertex of the marked element.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdKuPo2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="MarkedElement-midMarker" name="midMarker" visibility="public" type="Marker" association="A_midMarker_markedElement">
-        <ownedComment xmi:id="MarkedElement-midMarker-_ownedComment.0" annotatedElement="MarkedElement-midMarker">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="MarkedElement-midMarker" name="midMarker" visibility="public" type="Marker" association="A_midMarker_markedElement">
+        <ownedComment xmi:type="uml:Comment" xmi:id="MarkedElement-midMarker-_ownedComment.0" annotatedElement="MarkedElement-midMarker">
           <body>an optional mid marker that aligns with all vertices of the marked element except the first and the last.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdxwPo2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="MarkedElement-startMarker" name="startMarker" visibility="public" type="Marker" association="A_startMarker_markedElement">
-        <ownedComment xmi:id="MarkedElement-startMarker-_ownedComment.0" annotatedElement="MarkedElement-startMarker">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="MarkedElement-startMarker" name="startMarker" visibility="public" type="Marker" association="A_startMarker_markedElement">
+        <ownedComment xmi:type="uml:Comment" xmi:id="MarkedElement-startMarker-_ownedComment.0" annotatedElement="MarkedElement-startMarker">
           <body>an optional start marker that aligns with the first vertex of the marked element.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pdxwfo2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Marker" name="Marker">
-      <ownedComment xmi:id="Marker-_ownedComment.0" annotatedElement="Marker">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Marker-_ownedComment.0" annotatedElement="Marker">
         <body>Marker is a kind of group that is used as a decoration (e.g. an arrowhead) for the vertices of a marked graphical element.</body>
       </ownedComment>
-      <generalization xmi:id="_2PhcL_o2EeOw_Nx9vOEGaA" general="Group"/>
-      <ownedAttribute xmi:id="Marker-size" name="size" visibility="public">
-        <ownedComment xmi:id="Marker-size-_ownedComment.0" annotatedElement="Marker-size">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcL_o2EeOw_Nx9vOEGaA" general="Group"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Marker-size" name="size" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Marker-size-_ownedComment.0" annotatedElement="Marker-size">
           <body>the size of the marker</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Dimension"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Marker-reference" name="reference" visibility="public">
-        <ownedComment xmi:id="Marker-reference-_ownedComment.0" annotatedElement="Marker-reference">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Marker-reference" name="reference" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Marker-reference-_ownedComment.0" annotatedElement="Marker-reference">
           <body>a point within the bounds of the marker that aligns exactly with the marked element's vertex.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Matrix" name="Matrix">
-      <ownedComment xmi:id="Matrix-_ownedComment.0" annotatedElement="Matrix">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Matrix-_ownedComment.0" annotatedElement="Matrix">
         <body>Matrix is a kind of transform that represents any transform operation with a 3x3 transformation matrix.</body>
       </ownedComment>
-      <generalization xmi:id="_2PhcMPo2EeOw_Nx9vOEGaA" general="Transform"/>
-      <ownedAttribute xmi:id="Matrix-a" name="a" visibility="public">
-        <ownedComment xmi:id="Matrix-a-_ownedComment.0" annotatedElement="Matrix-a">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcMPo2EeOw_Nx9vOEGaA" general="Transform"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Matrix-a" name="a" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Matrix-a-_ownedComment.0" annotatedElement="Matrix-a">
           <body>the a value of the transform matrix.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Matrix-b" name="b" visibility="public">
-        <ownedComment xmi:id="Matrix-b-_ownedComment.0" annotatedElement="Matrix-b">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Matrix-b" name="b" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Matrix-b-_ownedComment.0" annotatedElement="Matrix-b">
           <body>the b value of the transform matrix.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Matrix-c" name="c" visibility="public">
-        <ownedComment xmi:id="Matrix-c-_ownedComment.0" annotatedElement="Matrix-c">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Matrix-c" name="c" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Matrix-c-_ownedComment.0" annotatedElement="Matrix-c">
           <body>the c value of the transform matrix.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Matrix-d" name="d" visibility="public">
-        <ownedComment xmi:id="Matrix-d-_ownedComment.0" annotatedElement="Matrix-d">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Matrix-d" name="d" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Matrix-d-_ownedComment.0" annotatedElement="Matrix-d">
           <body>the d value of the transform matrix.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Matrix-e" name="e" visibility="public">
-        <ownedComment xmi:id="Matrix-e-_ownedComment.0" annotatedElement="Matrix-e">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Matrix-e" name="e" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Matrix-e-_ownedComment.0" annotatedElement="Matrix-e">
           <body>the e value of the transform matrix.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Matrix-f" name="f" visibility="public">
-        <ownedComment xmi:id="Matrix-f-_ownedComment.0" annotatedElement="Matrix-f">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Matrix-f" name="f" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Matrix-f-_ownedComment.0" annotatedElement="Matrix-f">
           <body>the f value of the transform matrix.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="MoveTo" name="MoveTo">
-      <ownedComment xmi:id="MoveTo-_ownedComment.0" annotatedElement="MoveTo">
+      <ownedComment xmi:type="uml:Comment" xmi:id="MoveTo-_ownedComment.0" annotatedElement="MoveTo">
         <body>MoveTo is a kind of path command that establishes a new current point in the coordinate system.</body>
       </ownedComment>
-      <generalization xmi:id="_2PhcMfo2EeOw_Nx9vOEGaA" general="PathCommand"/>
-      <ownedAttribute xmi:id="MoveTo-point" name="point" visibility="public">
-        <ownedComment xmi:id="MoveTo-point-_ownedComment.0" annotatedElement="MoveTo-point">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcMfo2EeOw_Nx9vOEGaA" general="PathCommand"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="MoveTo-point" name="point" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="MoveTo-point-_ownedComment.0" annotatedElement="MoveTo-point">
           <body>a point to move to in the coordinate system</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_wz9hsM2cEeOtK5GsJlm5Mw" name="Paint">
-      <ownedComment xmi:id="_C_Q0gM2dEeOtK5GsJlm5Mw">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_C_Q0gM2dEeOtK5GsJlm5Mw">
         <body>Paint is used to fill or stroke a graphical element.</body>
       </ownedComment>
-      <ownedRule xmi:id="_R3fe8Oh2EeO6TvQHODg78w" name="referenced_paint_server_has_id" constrainedElement="_wz9hsM2cEeOtK5GsJlm5Mw">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="_R3fe8Oh2EeO6TvQHODg78w" name="referenced_paint_server_has_id" constrainedElement="_wz9hsM2cEeOtK5GsJlm5Mw">
         <specification xmi:type="uml:OpaqueExpression" xmi:id="_R3fe8eh2EeO6TvQHODg78w">
           <language>OCL</language>
           <body>paintServer->notEmpty() implies paintServer.id->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedAttribute xmi:id="_Mg5i0M2dEeOtK5GsJlm5Mw" name="color" visibility="public">
-        <ownedComment xmi:id="_Mg5i0c2dEeOtK5GsJlm5Mw" annotatedElement="_Mg5i0M2dEeOtK5GsJlm5Mw">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Mg5i0M2dEeOtK5GsJlm5Mw" name="color" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_Mg5i0c2dEeOtK5GsJlm5Mw" annotatedElement="_Mg5i0M2dEeOtK5GsJlm5Mw">
           <body>A solid color to use in painting.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Color"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pdxwvo2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_dR8eIM2dEeOtK5GsJlm5Mw" name="paintServer" visibility="public" type="Fill" association="_VGk7AM2kEeOtK5GsJlm5Mw">
-        <ownedComment xmi:id="_dR8eIc2dEeOtK5GsJlm5Mw" annotatedElement="_dR8eIM2dEeOtK5GsJlm5Mw">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_dR8eIM2dEeOtK5GsJlm5Mw" name="paintServer" visibility="public" type="Fill" association="_VGk7AM2kEeOtK5GsJlm5Mw">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_dR8eIc2dEeOtK5GsJlm5Mw" annotatedElement="_dR8eIM2dEeOtK5GsJlm5Mw">
           <body>A paint server that is used in painting.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pdxw_o2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Fill" name="PaintServer" isAbstract="true">
-      <ownedComment xmi:id="Fill-_ownedComment.0" annotatedElement="Fill">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Fill-_ownedComment.0" annotatedElement="Fill">
         <body>PaintServer is the abstract super class of all paint servers, like gradients and patterns</body>
       </ownedComment>
-      <generalization xmi:id="_2PhcMvo2EeOw_Nx9vOEGaA" general="_CwockM6jEeOqlr8E3pzO9g"/>
-      <ownedAttribute xmi:id="Fill-transform" name="transform" visibility="public" type="Transform" isOrdered="true" aggregation="composite" association="_oEGFIM55EeOqlr8E3pzO9g">
-        <ownedComment xmi:id="Fill-transform-_ownedComment.0" annotatedElement="Fill-transform">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcMvo2EeOw_Nx9vOEGaA" general="_CwockM6jEeOqlr8E3pzO9g"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Fill-transform" name="transform" visibility="public" type="Transform" isOrdered="true" aggregation="composite" association="_oEGFIM55EeOqlr8E3pzO9g">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Fill-transform-_ownedComment.0" annotatedElement="Fill-transform">
           <body>A set of transforms that apply to this paint server.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdxxPo2EeOw_Nx9vOEGaA"/>
@@ -551,29 +551,29 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Path" name="Path">
-      <ownedComment xmi:id="Path-_ownedComment.0" annotatedElement="Path">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Path-_ownedComment.0" annotatedElement="Path">
         <body>Path is a marked element that defines a custom shape whose geometry is specified with a sequence of path commands.</body>
       </ownedComment>
-      <ownedRule xmi:id="_uJDzUOjHEeO6TvQHODg78w" name="first_command_must_be_move" constrainedElement="Path">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="_uJDzUOjHEeO6TvQHODg78w" name="first_command_must_be_move" constrainedElement="Path">
         <specification xmi:type="uml:OpaqueExpression" xmi:id="_Omo48OjIEeO6TvQHODg78w">
           <language>OCL</language>
           <body>command->first().oclIsKindOf(MoveTo)</body>
         </specification>
       </ownedRule>
-      <generalization xmi:id="_2PhcM_o2EeOw_Nx9vOEGaA" general="MarkedElement"/>
-      <ownedAttribute xmi:id="Path-command" name="command" visibility="public" type="PathCommand" isOrdered="true" aggregation="composite" association="_-INckM55EeOqlr8E3pzO9g">
-        <ownedComment xmi:id="Path-command-_ownedComment.0" annotatedElement="Path-command">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcM_o2EeOw_Nx9vOEGaA" general="MarkedElement"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Path-command" name="command" visibility="public" type="PathCommand" isOrdered="true" aggregation="composite" association="_-INckM55EeOqlr8E3pzO9g">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Path-command-_ownedComment.0" annotatedElement="Path-command">
           <body>a list of path commands that define the geometry of the custom shape.</body>
         </ownedComment>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pdxxvo2EeOw_Nx9vOEGaA" value="*"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="PathCommand" name="PathCommand" isAbstract="true">
-      <ownedComment xmi:id="PathCommand-_ownedComment.0" annotatedElement="PathCommand">
+      <ownedComment xmi:type="uml:Comment" xmi:id="PathCommand-_ownedComment.0" annotatedElement="PathCommand">
         <body>PathCommand is the abstract super type of all commands that participate in specifying a path element.</body>
       </ownedComment>
-      <ownedAttribute xmi:id="PathCommand-isRelative" name="isRelative" visibility="public">
-        <ownedComment xmi:id="PathCommand-isRelative-_ownedComment.0" annotatedElement="PathCommand-isRelative">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="PathCommand-isRelative" name="isRelative" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="PathCommand-isRelative-_ownedComment.0" annotatedElement="PathCommand-isRelative">
           <body>whether the coordinates specified by the command are relative to the current point (when true) or to the origin point of the coordinate system (when false).</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Boolean"/>
@@ -581,29 +581,29 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Pattern" name="Pattern">
-      <ownedComment xmi:id="Pattern-_ownedComment.0" annotatedElement="Pattern">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Pattern-_ownedComment.0" annotatedElement="Pattern">
         <body>Pattern is a kind of paint server that paints a graphical element (a tile) repeatedly at fixed intervals in x and y axes to cover the areas to be filled.</body>
       </ownedComment>
-      <generalization xmi:id="_2PhcNPo2EeOw_Nx9vOEGaA" general="Fill"/>
-      <ownedAttribute xmi:id="Pattern-bounds" name="bounds" visibility="public">
-        <ownedComment xmi:id="Pattern-bounds-_ownedComment.0" annotatedElement="Pattern-bounds">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcNPo2EeOw_Nx9vOEGaA" general="Fill"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Pattern-bounds" name="bounds" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Pattern-bounds-_ownedComment.0" annotatedElement="Pattern-bounds">
           <body>the bounds of the pattern that define a private coordinate system for the pattern's tile.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Bounds"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Pattern-tile" name="tile" visibility="public" type="GraphicalElement" aggregation="composite" association="A_tile_pattern">
-        <ownedComment xmi:id="Pattern-tile-_ownedComment.0" annotatedElement="Pattern-tile">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Pattern-tile" name="tile" visibility="public" type="GraphicalElement" aggregation="composite" association="A_tile_pattern">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Pattern-tile-_ownedComment.0" annotatedElement="Pattern-tile">
           <body>a reference to a graphical element, owned by the pattern, that works as a tile to be painted repeatedly at a fixed interval to fill an closed area.</body>
         </ownedComment>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Polygon" name="Polygon">
-      <ownedComment xmi:id="Polygon-_ownedComment.0" annotatedElement="Polygon">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Polygon-_ownedComment.0" annotatedElement="Polygon">
         <body>Polygon is a marked element that defines a closed shape consisting of a sequence of connected straight line segments.</body>
       </ownedComment>
-      <generalization xmi:id="_2PhcNfo2EeOw_Nx9vOEGaA" general="MarkedElement"/>
-      <ownedAttribute xmi:id="Polygon-point" name="point" visibility="public" isOrdered="true">
-        <ownedComment xmi:id="Polygon-point-_ownedComment.0" annotatedElement="Polygon-point">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcNfo2EeOw_Nx9vOEGaA" general="MarkedElement"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Polygon-point" name="point" visibility="public" isOrdered="true">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Polygon-point-_ownedComment.0" annotatedElement="Polygon-point">
           <body>a list of 3 or more points making up the polygon.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
@@ -612,12 +612,12 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Polyline" name="Polyline">
-      <ownedComment xmi:id="Polyline-_ownedComment.0" annotatedElement="Polyline">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Polyline-_ownedComment.0" annotatedElement="Polyline">
         <body>Polyline is a marked element that defines a shape consisting of a sequence of connected straight line segments.</body>
       </ownedComment>
-      <generalization xmi:id="_2PhcNvo2EeOw_Nx9vOEGaA" general="MarkedElement"/>
-      <ownedAttribute xmi:id="Polyline-point" name="point" visibility="public" isOrdered="true">
-        <ownedComment xmi:id="Polyline-point-_ownedComment.0" annotatedElement="Polyline-point">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcNvo2EeOw_Nx9vOEGaA" general="MarkedElement"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Polyline-point" name="point" visibility="public" isOrdered="true">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Polyline-point-_ownedComment.0" annotatedElement="Polyline-point">
           <body>a list of 2 or more points making up the polyline.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
@@ -626,29 +626,29 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="QuadraticCurveTo" name="QuadraticCurveTo">
-      <ownedComment xmi:id="QuadraticCurveTo-_ownedComment.0" annotatedElement="CubicCurveTo QuadraticCurveTo">
-        <body>QuadraticCurveTo is a kind of path command that draws a quadratic bézier curve from the current point to a new point using a single control point.</body>
+      <ownedComment xmi:type="uml:Comment" xmi:id="QuadraticCurveTo-_ownedComment.0" annotatedElement="CubicCurveTo QuadraticCurveTo">
+        <body>QuadraticCurveTo is a kind of path command that draws a quadratic b��zier curve from the current point to a new point using a single control point.</body>
       </ownedComment>
-      <generalization xmi:id="_2PhcN_o2EeOw_Nx9vOEGaA" general="PathCommand"/>
-      <ownedAttribute xmi:id="QuadraticCurveTo-control" name="control" visibility="public">
-        <ownedComment xmi:id="QuadraticCurveTo-control-_ownedComment.0" annotatedElement="QuadraticCurveTo-control">
-          <body>the control point of the quadratic bézier curve.</body>
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PhcN_o2EeOw_Nx9vOEGaA" general="PathCommand"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="QuadraticCurveTo-control" name="control" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="QuadraticCurveTo-control-_ownedComment.0" annotatedElement="QuadraticCurveTo-control">
+          <body>the control point of the quadratic b��zier curve.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="QuadraticCurveTo-point" name="point" visibility="public">
-        <ownedComment xmi:id="QuadraticCurveTo-point-_ownedComment.0" annotatedElement="QuadraticCurveTo-point">
-          <body>a point to draw a quadratic bézier curve to from the current point in the coordinate system.</body>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="QuadraticCurveTo-point" name="point" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="QuadraticCurveTo-point-_ownedComment.0" annotatedElement="QuadraticCurveTo-point">
+          <body>a point to draw a quadratic b��zier curve to from the current point in the coordinate system.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="RadialGradient" name="RadialGradient">
-      <ownedComment xmi:id="RadialGradient-_ownedComment.0" annotatedElement="RadialGradient">
+      <ownedComment xmi:type="uml:Comment" xmi:id="RadialGradient-_ownedComment.0" annotatedElement="RadialGradient">
         <body>RadialGradient is a kind of gradient that fills a graphical element by smoothly changing color values in a circle.</body>
       </ownedComment>
-      <ownedRule xmi:id="RadialGradient-valid_center_point" name="valid_center_point" constrainedElement="RadialGradient">
-        <ownedComment xmi:id="RadialGradient-valid_center_point-_ownedComment.0" annotatedElement="RadialGradient-valid_center_point">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="RadialGradient-valid_center_point" name="valid_center_point" constrainedElement="RadialGradient">
+        <ownedComment xmi:type="uml:Comment" xmi:id="RadialGradient-valid_center_point-_ownedComment.0" annotatedElement="RadialGradient-valid_center_point">
           <body>the center point coordinates must be between 0 and 1</body>
         </ownedComment>
         <specification xmi:type="uml:OpaqueExpression" xmi:id="RadialGradient-valid_center_point-_specification">
@@ -656,8 +656,8 @@
           <body>centerX>=0 and centerX&lt;=1 and centerY>=0 and centerY&lt;=1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="RadialGradient-valid_focus_point" name="valid_focus_point" constrainedElement="RadialGradient">
-        <ownedComment xmi:id="RadialGradient-valid_focus_point-_ownedComment.0" annotatedElement="RadialGradient-valid_focus_point">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="RadialGradient-valid_focus_point" name="valid_focus_point" constrainedElement="RadialGradient">
+        <ownedComment xmi:type="uml:Comment" xmi:id="RadialGradient-valid_focus_point-_ownedComment.0" annotatedElement="RadialGradient-valid_focus_point">
           <body>the focus point coordinates must be between 0 and 1</body>
         </ownedComment>
         <specification xmi:type="uml:OpaqueExpression" xmi:id="RadialGradient-valid_focus_point-_specification">
@@ -665,8 +665,8 @@
           <body>focusX>=0 and focusX&lt;=1 and focusY>=0 and focusY&lt;=1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="RadialGradient-valid_radius" name="valid_radius" constrainedElement="RadialGradient">
-        <ownedComment xmi:id="RadialGradient-valid_radius-_ownedComment.0" annotatedElement="RadialGradient-valid_radius">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="RadialGradient-valid_radius" name="valid_radius" constrainedElement="RadialGradient">
+        <ownedComment xmi:type="uml:Comment" xmi:id="RadialGradient-valid_radius-_ownedComment.0" annotatedElement="RadialGradient-valid_radius">
           <body>the radius  must be between 0 and 1</body>
         </ownedComment>
         <specification xmi:type="uml:OpaqueExpression" xmi:id="RadialGradient-valid_radius-_specification">
@@ -674,21 +674,21 @@
           <body>radius>=0 and radius&lt;=1</body>
         </specification>
       </ownedRule>
-      <generalization xmi:id="_2PiDMPo2EeOw_Nx9vOEGaA" general="Gradient"/>
-      <ownedAttribute xmi:id="_u_spINpdEeOltvy1wTDHDA" name="center" visibility="public">
-        <ownedComment xmi:id="_u_spIdpdEeOltvy1wTDHDA" annotatedElement="_u_spINpdEeOltvy1wTDHDA">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PiDMPo2EeOw_Nx9vOEGaA" general="Gradient"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_u_spINpdEeOltvy1wTDHDA" name="center" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_u_spIdpdEeOltvy1wTDHDA" annotatedElement="_u_spINpdEeOltvy1wTDHDA">
           <body>a center point for the radial gradient expressed as a percentage along the x and y axes.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_0SIMENpdEeOltvy1wTDHDA" name="focus" visibility="public">
-        <ownedComment xmi:id="_0SIMEdpdEeOltvy1wTDHDA" annotatedElement="_0SIMENpdEeOltvy1wTDHDA">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_0SIMENpdEeOltvy1wTDHDA" name="focus" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_0SIMEdpdEeOltvy1wTDHDA" annotatedElement="_0SIMENpdEeOltvy1wTDHDA">
           <body>a focus point for the radial gradient expressed as a percentage along the x and y axes.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="RadialGradient-radius" name="radius" visibility="public">
-        <ownedComment xmi:id="RadialGradient-radius-_ownedComment.0" annotatedElement="RadialGradient-radius">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="RadialGradient-radius" name="radius" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="RadialGradient-radius-_ownedComment.0" annotatedElement="RadialGradient-radius">
           <body>a real number (>=0 and >=1) representing a ratio of the graphical element's size that is the radius of the gradient.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
@@ -696,24 +696,24 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Rectangle" name="Rectangle">
-      <ownedComment xmi:id="Rectangle-_ownedComment.0" annotatedElement="Rectangle">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Rectangle-_ownedComment.0" annotatedElement="Rectangle">
         <body>Rectangle is a graphical element that defines a rectangular shape with given bounds. A rectangle may be given rounded corners by setting its corner radius.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qFi4AOhuEeO6TvQHODg78w" name="non_negative_corner_radius" constrainedElement="Rectangle">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="_qFi4AOhuEeO6TvQHODg78w" name="non_negative_corner_radius" constrainedElement="Rectangle">
         <specification xmi:type="uml:OpaqueExpression" xmi:id="_qFi4AehuEeO6TvQHODg78w">
           <language>OCL</language>
           <body>cornerRadius >= 0</body>
         </specification>
       </ownedRule>
-      <generalization xmi:id="_2PiDMfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
-      <ownedAttribute xmi:id="Rectangle-bounds" name="bounds" visibility="public">
-        <ownedComment xmi:id="Rectangle-bounds-_ownedComment.0" annotatedElement="Rectangle-bounds">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PiDMfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Rectangle-bounds" name="bounds" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Rectangle-bounds-_ownedComment.0" annotatedElement="Rectangle-bounds">
           <body>the bounds of the rectangle in the x-y coordinate system.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Bounds"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Rectangle-cornerRadius" name="cornerRadius" visibility="public">
-        <ownedComment xmi:id="Rectangle-cornerRadius-_ownedComment.0" annotatedElement="Rectangle-cornerRadius">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Rectangle-cornerRadius" name="cornerRadius" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Rectangle-cornerRadius-_ownedComment.0" annotatedElement="Rectangle-cornerRadius">
           <body>a radius for the rectangle's rounded corners. When the radius is 0, the rectangle is drawn with sharp corners.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
@@ -722,49 +722,49 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_jfIkENesEeOsUY1jE2-lpg" name="RootCanvas">
-      <ownedComment xmi:id="_jfIkEdesEeOsUY1jE2-lpg" annotatedElement="_jfIkENesEeOsUY1jE2-lpg">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_jfIkEdesEeOsUY1jE2-lpg" annotatedElement="_jfIkENesEeOsUY1jE2-lpg">
         <body>RootCanvas is a kind of canvas that represents the root of containment for all graphical elements that render together.</body>
       </ownedComment>
-      <generalization xmi:id="_2PiDMvo2EeOw_Nx9vOEGaA" general="Canvas"/>
-      <ownedAttribute xmi:id="_jfIkE9esEeOsUY1jE2-lpg" name="backgroundColor" visibility="public">
-        <ownedComment xmi:id="_jfIkFNesEeOsUY1jE2-lpg" annotatedElement="_jfIkE9esEeOsUY1jE2-lpg">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PiDMvo2EeOw_Nx9vOEGaA" general="Canvas"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_jfIkE9esEeOsUY1jE2-lpg" name="backgroundColor" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_jfIkFNesEeOsUY1jE2-lpg" annotatedElement="_jfIkE9esEeOsUY1jE2-lpg">
           <body>An optional paint for the background of the canvas.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Color"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_4Po2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_jfIkFtesEeOsUY1jE2-lpg" name="definitions" visibility="public" type="_DH0DwM5yEeOqlr8E3pzO9g" isOrdered="true" aggregation="composite" association="_qUuAwM51EeOqlr8E3pzO9g">
-        <ownedComment xmi:id="_jfIkF9esEeOsUY1jE2-lpg" annotatedElement="_jfIkFtesEeOsUY1jE2-lpg">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_jfIkFtesEeOsUY1jE2-lpg" name="definitions" visibility="public" type="_DH0DwM5yEeOqlr8E3pzO9g" isOrdered="true" aggregation="composite" association="_qUuAwM51EeOqlr8E3pzO9g">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_jfIkF9esEeOsUY1jE2-lpg" annotatedElement="_jfIkFtesEeOsUY1jE2-lpg">
           <body>An optional definitions element to hold objects commonly referenced by the canvas.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_4fo2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_jfIkGdesEeOsUY1jE2-lpg" name="externalStyleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" isOrdered="true" association="_VJB6MM41EeOqlr8E3pzO9g">
-        <ownedComment xmi:id="_jfIkGtesEeOsUY1jE2-lpg" annotatedElement="_jfIkGdesEeOsUY1jE2-lpg">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_jfIkGdesEeOsUY1jE2-lpg" name="externalStyleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" isOrdered="true" association="_VJB6MM41EeOqlr8E3pzO9g">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_jfIkGtesEeOsUY1jE2-lpg" annotatedElement="_jfIkGdesEeOsUY1jE2-lpg">
           <body>A list of external style sheets that are imported by the canvas.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_4vo2EeOw_Nx9vOEGaA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pe_4_o2EeOw_Nx9vOEGaA" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_V49isA35EeSM9dpvq2CG1g" name="script" visibility="public">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_V49isA35EeSM9dpvq2CG1g" name="script" visibility="public">
         <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WPHY4A35EeSM9dpvq2CG1g"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WPH_8A35EeSM9dpvq2CG1g" value="*"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Rotate" name="Rotate">
-      <ownedComment xmi:id="Rotate-_ownedComment.0" annotatedElement="Rotate">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Rotate-_ownedComment.0" annotatedElement="Rotate">
         <body>Rotate is a kind of transform that rotates a graphical element by a given angle about a given center point in the x-y coordinate system.</body>
       </ownedComment>
-      <generalization xmi:id="_2PiDM_o2EeOw_Nx9vOEGaA" general="Transform"/>
-      <ownedAttribute xmi:id="Rotate-angle" name="angle" visibility="public">
-        <ownedComment xmi:id="Rotate-angle-_ownedComment.0" annotatedElement="Rotate-angle">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PiDM_o2EeOw_Nx9vOEGaA" general="Transform"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Rotate-angle" name="angle" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Rotate-angle-_ownedComment.0" annotatedElement="Rotate-angle">
           <body>a real number representing the angle (in degrees) of rotation. Both positive (clock-wise) and negative (counter-clock-wise) values are allowed.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Rotate-center" name="center" visibility="public">
-        <ownedComment xmi:id="Rotate-center-_ownedComment.0" annotatedElement="Rotate-center">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Rotate-center" name="center" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Rotate-center-_ownedComment.0" annotatedElement="Rotate-center">
           <body>a point in the x-y coordinate system about which the rotation is performed. If the point is not specified, it is assumed to be the origin of the x-y coordinate system.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Point"/>
@@ -772,11 +772,11 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Scale" name="Scale">
-      <ownedComment xmi:id="Scale-_ownedComment.0" annotatedElement="Scale">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Scale-_ownedComment.0" annotatedElement="Scale">
         <body>Scale is a kind of transform that scales (resizes) a graphical element by a given factor in the x-y coordinate system.</body>
       </ownedComment>
-      <ownedRule xmi:id="Scale-non-negative-scale" name="non-negative-scale" constrainedElement="Scale">
-        <ownedComment xmi:id="Scale-non-negative-scale-_ownedComment.0" annotatedElement="Scale-non-negative-scale">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="Scale-non-negative-scale" name="non-negative-scale" constrainedElement="Scale">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Scale-non-negative-scale-_ownedComment.0" annotatedElement="Scale-non-negative-scale">
           <body>scale factors cannot be negative.</body>
         </ownedComment>
         <specification xmi:type="uml:OpaqueExpression" xmi:id="Scale-non-negative-scale-_specification">
@@ -784,44 +784,44 @@
           <body>factorX>=0 and factorY>=0</body>
         </specification>
       </ownedRule>
-      <generalization xmi:id="_2PiDNPo2EeOw_Nx9vOEGaA" general="Transform"/>
-      <ownedAttribute xmi:id="Scale-factorX" name="factorX" visibility="public">
-        <ownedComment xmi:id="Scale-factorX-_ownedComment.0" annotatedElement="Scale-factorX">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PiDNPo2EeOw_Nx9vOEGaA" general="Transform"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Scale-factorX" name="factorX" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Scale-factorX-_ownedComment.0" annotatedElement="Scale-factorX">
           <body>a real number (>=0) representing a scale factor along the x-axis.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Scale-factorY" name="factorY" visibility="public">
-        <ownedComment xmi:id="Scale-factorY-_ownedComment.0" annotatedElement="Scale-factorY">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Scale-factorY" name="factorY" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Scale-factorY-_ownedComment.0" annotatedElement="Scale-factorY">
           <body>a real number(>=0) representing a scale factor along the y-axis.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Skew" name="Skew">
-      <ownedComment xmi:id="Skew-_ownedComment.0" annotatedElement="Skew">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Skew-_ownedComment.0" annotatedElement="Skew">
         <body>Skew is a kind of transform that skews (deforms) a graphical element by given angles in the x-y coordinate system.</body>
       </ownedComment>
-      <generalization xmi:id="_2PiDNfo2EeOw_Nx9vOEGaA" general="Transform"/>
-      <ownedAttribute xmi:id="Skew-angleX" name="angleX" visibility="public">
-        <ownedComment xmi:id="Skew-angleX-_ownedComment.0" annotatedElement="Skew-angleX">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PiDNfo2EeOw_Nx9vOEGaA" general="Transform"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Skew-angleX" name="angleX" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Skew-angleX-_ownedComment.0" annotatedElement="Skew-angleX">
           <body>a real number representing the angle (in degrees) of skew along the x-axis. Both positive (clock-wise) and negative (counter-clock-wise) values are allowed.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Skew-angleY" name="angleY" visibility="public">
-        <ownedComment xmi:id="Skew-angleY-_ownedComment.0" annotatedElement="Skew-angleY">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Skew-angleY" name="angleY" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Skew-angleY-_ownedComment.0" annotatedElement="Skew-angleY">
           <body>a real number representing the angle (in degrees) of skew along the y-axis. Both positive (clock-wise) and negative (counter-clock-wise) values are allowed.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Style" name="Style">
-      <ownedComment xmi:id="Style-_ownedComment.0" annotatedElement="Style">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Style-_ownedComment.0" annotatedElement="Style">
         <body>Style contains formatting properties that affect the appearance or style of graphical elements.</body>
       </ownedComment>
-      <ownedRule xmi:id="Style-valid_font_size" name="valid_font_size">
-        <ownedComment xmi:id="Style-valid_font_size-_ownedComment.0" annotatedElement="Style-valid_font_size">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="Style-valid_font_size" name="valid_font_size">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Style-valid_font_size-_ownedComment.0" annotatedElement="Style-valid_font_size">
           <body>the font size is non-negative</body>
         </ownedComment>
         <specification xmi:type="uml:OpaqueExpression" xmi:id="Style-valid_font_size-_specification">
@@ -829,8 +829,8 @@
           <body>fontSize >=  0</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="Style-valid_fill_opacity" name="valid_fill_opacity">
-        <ownedComment xmi:id="Style-valid_fill_opacity-_ownedComment.0" annotatedElement="Style-valid_fill_opacity">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="Style-valid_fill_opacity" name="valid_fill_opacity">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Style-valid_fill_opacity-_ownedComment.0" annotatedElement="Style-valid_fill_opacity">
           <body>the stroke width is non-negative</body>
         </ownedComment>
         <specification xmi:type="uml:OpaqueExpression" xmi:id="Style-valid_fill_opacity-_specification">
@@ -838,8 +838,8 @@
           <body>fillOpacity >=  0 and fillOpacity &lt;=1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="Style-valid_stroke_width" name="valid_stroke_width">
-        <ownedComment xmi:id="Style-valid_stroke_width-_ownedComment.0" annotatedElement="Style-valid_stroke_width">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="Style-valid_stroke_width" name="valid_stroke_width">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Style-valid_stroke_width-_ownedComment.0" annotatedElement="Style-valid_stroke_width">
           <body>the stroke width is non-negative</body>
         </ownedComment>
         <specification xmi:type="uml:OpaqueExpression" xmi:id="Style-valid_stroke_width-_specification">
@@ -847,8 +847,8 @@
           <body>strokeWidth >=  0</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="Style-valid_dash_length_size" name="valid_dash_length_size">
-        <ownedComment xmi:id="Style-valid_dash_length_size-_ownedComment.0" annotatedElement="Style-valid_dash_length_size">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="Style-valid_dash_length_size" name="valid_dash_length_size">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Style-valid_dash_length_size-_ownedComment.0" annotatedElement="Style-valid_dash_length_size">
           <body>the size of the stroke dash length list must be even.</body>
         </ownedComment>
         <specification xmi:type="uml:OpaqueExpression" xmi:id="Style-valid_dash_length_size-_specification">
@@ -856,8 +856,8 @@
           <body>strokeDashLength->size().mod(2) = 0</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="Style-valid_stroke_opacity" name="valid_stroke_opacity">
-        <ownedComment xmi:id="Style-valid_stroke_opacity-_ownedComment.0" annotatedElement="Style-valid_stroke_opacity">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="Style-valid_stroke_opacity" name="valid_stroke_opacity">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Style-valid_stroke_opacity-_ownedComment.0" annotatedElement="Style-valid_stroke_opacity">
           <body>the opacity of the fill is non-negative</body>
         </ownedComment>
         <specification xmi:type="uml:OpaqueExpression" xmi:id="Style-valid_stroke_opacity-_specification">
@@ -865,110 +865,110 @@
           <body>strokeOpacity >=  0 and strokeOpacity &lt;=1</body>
         </specification>
       </ownedRule>
-      <ownedAttribute xmi:id="Style-fill" name="fill" visibility="public" type="_wz9hsM2cEeOtK5GsJlm5Mw" aggregation="composite" association="A_fill_style">
-        <ownedComment xmi:id="Style-fill-_ownedComment.0" annotatedElement="Style-fill">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Style-fill" name="fill" visibility="public" type="_wz9hsM2cEeOtK5GsJlm5Mw" aggregation="composite" association="A_fill_style">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Style-fill-_ownedComment.0" annotatedElement="Style-fill">
           <body>A paint that is used to fill the enclosed regions of a graphical element. The default is a black paint.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_5fo2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Style-fillOpacity" name="fillOpacity" visibility="public">
-        <ownedComment xmi:id="Style-fillOpacity-_ownedComment.0" annotatedElement="Style-fillOpacity">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Style-fillOpacity" name="fillOpacity" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Style-fillOpacity-_ownedComment.0" annotatedElement="Style-fillOpacity">
           <body>A real number (>=0 and &lt;=1) representing the opacity of the fill used to paint a graphical element. A value of 0 means totally transparent, while a value of 1 means totally opaque. The default is 1.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_5vo2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_KemS4M2oEeOtK5GsJlm5Mw" name="stroke" visibility="public" type="_wz9hsM2cEeOtK5GsJlm5Mw" aggregation="composite" association="_KeO_IM2rEeOtK5GsJlm5Mw">
-        <ownedComment xmi:id="_KemS4c2oEeOtK5GsJlm5Mw" annotatedElement="_KemS4M2oEeOtK5GsJlm5Mw">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_KemS4M2oEeOtK5GsJlm5Mw" name="stroke" visibility="public" type="_wz9hsM2cEeOtK5GsJlm5Mw" aggregation="composite" association="_KeO_IM2rEeOtK5GsJlm5Mw">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_KemS4c2oEeOtK5GsJlm5Mw" annotatedElement="_KemS4M2oEeOtK5GsJlm5Mw">
           <body>A paint that is used to stroke a graphical element. The default is no paint.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_5_o2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Style-strokeWidth" name="strokeWidth" visibility="public">
-        <ownedComment xmi:id="Style-strokeWidth-_ownedComment.0" annotatedElement="Style-strokeWidth">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Style-strokeWidth" name="strokeWidth" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Style-strokeWidth-_ownedComment.0" annotatedElement="Style-strokeWidth">
           <body>A real number (>=0) representing the width of the stroke of a graphical element. A value of 0 specifies no stroke is painted. The default is 1.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_6Po2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Style-strokeOpacity" name="strokeOpacity" visibility="public">
-        <ownedComment xmi:id="Style-strokeOpacity-_ownedComment.0" annotatedElement="Style-strokeOpacity">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Style-strokeOpacity" name="strokeOpacity" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Style-strokeOpacity-_ownedComment.0" annotatedElement="Style-strokeOpacity">
           <body>A real number (>=0 and &lt;=1) representing the opacity of the stroke of a graphical element. A value of 0 means totally transparent, while a value of 1 means totally opaque. The default is 1.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm8Po2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Style-strokeDashLength" name="strokeDashLength" visibility="public" isOrdered="true" isUnique="false">
-        <ownedComment xmi:id="Style-strokeDashLength-_ownedComment.0" annotatedElement="Style-strokeDashLength">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Style-strokeDashLength" name="strokeDashLength" visibility="public" isOrdered="true" isUnique="false">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Style-strokeDashLength-_ownedComment.0" annotatedElement="Style-strokeDashLength">
           <body>A list of real numbers specifying a pattern of alternating dash and gap lengths used in stroking the outline of a graphical element with the first one specifying a dash length. The size of the list is expected to be even. If the list is empty, the stroke is drawn solid. The default is empty list.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm8fo2EeOw_Nx9vOEGaA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pfm8vo2EeOw_Nx9vOEGaA" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Style-fontSize" name="fontSize" visibility="public">
-        <ownedComment xmi:id="Style-fontSize-_ownedComment.0" annotatedElement="Style-fontSize">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Style-fontSize" name="fontSize" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Style-fontSize-_ownedComment.0" annotatedElement="Style-fontSize">
           <body>A real number (>=0) representing the size (in unit of length) of the font used to render a text element. The default is 10.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm8_o2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Style-fontName" name="fontName" visibility="public">
-        <ownedComment xmi:id="Style-fontName-_ownedComment.0" annotatedElement="Style-fontName">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Style-fontName" name="fontName" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Style-fontName-_ownedComment.0" annotatedElement="Style-fontName">
           <body>The name of the font used to render a text element (e.g. &quot;Times New Roman&quot;, &quot;Arial&quot; or &quot;Helvetica&quot;). The default is &quot;Arial&quot;.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm9Po2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Style-fontItalic" name="fontItalic" visibility="public">
-        <ownedComment xmi:id="Style-fontItalic-_ownedComment.0" annotatedElement="Style-fontItalic">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Style-fontItalic" name="fontItalic" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Style-fontItalic-_ownedComment.0" annotatedElement="Style-fontItalic">
           <body>Whether the font used to render a text element has an italic style. The default is false.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Boolean"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm9fo2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Style-fontBold" name="fontBold" visibility="public">
-        <ownedComment xmi:id="Style-fontBold-_ownedComment.0" annotatedElement="Style-fontBold">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Style-fontBold" name="fontBold" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Style-fontBold-_ownedComment.0" annotatedElement="Style-fontBold">
           <body>Whether the font used to render a text element has a bold style. The default is false.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Boolean"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm9vo2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Style-fontStrikeThrough" name="fontDecoration" visibility="public" type="_wgzj4M2WEeOtK5GsJlm5Mw">
-        <ownedComment xmi:id="Style-fontStrikeThrough-_ownedComment.0" annotatedElement="Style-fontStrikeThrough">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Style-fontStrikeThrough" name="fontDecoration" visibility="public" type="_wgzj4M2WEeOtK5GsJlm5Mw">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Style-fontStrikeThrough-_ownedComment.0" annotatedElement="Style-fontStrikeThrough">
           <body>The decoration of the font used to render a text element. The default is no decoration.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm9_o2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_9z_BQM2CEeOX1ohrWoozJQ" name="StyleRule">
-      <ownedComment xmi:id="_XHdkwM2QEeOtK5GsJlm5Mw">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_XHdkwM2QEeOtK5GsJlm5Mw">
         <body>StyleRule selects a set of graphical elements and applies a style to them.</body>
       </ownedComment>
-      <ownedAttribute xmi:id="_2CcQMM2FEeOX1ohrWoozJQ" name="selector" visibility="public" type="_ClirwM2DEeOX1ohrWoozJQ" isOrdered="true" aggregation="composite" association="_OTgnYM2GEeOX1ohrWoozJQ">
-        <ownedComment xmi:id="_2CcQMc2FEeOX1ohrWoozJQ" annotatedElement="_2CcQMM2FEeOX1ohrWoozJQ">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_2CcQMM2FEeOX1ohrWoozJQ" name="selector" visibility="public" type="_ClirwM2DEeOX1ohrWoozJQ" isOrdered="true" aggregation="composite" association="_OTgnYM2GEeOX1ohrWoozJQ">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_2CcQMc2FEeOX1ohrWoozJQ" annotatedElement="_2CcQMM2FEeOX1ohrWoozJQ">
           <body>A set of selectors for graphical elements to apply the rule to.</body>
         </ownedComment>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pfm-Po2EeOw_Nx9vOEGaA" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_DFi6IM2GEeOX1ohrWoozJQ" name="style" visibility="public" type="Style" aggregation="composite" association="_vnz5oM2GEeOX1ohrWoozJQ">
-        <ownedComment xmi:id="_DFi6Ic2GEeOX1ohrWoozJQ" annotatedElement="_DFi6IM2GEeOX1ohrWoozJQ">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_DFi6IM2GEeOX1ohrWoozJQ" name="style" visibility="public" type="Style" aggregation="composite" association="_vnz5oM2GEeOX1ohrWoozJQ">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_DFi6Ic2GEeOX1ohrWoozJQ" annotatedElement="_DFi6IM2GEeOX1ohrWoozJQ">
           <body>A style that is applied to graphical elements selected by this rule.</body>
         </ownedComment>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_ClirwM2DEeOX1ohrWoozJQ" name="StyleSelector">
-      <ownedComment xmi:id="_FfB5AM2REeOtK5GsJlm5Mw">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_FfB5AM2REeOtK5GsJlm5Mw">
         <body>StyleSelector defines criteria that matches a set of graphical elements.</body>
       </ownedComment>
-      <ownedAttribute xmi:id="_OsgrUM2IEeOX1ohrWoozJQ" name="kind" visibility="public" type="_6aYm0OgeEeO6TvQHODg78w">
-        <ownedComment xmi:id="_OsgrUc2IEeOX1ohrWoozJQ" annotatedElement="_OsgrUM2IEeOX1ohrWoozJQ">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_OsgrUM2IEeOX1ohrWoozJQ" name="kind" visibility="public" type="_6aYm0OgeEeO6TvQHODg78w">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_OsgrUc2IEeOX1ohrWoozJQ" annotatedElement="_OsgrUM2IEeOX1ohrWoozJQ">
           <body>The kind of graphical element to select.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm-fo2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_Y03bYM2IEeOX1ohrWoozJQ" name="class" visibility="public" isOrdered="true">
-        <ownedComment xmi:id="_Y03bYc2IEeOX1ohrWoozJQ" annotatedElement="_Y03bYM2IEeOX1ohrWoozJQ">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Y03bYM2IEeOX1ohrWoozJQ" name="class" visibility="public" isOrdered="true">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_Y03bYc2IEeOX1ohrWoozJQ" annotatedElement="_Y03bYM2IEeOX1ohrWoozJQ">
           <body>A set of strings representing classes of graphical elements to select. Selected elements must have all those classes.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
@@ -977,11 +977,11 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_4ytfwM2CEeOX1ohrWoozJQ" name="StyleSheet">
-      <ownedComment xmi:id="_WuWzIM2OEeOtK5GsJlm5Mw">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_WuWzIM2OEeOtK5GsJlm5Mw">
         <body>StyleSheet defines a list of style rules that apply to graphical elements in a canvas.</body>
       </ownedComment>
-      <ownedAttribute xmi:id="_TqPtcM2EEeOX1ohrWoozJQ" name="rule" visibility="public" type="_9z_BQM2CEeOX1ohrWoozJQ" isOrdered="true" aggregation="composite" association="_QZkcUM2DEeOX1ohrWoozJQ">
-        <ownedComment xmi:id="_TqPtcc2EEeOX1ohrWoozJQ" annotatedElement="_TqPtcM2EEeOX1ohrWoozJQ">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_TqPtcM2EEeOX1ohrWoozJQ" name="rule" visibility="public" type="_9z_BQM2CEeOX1ohrWoozJQ" isOrdered="true" aggregation="composite" association="_QZkcUM2DEeOX1ohrWoozJQ">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_TqPtcc2EEeOX1ohrWoozJQ" annotatedElement="_TqPtcM2EEeOX1ohrWoozJQ">
           <body>A list of style rules that apply to graphical elements.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm_Po2EeOw_Nx9vOEGaA"/>
@@ -989,284 +989,284 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Text" name="Text">
-      <ownedComment xmi:id="Text-_ownedComment.0" annotatedElement="Text">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Text-_ownedComment.0" annotatedElement="Text">
         <body>Text is a graphical element that defines a shape that renders a character string at a given position.</body>
       </ownedComment>
-      <ownedRule xmi:id="_dPn0oO0zEeOCPtJ2AfZp5A" name="data_cannot_be_empty" constrainedElement="Text">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="_dPn0oO0zEeOCPtJ2AfZp5A" name="data_cannot_be_empty" constrainedElement="Text">
         <specification xmi:type="uml:OpaqueExpression" xmi:id="_dPn0oe0zEeOCPtJ2AfZp5A">
           <language>OCL</language>
           <body>data->notEmpty() implies data.size() > 0</body>
         </specification>
       </ownedRule>
-      <generalization xmi:id="_2PiDNvo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
-      <ownedAttribute xmi:id="Text-data" name="data" visibility="public">
-        <ownedComment xmi:id="Text-data-_ownedComment.0" annotatedElement="Text-data">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PiDNvo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Text-data" name="data" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Text-data-_ownedComment.0" annotatedElement="Text-data">
           <body>the text as a string of characters.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Text-bounds" name="position" visibility="public">
-        <ownedComment xmi:id="Text-bounds-_ownedComment.0" annotatedElement="Text-bounds">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Text-bounds" name="bounds" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Text-bounds-_ownedComment.0" annotatedElement="Text-bounds">
           <body>the bounds inside which the text is rendered (possibly wrapped into multiple lines)</body>
         </ownedComment>
-        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+        <type xmi:type="uml:DataType" href="DC.uml#Bounds"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_gfifwBOfEeSXerk-XJQMGw" name="anchor" type="_E6CjYBOfEeSXerk-XJQMGw">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_gfifwBOfEeSXerk-XJQMGw" name="anchor" type="_E6CjYBOfEeSXerk-XJQMGw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_k-EgkBOfEeSXerk-XJQMGw"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_k-FHoBOfEeSXerk-XJQMGw" value="1"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Transform" name="Transform" isAbstract="true">
-      <ownedComment xmi:id="Transform-_ownedComment.0" annotatedElement="Transform">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Transform-_ownedComment.0" annotatedElement="Transform">
         <body>Transform defines an operation that changes the geometry of a graphical element in a specific way.</body>
       </ownedComment>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="Translate" name="Translate">
-      <ownedComment xmi:id="Translate-_ownedComment.0" annotatedElement="Translate">
+      <ownedComment xmi:type="uml:Comment" xmi:id="Translate-_ownedComment.0" annotatedElement="Translate">
         <body>Translate is a kind of transform that translates (moves) a graphical element by a given delta along the x-y coordinate system.</body>
       </ownedComment>
-      <generalization xmi:id="_2PiDN_o2EeOw_Nx9vOEGaA" general="Transform"/>
-      <ownedAttribute xmi:id="Translate-deltaX" name="deltaX" visibility="public">
-        <ownedComment xmi:id="Translate-deltaX-_ownedComment.0" annotatedElement="Translate-deltaX">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PiDN_o2EeOw_Nx9vOEGaA" general="Transform"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Translate-deltaX" name="deltaX" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Translate-deltaX-_ownedComment.0" annotatedElement="Translate-deltaX">
           <body>a real number representing a translate delta along the x-axis. Both positive and negative values are allowed.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="Translate-deltaY" name="deltaY" visibility="public">
-        <ownedComment xmi:id="Translate-deltaY-_ownedComment.0" annotatedElement="Translate-deltaY">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="Translate-deltaY" name="deltaY" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="Translate-deltaY-_ownedComment.0" annotatedElement="Translate-deltaY">
           <body>a real number representing a translate delta along the y-axis. Both positive and negative values are allowed.</body>
         </ownedComment>
         <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_wGwIsNeoEeOgmPOh7kSfHA" name="Use">
-      <ownedComment xmi:id="_wGwIsdeoEeOgmPOh7kSfHA" annotatedElement="_wGwIsNeoEeOgmPOh7kSfHA">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_wGwIsdeoEeOgmPOh7kSfHA" annotatedElement="_wGwIsNeoEeOgmPOh7kSfHA">
         <body>Rectangle is a graphical element that defines a rectangular shape with given bounds. A rectangle may be given rounded corners by setting its corner radius.</body>
       </ownedComment>
-      <ownedRule xmi:id="_oxx7UOh0EeO6TvQHODg78w" name="referenced_element_has_id" constrainedElement="_wGwIsNeoEeOgmPOh7kSfHA">
+      <ownedRule xmi:type="uml:Constraint" xmi:id="_oxx7UOh0EeO6TvQHODg78w" name="referenced_element_has_id" constrainedElement="_wGwIsNeoEeOgmPOh7kSfHA">
         <specification xmi:type="uml:OpaqueExpression" xmi:id="_oxx7Ueh0EeO6TvQHODg78w">
           <language>OCL</language>
           <body>referencedElement->notEmpty() implies referencedElement.id->notEmpty()</body>
         </specification>
       </ownedRule>
-      <generalization xmi:id="_2PiDOPo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
-      <ownedAttribute xmi:id="_wGwIs9eoEeOgmPOh7kSfHA" name="bounds" visibility="public">
-        <ownedComment xmi:id="_wGwItNeoEeOgmPOh7kSfHA" annotatedElement="_wGwIs9eoEeOgmPOh7kSfHA">
+      <generalization xmi:type="uml:Generalization" xmi:id="_2PiDOPo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_wGwIs9eoEeOgmPOh7kSfHA" name="bounds" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wGwItNeoEeOgmPOh7kSfHA" annotatedElement="_wGwIs9eoEeOgmPOh7kSfHA">
           <body>the bounds of the rectangle in the x-y coordinate system.</body>
         </ownedComment>
         <type xmi:type="uml:DataType" href="DC.uml#Bounds"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PgOAPo2EeOw_Nx9vOEGaA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_im5DIOHhEeO71tdCkM4EDw" name="referencedElement" visibility="public" type="GraphicalElement" isOrdered="true" association="_zbtccOHnEeO71tdCkM4EDw">
-        <ownedComment xmi:id="_im5DIeHhEeO71tdCkM4EDw" annotatedElement="_im5DIOHhEeO71tdCkM4EDw">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_im5DIOHhEeO71tdCkM4EDw" name="referencedElement" visibility="public" type="GraphicalElement" isOrdered="true" association="_zbtccOHnEeO71tdCkM4EDw">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_im5DIeHhEeO71tdCkM4EDw" annotatedElement="_im5DIOHhEeO71tdCkM4EDw">
           <body>A list of graphical elements that are members of this group.</body>
         </ownedComment>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Enumeration" xmi:id="_wgzj4M2WEeOtK5GsJlm5Mw" name="FontDecoration">
-      <ownedComment xmi:id="_2Xj74M2WEeOtK5GsJlm5Mw">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_2Xj74M2WEeOtK5GsJlm5Mw">
         <body>The kind of decoration applied to a font.</body>
       </ownedComment>
-      <ownedLiteral xmi:id="_BWypkM2XEeOtK5GsJlm5Mw" name="underline">
-        <ownedComment xmi:id="_EPxo4M2XEeOtK5GsJlm5Mw">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_BWypkM2XEeOtK5GsJlm5Mw" name="underline">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_EPxo4M2XEeOtK5GsJlm5Mw">
           <body>The font is underlined.</body>
         </ownedComment>
       </ownedLiteral>
-      <ownedLiteral xmi:id="_G7EKcM2XEeOtK5GsJlm5Mw" name="overline">
-        <ownedComment xmi:id="_G7EKcc2XEeOtK5GsJlm5Mw">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_G7EKcM2XEeOtK5GsJlm5Mw" name="overline">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_G7EKcc2XEeOtK5GsJlm5Mw">
           <body>The font is overlined.</body>
         </ownedComment>
       </ownedLiteral>
-      <ownedLiteral xmi:id="_HEvq4M2XEeOtK5GsJlm5Mw" name="lineThrough">
-        <ownedComment xmi:id="_HEvq4c2XEeOtK5GsJlm5Mw">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_HEvq4M2XEeOtK5GsJlm5Mw" name="lineThrough">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_HEvq4c2XEeOtK5GsJlm5Mw">
           <body>The font is striked through.</body>
         </ownedComment>
       </ownedLiteral>
     </packagedElement>
     <packagedElement xmi:type="uml:Enumeration" xmi:id="_6aYm0OgeEeO6TvQHODg78w" name="ElementKind">
-      <ownedComment xmi:id="_6aYm0egeEeO6TvQHODg78w">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_6aYm0egeEeO6TvQHODg78w">
         <body>The kind of graphical element.</body>
       </ownedComment>
-      <ownedLiteral xmi:id="_6aYm0ugeEeO6TvQHODg78w" name="canvas">
-        <ownedComment xmi:id="_6aYm0-geEeO6TvQHODg78w">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_6aYm0ugeEeO6TvQHODg78w" name="canvas">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_6aYm0-geEeO6TvQHODg78w">
           <body>The Canvas element kind</body>
         </ownedComment>
       </ownedLiteral>
-      <ownedLiteral xmi:id="_TObvQOgfEeO6TvQHODg78w" name="circle">
-        <ownedComment xmi:id="_TObvQegfEeO6TvQHODg78w">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_TObvQOgfEeO6TvQHODg78w" name="circle">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_TObvQegfEeO6TvQHODg78w">
           <body>The Circle element kind</body>
         </ownedComment>
       </ownedLiteral>
-      <ownedLiteral xmi:id="_XmBakOgfEeO6TvQHODg78w" name="clipPath">
-        <ownedComment xmi:id="_XmBakegfEeO6TvQHODg78w">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XmBakOgfEeO6TvQHODg78w" name="clipPath">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_XmBakegfEeO6TvQHODg78w">
           <body>The ClipPath element kind</body>
         </ownedComment>
       </ownedLiteral>
-      <ownedLiteral xmi:id="_iEuOEOgfEeO6TvQHODg78w" name="ellipse">
-        <ownedComment xmi:id="_iEuOEegfEeO6TvQHODg78w">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_iEuOEOgfEeO6TvQHODg78w" name="ellipse">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iEuOEegfEeO6TvQHODg78w">
           <body>The Ellipse element kind</body>
         </ownedComment>
       </ownedLiteral>
-      <ownedLiteral xmi:id="_nqm4gOgfEeO6TvQHODg78w" name="group">
-        <ownedComment xmi:id="_nqm4gegfEeO6TvQHODg78w">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_nqm4gOgfEeO6TvQHODg78w" name="group">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_nqm4gegfEeO6TvQHODg78w">
           <body>The Group element kind</body>
         </ownedComment>
       </ownedLiteral>
-      <ownedLiteral xmi:id="_n3HqgOgfEeO6TvQHODg78w" name="image">
-        <ownedComment xmi:id="_n3IRkOgfEeO6TvQHODg78w">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_n3HqgOgfEeO6TvQHODg78w" name="image">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_n3IRkOgfEeO6TvQHODg78w">
           <body>The Image element kind</body>
         </ownedComment>
       </ownedLiteral>
-      <ownedLiteral xmi:id="_n9h0gOgfEeO6TvQHODg78w" name="line">
-        <ownedComment xmi:id="_n9h0gegfEeO6TvQHODg78w">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_n9h0gOgfEeO6TvQHODg78w" name="line">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_n9h0gegfEeO6TvQHODg78w">
           <body>The Line element kind</body>
         </ownedComment>
       </ownedLiteral>
-      <ownedLiteral xmi:id="_oEA3AOgfEeO6TvQHODg78w" name="marker">
-        <ownedComment xmi:id="_oEA3AegfEeO6TvQHODg78w">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_oEA3AOgfEeO6TvQHODg78w" name="marker">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_oEA3AegfEeO6TvQHODg78w">
           <body>The Marker element kind</body>
         </ownedComment>
       </ownedLiteral>
-      <ownedLiteral xmi:id="_oJbigOgfEeO6TvQHODg78w" name="path">
-        <ownedComment xmi:id="_oJbigegfEeO6TvQHODg78w">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_oJbigOgfEeO6TvQHODg78w" name="path">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_oJbigegfEeO6TvQHODg78w">
           <body>The Path element kind</body>
         </ownedComment>
       </ownedLiteral>
-      <ownedLiteral xmi:id="_oO2OAOgfEeO6TvQHODg78w" name="polygon">
-        <ownedComment xmi:id="_oO2OAegfEeO6TvQHODg78w">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_oO2OAOgfEeO6TvQHODg78w" name="polygon">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_oO2OAegfEeO6TvQHODg78w">
           <body>The Polygon element kind</body>
         </ownedComment>
       </ownedLiteral>
-      <ownedLiteral xmi:id="_oXUNgOgfEeO6TvQHODg78w" name="polyline">
-        <ownedComment xmi:id="_oXUNgegfEeO6TvQHODg78w">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_oXUNgOgfEeO6TvQHODg78w" name="polyline">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_oXUNgegfEeO6TvQHODg78w">
           <body>The Polyline element kind</body>
         </ownedComment>
       </ownedLiteral>
-      <ownedLiteral xmi:id="_ofLJAOgfEeO6TvQHODg78w" name="rectangle">
-        <ownedComment xmi:id="_ofLJAegfEeO6TvQHODg78w">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ofLJAOgfEeO6TvQHODg78w" name="rectangle">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_ofLJAegfEeO6TvQHODg78w">
           <body>The Rectangle element kind</body>
         </ownedComment>
       </ownedLiteral>
-      <ownedLiteral xmi:id="_oluc8OgfEeO6TvQHODg78w" name="text">
-        <ownedComment xmi:id="_oluc8egfEeO6TvQHODg78w">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_oluc8OgfEeO6TvQHODg78w" name="text">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_oluc8egfEeO6TvQHODg78w">
           <body>The Text element kind</body>
         </ownedComment>
       </ownedLiteral>
-      <ownedLiteral xmi:id="_oz2_kOgfEeO6TvQHODg78w" name="use">
-        <ownedComment xmi:id="_oz2_kegfEeO6TvQHODg78w">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_oz2_kOgfEeO6TvQHODg78w" name="use">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_oz2_kegfEeO6TvQHODg78w">
           <body>The Use element kind</body>
         </ownedComment>
       </ownedLiteral>
     </packagedElement>
     <packagedElement xmi:type="uml:Enumeration" xmi:id="_E6CjYBOfEeSXerk-XJQMGw" name="TextAnchor">
-      <ownedLiteral xmi:id="_Gog3YBOfEeSXerk-XJQMGw" name="start"/>
-      <ownedLiteral xmi:id="_NUm78BOfEeSXerk-XJQMGw" name="middle"/>
-      <ownedLiteral xmi:id="_N_-0MBOfEeSXerk-XJQMGw" name="end"/>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Gog3YBOfEeSXerk-XJQMGw" name="start"/>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_NUm78BOfEeSXerk-XJQMGw" name="middle"/>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_N_-0MBOfEeSXerk-XJQMGw" name="end"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_qUuAwM51EeOqlr8E3pzO9g" name="A_definitions_canvas" memberEnd="_jfIkFtesEeOsUY1jE2-lpg _qUuAwc51EeOqlr8E3pzO9g">
-      <ownedEnd xmi:id="_qUuAwc51EeOqlr8E3pzO9g" name="canvas" visibility="public" type="_jfIkENesEeOsUY1jE2-lpg" association="_qUuAwM51EeOqlr8E3pzO9g"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_qUuAwc51EeOqlr8E3pzO9g" name="canvas" visibility="public" type="_jfIkENesEeOsUY1jE2-lpg" association="_qUuAwM51EeOqlr8E3pzO9g"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_VJB6MM41EeOqlr8E3pzO9g" name="A_externalStyleSheet_canvas" memberEnd="_jfIkGdesEeOsUY1jE2-lpg _VJB6Mc41EeOqlr8E3pzO9g">
-      <ownedEnd xmi:id="_VJB6Mc41EeOqlr8E3pzO9g" name="canvas" visibility="public" type="_jfIkENesEeOsUY1jE2-lpg" association="_VJB6MM41EeOqlr8E3pzO9g">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_VJB6Mc41EeOqlr8E3pzO9g" name="canvas" visibility="public" type="_jfIkENesEeOsUY1jE2-lpg" association="_VJB6MM41EeOqlr8E3pzO9g">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PgOAfo2EeOw_Nx9vOEGaA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2PgOAvo2EeOw_Nx9vOEGaA" value="*"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_Nti6EM53EeOqlr8E3pzO9g" name="A_definition_definitions" memberEnd="_zSdxIM5wEeOqlr8E3pzO9g _Nti6Ec53EeOqlr8E3pzO9g">
-      <ownedEnd xmi:id="_Nti6Ec53EeOqlr8E3pzO9g" name="definitions" visibility="public" type="_DH0DwM5yEeOqlr8E3pzO9g" association="_Nti6EM53EeOqlr8E3pzO9g"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_Nti6Ec53EeOqlr8E3pzO9g" name="definitions" visibility="public" type="_DH0DwM5yEeOqlr8E3pzO9g" association="_Nti6EM53EeOqlr8E3pzO9g"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_packagedElement.47" name="A_styleSheet_definitions" memberEnd="Canvas-packagedStyle _packagedElement.47-canvas">
-      <ownedEnd xmi:id="_packagedElement.47-canvas" name="definitions" visibility="public" type="_DH0DwM5yEeOqlr8E3pzO9g" association="_packagedElement.47"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_packagedElement.47-canvas" name="definitions" visibility="public" type="_DH0DwM5yEeOqlr8E3pzO9g" association="_packagedElement.47"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="A_clipPath_clippedElement" name="A_clipPath_clippedElement" memberEnd="GraphicalElement-clipPath ClipPath-clippedElement">
-      <ownedEnd xmi:id="ClipPath-clippedElement" name="clippedElement" visibility="public" type="GraphicalElement" association="A_clipPath_clippedElement">
+      <ownedEnd xmi:type="uml:Property" xmi:id="ClipPath-clippedElement" name="clippedElement" visibility="public" type="GraphicalElement" association="A_clipPath_clippedElement">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PgOA_o2EeOw_Nx9vOEGaA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2PgOBPo2EeOw_Nx9vOEGaA" value="*"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="A_localStyle_styledElement" name="A_style_styledElement" memberEnd="GraphicalElement-localStyle A_localStyle_styledElement-styledElement">
-      <ownedEnd xmi:id="A_localStyle_styledElement-styledElement" name="styledElement" visibility="public" type="GraphicalElement" association="A_localStyle_styledElement">
+      <ownedEnd xmi:type="uml:Property" xmi:id="A_localStyle_styledElement-styledElement" name="styledElement" visibility="public" type="GraphicalElement" association="A_localStyle_styledElement">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PgOBfo2EeOw_Nx9vOEGaA"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_TVnmYM42EeOqlr8E3pzO9g" name="A_transform_transformedElement" memberEnd="GraphicalElement-transform _TVnmYc42EeOqlr8E3pzO9g">
-      <ownedEnd xmi:id="_TVnmYc42EeOqlr8E3pzO9g" name="transformedElement" visibility="public" type="GraphicalElement" association="_TVnmYM42EeOqlr8E3pzO9g">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_TVnmYc42EeOqlr8E3pzO9g" name="transformedElement" visibility="public" type="GraphicalElement" association="_TVnmYM42EeOqlr8E3pzO9g">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1EPo2EeOw_Nx9vOEGaA"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_hQOVgM41EeOqlr8E3pzO9g" name="A_stop_gradient" memberEnd="Gradient-stop _hQO8kM41EeOqlr8E3pzO9g">
-      <ownedEnd xmi:id="_hQO8kM41EeOqlr8E3pzO9g" name="gradient" visibility="public" type="Gradient" association="_hQOVgM41EeOqlr8E3pzO9g"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_hQO8kM41EeOqlr8E3pzO9g" name="gradient" visibility="public" type="Gradient" association="_hQOVgM41EeOqlr8E3pzO9g"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="A_member_group" name="A_member_group" memberEnd="Group-member GraphicalElement-group"/>
     <packagedElement xmi:type="uml:Association" xmi:id="A_endMarker_markedElement" name="A_endMarker_markedElement" memberEnd="MarkedElement-endMarker A_endMarker_markedElement-markedElement">
-      <ownedEnd xmi:id="A_endMarker_markedElement-markedElement" name="markedElement" visibility="public" type="MarkedElement" association="A_endMarker_markedElement">
+      <ownedEnd xmi:type="uml:Property" xmi:id="A_endMarker_markedElement-markedElement" name="markedElement" visibility="public" type="MarkedElement" association="A_endMarker_markedElement">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1Efo2EeOw_Nx9vOEGaA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pg1Evo2EeOw_Nx9vOEGaA" value="*"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="A_midMarker_markedElement" name="A_midMarker_markedElement" memberEnd="MarkedElement-midMarker A_midMarker_markedElement-markedElement">
-      <ownedEnd xmi:id="A_midMarker_markedElement-markedElement" name="markedElement" visibility="public" type="MarkedElement" association="A_midMarker_markedElement">
+      <ownedEnd xmi:type="uml:Property" xmi:id="A_midMarker_markedElement-markedElement" name="markedElement" visibility="public" type="MarkedElement" association="A_midMarker_markedElement">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1E_o2EeOw_Nx9vOEGaA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pg1FPo2EeOw_Nx9vOEGaA" value="*"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="A_startMarker_markedElement" name="A_startMarker_markedElement" memberEnd="MarkedElement-startMarker A_startMarker_markedElement-markedElement">
-      <ownedEnd xmi:id="A_startMarker_markedElement-markedElement" name="markedElement" visibility="public" type="MarkedElement" association="A_startMarker_markedElement">
+      <ownedEnd xmi:type="uml:Property" xmi:id="A_startMarker_markedElement-markedElement" name="markedElement" visibility="public" type="MarkedElement" association="A_startMarker_markedElement">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1Ffo2EeOw_Nx9vOEGaA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pg1Fvo2EeOw_Nx9vOEGaA" value="*"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_VGk7AM2kEeOtK5GsJlm5Mw" name="A_paintServer_paint" memberEnd="_dR8eIM2dEeOtK5GsJlm5Mw _VGk7Ac2kEeOtK5GsJlm5Mw">
-      <ownedEnd xmi:id="_VGk7Ac2kEeOtK5GsJlm5Mw" name="paint" visibility="public" type="_wz9hsM2cEeOtK5GsJlm5Mw" association="_VGk7AM2kEeOtK5GsJlm5Mw">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_VGk7Ac2kEeOtK5GsJlm5Mw" name="paint" visibility="public" type="_wz9hsM2cEeOtK5GsJlm5Mw" association="_VGk7AM2kEeOtK5GsJlm5Mw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1F_o2EeOw_Nx9vOEGaA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pg1GPo2EeOw_Nx9vOEGaA" value="*"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_oEGFIM55EeOqlr8E3pzO9g" name="A_transform_paintServer" memberEnd="Fill-transform _oEGFIc55EeOqlr8E3pzO9g">
-      <ownedEnd xmi:id="_oEGFIc55EeOqlr8E3pzO9g" name="paintServer" visibility="public" type="Fill" association="_oEGFIM55EeOqlr8E3pzO9g">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_oEGFIc55EeOqlr8E3pzO9g" name="paintServer" visibility="public" type="Fill" association="_oEGFIM55EeOqlr8E3pzO9g">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1Gfo2EeOw_Nx9vOEGaA"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_-INckM55EeOqlr8E3pzO9g" name="A_command_path" memberEnd="Path-command _-INckc55EeOqlr8E3pzO9g">
-      <ownedEnd xmi:id="_-INckc55EeOqlr8E3pzO9g" name="path" visibility="public" type="Path" association="_-INckM55EeOqlr8E3pzO9g"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_-INckc55EeOqlr8E3pzO9g" name="path" visibility="public" type="Path" association="_-INckM55EeOqlr8E3pzO9g"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="A_tile_pattern" name="A_tile_pattern" memberEnd="Pattern-tile A_tile_pattern-pattern">
-      <ownedEnd xmi:id="A_tile_pattern-pattern" name="pattern" visibility="public" type="Pattern" association="A_tile_pattern">
+      <ownedEnd xmi:type="uml:Property" xmi:id="A_tile_pattern-pattern" name="pattern" visibility="public" type="Pattern" association="A_tile_pattern">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1Gvo2EeOw_Nx9vOEGaA"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="A_fill_style" name="A_fill_style" memberEnd="Style-fill A_fill_style-style">
-      <ownedEnd xmi:id="A_fill_style-style" name="style" visibility="public" type="Style" association="A_fill_style">
+      <ownedEnd xmi:type="uml:Property" xmi:id="A_fill_style-style" name="style" visibility="public" type="Style" association="A_fill_style">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1G_o2EeOw_Nx9vOEGaA"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_KeO_IM2rEeOtK5GsJlm5Mw" name="A_stroke_style" memberEnd="_KemS4M2oEeOtK5GsJlm5Mw _KeO_Ic2rEeOtK5GsJlm5Mw">
-      <ownedEnd xmi:id="_KeO_Ic2rEeOtK5GsJlm5Mw" name="style" visibility="public" type="Style" association="_KeO_IM2rEeOtK5GsJlm5Mw">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_KeO_Ic2rEeOtK5GsJlm5Mw" name="style" visibility="public" type="Style" association="_KeO_IM2rEeOtK5GsJlm5Mw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1HPo2EeOw_Nx9vOEGaA"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_OTgnYM2GEeOX1ohrWoozJQ" name="A_selector_styleRule" memberEnd="_2CcQMM2FEeOX1ohrWoozJQ _OTgnYc2GEeOX1ohrWoozJQ">
-      <ownedEnd xmi:id="_OTgnYc2GEeOX1ohrWoozJQ" name="styleRule" visibility="public" type="_9z_BQM2CEeOX1ohrWoozJQ" association="_OTgnYM2GEeOX1ohrWoozJQ"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_OTgnYc2GEeOX1ohrWoozJQ" name="styleRule" visibility="public" type="_9z_BQM2CEeOX1ohrWoozJQ" association="_OTgnYM2GEeOX1ohrWoozJQ"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_vnz5oM2GEeOX1ohrWoozJQ" name="A_style_styleRule" memberEnd="_DFi6IM2GEeOX1ohrWoozJQ _vnz5oc2GEeOX1ohrWoozJQ">
-      <ownedEnd xmi:id="_vnz5oc2GEeOX1ohrWoozJQ" name="styleRule" visibility="public" type="_9z_BQM2CEeOX1ohrWoozJQ" association="_vnz5oM2GEeOX1ohrWoozJQ">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_vnz5oc2GEeOX1ohrWoozJQ" name="styleRule" visibility="public" type="_9z_BQM2CEeOX1ohrWoozJQ" association="_vnz5oM2GEeOX1ohrWoozJQ">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1Hfo2EeOw_Nx9vOEGaA"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_QZkcUM2DEeOX1ohrWoozJQ" name="A_rule_styleSheet" memberEnd="_TqPtcM2EEeOX1ohrWoozJQ _ZfKSYM2EEeOX1ohrWoozJQ">
-      <ownedEnd xmi:id="_ZfKSYM2EEeOX1ohrWoozJQ" name="styleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" association="_QZkcUM2DEeOX1ohrWoozJQ"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_ZfKSYM2EEeOX1ohrWoozJQ" name="styleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" association="_QZkcUM2DEeOX1ohrWoozJQ"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_zbtccOHnEeO71tdCkM4EDw" name="A_referencedElement_use" memberEnd="_im5DIOHhEeO71tdCkM4EDw _zbtcceHnEeO71tdCkM4EDw">
-      <ownedEnd xmi:id="_zbtcceHnEeO71tdCkM4EDw" name="use" visibility="public" type="_wGwIsNeoEeOgmPOh7kSfHA" association="_zbtccOHnEeO71tdCkM4EDw">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_zbtcceHnEeO71tdCkM4EDw" name="use" visibility="public" type="_wGwIsNeoEeOgmPOh7kSfHA" association="_zbtccOHnEeO71tdCkM4EDw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1Hvo2EeOw_Nx9vOEGaA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pg1H_o2EeOw_Nx9vOEGaA" value="*"/>
       </ownedEnd>
     </packagedElement>
-    <profileApplication xmi:id="_mgdyEM1vEeOX1ohrWoozJQ">
-      <eAnnotations xmi:id="_mgdyEc1vEeOX1ohrWoozJQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_mgdyEM1vEeOX1ohrWoozJQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mgdyEc1vEeOX1ohrWoozJQ" 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"/>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
     </profileApplication>
     <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
       
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java
index 50f8cbd487f..92b37f34562 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java
@@ -14,6 +14,7 @@ package org.eclipse.papyrus.dd.dc;
 import java.util.Map;
 
 import org.eclipse.emf.common.util.DiagnosticChain;
+
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -59,7 +60,7 @@ public interface Bounds extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>X</em>' attribute.
+	 *        the new value of the '<em>X</em>' attribute.
 	 * @see #isSetX()
 	 * @see #unsetX()
 	 * @see #getX()
@@ -110,7 +111,7 @@ public interface Bounds extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Y</em>' attribute.
+	 *        the new value of the '<em>Y</em>' attribute.
 	 * @see #isSetY()
 	 * @see #unsetY()
 	 * @see #getY()
@@ -161,7 +162,7 @@ public interface Bounds extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Width</em>' attribute.
+	 *        the new value of the '<em>Width</em>' attribute.
 	 * @see #isSetWidth()
 	 * @see #unsetWidth()
 	 * @see #getWidth()
@@ -213,7 +214,7 @@ public interface Bounds extends EObject {
 	 * -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Height</em>' attribute.
+	 *        the new value of the '<em>Height</em>' attribute.
 	 * @see #getHeight()
 	 * @generated
 	 */
@@ -247,10 +248,10 @@ public interface Bounds extends EObject {
 	 * the width of bounds cannot be negative
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model
 	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='width >= 0'"
 	 * @generated
@@ -262,10 +263,10 @@ public interface Bounds extends EObject {
 	 * the height of bounds cannot be negative
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model
 	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='height >=0'"
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCPackage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCPackage.java
index 028a718bb92..2602afb5cc9 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCPackage.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCPackage.java
@@ -392,7 +392,8 @@ public interface DCPackage extends EPackage {
 	EAttribute getDimension_Height();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dc.Dimension#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dc.Dimension#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Non Negative Width</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -404,7 +405,8 @@ public interface DCPackage extends EPackage {
 	EOperation getDimension__NonNegativeWidth__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dc.Dimension#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dc.Dimension#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Non Negative Height</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -470,7 +472,8 @@ public interface DCPackage extends EPackage {
 	EAttribute getBounds_Height();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dc.Bounds#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dc.Bounds#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Non Negative Width</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -482,7 +485,8 @@ public interface DCPackage extends EPackage {
 	EOperation getBounds__NonNegativeWidth__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dc.Bounds#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dc.Bounds#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Non Negative Height</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java
index b81a3fc45d2..476319085eb 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java
@@ -14,6 +14,7 @@ package org.eclipse.papyrus.dd.dc;
 import java.util.Map;
 
 import org.eclipse.emf.common.util.DiagnosticChain;
+
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -57,7 +58,7 @@ public interface Dimension extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Width</em>' attribute.
+	 *        the new value of the '<em>Width</em>' attribute.
 	 * @see #isSetWidth()
 	 * @see #unsetWidth()
 	 * @see #getWidth()
@@ -108,7 +109,7 @@ public interface Dimension extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Height</em>' attribute.
+	 *        the new value of the '<em>Height</em>' attribute.
 	 * @see #isSetHeight()
 	 * @see #unsetHeight()
 	 * @see #getHeight()
@@ -144,10 +145,10 @@ public interface Dimension extends EObject {
 	 * the width of a dimension cannot be negative
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model
 	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='width >=0'"
 	 * @generated
@@ -159,10 +160,10 @@ public interface Dimension extends EObject {
 	 * the height of a dimension cannot be negative
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model
 	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='height >=0'"
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java
index 231d9601dbf..437fb325048 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java
@@ -409,7 +409,7 @@ public enum KnownColor implements Enumerator {
 	 *
 	 * @generated
 	 */
-	private static final KnownColor[] VALUES_ARRAY = new KnownColor[] { MAROON, RED, ORANGE, YELLOW, OLIVE, PURPLE, FUCHSIA, WHITE, LIME, GREEN, NAVY, BLUE, AQUA, TEAL, BLACK, SILVER, GRAY, };
+	private static final KnownColor[] VALUES_ARRAY = new KnownColor[]{ MAROON, RED, ORANGE, YELLOW, OLIVE, PURPLE, FUCHSIA, WHITE, LIME, GREEN, NAVY, BLUE, AQUA, TEAL, BLACK, SILVER, GRAY, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Known Color</b></em>' enumerators.
@@ -426,9 +426,9 @@ public enum KnownColor implements Enumerator {
 	 * @generated
 	 */
 	public static KnownColor get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			KnownColor result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -442,9 +442,9 @@ public enum KnownColor implements Enumerator {
 	 * @generated
 	 */
 	public static KnownColor getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			KnownColor result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -458,7 +458,7 @@ public enum KnownColor implements Enumerator {
 	 * @generated
 	 */
 	public static KnownColor get(int value) {
-		switch (value) {
+		switch(value) {
 		case MAROON_VALUE:
 			return MAROON;
 		case RED_VALUE:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Point.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Point.java
index c2acb5880c5..fd5d4d2159c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Point.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Point.java
@@ -54,7 +54,7 @@ public interface Point extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>X</em>' attribute.
+	 *        the new value of the '<em>X</em>' attribute.
 	 * @see #isSetX()
 	 * @see #unsetX()
 	 * @see #getX()
@@ -105,7 +105,7 @@ public interface Point extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Y</em>' attribute.
+	 *        the new value of the '<em>Y</em>' attribute.
 	 * @see #isSetY()
 	 * @see #unsetY()
 	 * @see #getY()
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java
index cd22f40f25c..538050a919e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java
@@ -12,17 +12,23 @@
 package org.eclipse.papyrus.dd.dc.impl;
 
 import java.lang.reflect.InvocationTargetException;
+
 import java.util.Map;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.papyrus.dd.dc.Bounds;
 import org.eclipse.papyrus.dd.dc.DCPackage;
+
 import org.eclipse.papyrus.dd.dc.util.DCValidator;
 
 /**
@@ -201,7 +207,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		x = newX;
 		boolean oldXESet = xESet;
 		xESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.BOUNDS__X, oldX, x, !oldXESet));
 		}
 	}
@@ -217,7 +223,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		boolean oldXESet = xESet;
 		x = X_EDEFAULT;
 		xESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.BOUNDS__X, oldX, X_EDEFAULT, oldXESet));
 		}
 	}
@@ -253,7 +259,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		y = newY;
 		boolean oldYESet = yESet;
 		yESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.BOUNDS__Y, oldY, y, !oldYESet));
 		}
 	}
@@ -269,7 +275,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		boolean oldYESet = yESet;
 		y = Y_EDEFAULT;
 		yESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.BOUNDS__Y, oldY, Y_EDEFAULT, oldYESet));
 		}
 	}
@@ -305,7 +311,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		width = newWidth;
 		boolean oldWidthESet = widthESet;
 		widthESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.BOUNDS__WIDTH, oldWidth, width, !oldWidthESet));
 		}
 	}
@@ -321,7 +327,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		boolean oldWidthESet = widthESet;
 		width = WIDTH_EDEFAULT;
 		widthESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.BOUNDS__WIDTH, oldWidth, WIDTH_EDEFAULT, oldWidthESet));
 		}
 	}
@@ -357,7 +363,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		height = newHeight;
 		boolean oldHeightESet = heightESet;
 		heightESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.BOUNDS__HEIGHT, oldHeight, height, !oldHeightESet));
 		}
 	}
@@ -373,7 +379,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		boolean oldHeightESet = heightESet;
 		height = HEIGHT_EDEFAULT;
 		heightESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.BOUNDS__HEIGHT, oldHeight, HEIGHT_EDEFAULT, oldHeightESet));
 		}
 	}
@@ -407,8 +413,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	 */
 	@Override
 	public boolean nonNegativeWidth(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DCValidator.validate(DCPackage.Literals.BOUNDS, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DCPackage.Literals.BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP, NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, DCValidator.BOUNDS__NON_NEGATIVE_WIDTH);
+		return DCValidator.validate(DCPackage.Literals.BOUNDS, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DCPackage.Literals.BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP, NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, DCValidator.BOUNDS__NON_NEGATIVE_WIDTH);
 	}
 
 	/**
@@ -430,8 +435,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	 */
 	@Override
 	public boolean nonNegativeHeight(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DCValidator.validate(DCPackage.Literals.BOUNDS, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DCPackage.Literals.BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP,
-				NON_NEGATIVE_HEIGHT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, DCValidator.BOUNDS__NON_NEGATIVE_HEIGHT);
+		return DCValidator.validate(DCPackage.Literals.BOUNDS, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DCPackage.Literals.BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP, NON_NEGATIVE_HEIGHT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, DCValidator.BOUNDS__NON_NEGATIVE_HEIGHT);
 	}
 
 	/**
@@ -441,7 +445,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DCPackage.BOUNDS__X:
 			return getX();
 		case DCPackage.BOUNDS__Y:
@@ -461,18 +465,18 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DCPackage.BOUNDS__X:
-			setX((Double) newValue);
+			setX((Double)newValue);
 			return;
 		case DCPackage.BOUNDS__Y:
-			setY((Double) newValue);
+			setY((Double)newValue);
 			return;
 		case DCPackage.BOUNDS__WIDTH:
-			setWidth((Double) newValue);
+			setWidth((Double)newValue);
 			return;
 		case DCPackage.BOUNDS__HEIGHT:
-			setHeight((Double) newValue);
+			setHeight((Double)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -485,7 +489,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DCPackage.BOUNDS__X:
 			unsetX();
 			return;
@@ -509,7 +513,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DCPackage.BOUNDS__X:
 			return isSetX();
 		case DCPackage.BOUNDS__Y:
@@ -530,11 +534,11 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
+		switch(operationID) {
 		case DCPackage.BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP:
-			return nonNegativeWidth((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return nonNegativeWidth((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		case DCPackage.BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP:
-			return nonNegativeHeight((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return nonNegativeHeight((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
@@ -546,30 +550,30 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (x: ");
-		if (xESet) {
+		if(xESet) {
 			result.append(x);
 		} else {
 			result.append("<unset>");
 		}
 		result.append(", y: ");
-		if (yESet) {
+		if(yESet) {
 			result.append(y);
 		} else {
 			result.append("<unset>");
 		}
 		result.append(", width: ");
-		if (widthESet) {
+		if(widthESet) {
 			result.append(width);
 		} else {
 			result.append("<unset>");
 		}
 		result.append(", height: ");
-		if (heightESet) {
+		if(heightESet) {
 			result.append(height);
 		} else {
 			result.append("<unset>");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java
index 77abe57c473..c8d80bc1342 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java
@@ -17,14 +17,12 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.dd.dc.Bounds;
-import org.eclipse.papyrus.dd.dc.DCFactory;
-import org.eclipse.papyrus.dd.dc.DCPackage;
-import org.eclipse.papyrus.dd.dc.Dimension;
-import org.eclipse.papyrus.dd.dc.KnownColor;
-import org.eclipse.papyrus.dd.dc.Point;
+
+import org.eclipse.papyrus.dd.dc.*;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
@@ -43,8 +41,8 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 	 */
 	public static DCFactory init() {
 		try {
-			DCFactory theDCFactory = (DCFactory) EPackage.Registry.INSTANCE.getEFactory(DCPackage.eNS_URI);
-			if (theDCFactory != null) {
+			DCFactory theDCFactory = (DCFactory)EPackage.Registry.INSTANCE.getEFactory(DCPackage.eNS_URI);
+			if(theDCFactory != null) {
 				return theDCFactory;
 			}
 		} catch (Exception exception) {
@@ -71,7 +69,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
+		switch(eClass.getClassifierID()) {
 		case DCPackage.POINT:
 			return createPoint();
 		case DCPackage.DIMENSION:
@@ -90,7 +88,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
+		switch(eDataType.getClassifierID()) {
 		case DCPackage.KNOWN_COLOR:
 			return createKnownColorFromString(eDataType, initialValue);
 		case DCPackage.BOOLEAN:
@@ -115,7 +113,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
+		switch(eDataType.getClassifierID()) {
 		case DCPackage.KNOWN_COLOR:
 			return convertKnownColorToString(eDataType, instanceValue);
 		case DCPackage.BOOLEAN:
@@ -173,7 +171,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 	 */
 	public KnownColor createKnownColorFromString(EDataType eDataType, String initialValue) {
 		KnownColor result = KnownColor.get(initialValue);
-		if (result == null) {
+		if(result == null) {
 			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		}
 		return result;
@@ -194,7 +192,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 	 * @generated
 	 */
 	public Boolean createBooleanFromString(EDataType eDataType, String initialValue) {
-		return (Boolean) super.createFromString(eDataType, initialValue);
+		return (Boolean)super.createFromString(eDataType, initialValue);
 	}
 
 	/**
@@ -212,7 +210,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 	 * @generated
 	 */
 	public Integer createIntegerFromString(EDataType eDataType, String initialValue) {
-		return (Integer) super.createFromString(eDataType, initialValue);
+		return (Integer)super.createFromString(eDataType, initialValue);
 	}
 
 	/**
@@ -230,7 +228,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 	 * @generated
 	 */
 	public Double createRealFromString(EDataType eDataType, String initialValue) {
-		return (Double) super.createFromString(eDataType, initialValue);
+		return (Double)super.createFromString(eDataType, initialValue);
 	}
 
 	/**
@@ -248,7 +246,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 	 * @generated
 	 */
 	public String createStringFromString(EDataType eDataType, String initialValue) {
-		return (String) super.createFromString(eDataType, initialValue);
+		return (String)super.createFromString(eDataType, initialValue);
 	}
 
 	/**
@@ -266,7 +264,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 	 * @generated NOT
 	 */
 	public Color createColorFromString(EDataType eDataType, String initialValue) {
-		if (initialValue == null || initialValue.isEmpty()) {
+		if(initialValue == null || initialValue.isEmpty()) {
 			return null;
 		}
 		return Color.decode(initialValue);
@@ -278,10 +276,10 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 	 * @generated NOT
 	 */
 	public String convertColorToString(EDataType eDataType, Object instanceValue) {
-		if (instanceValue == null) {
+		if(instanceValue == null) {
 			return null;
 		}
-		Color c = (Color) instanceValue;
+		Color c = (Color)instanceValue;
 		return String.format("#%02X%02X%02X", c.getRed(), c.getGreen(), c.getBlue());
 	}
 
@@ -292,7 +290,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 	 */
 	@Override
 	public DCPackage getDCPackage() {
-		return (DCPackage) getEPackage();
+		return (DCPackage)getEPackage();
 	}
 
 	/**
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java
index dbea5cf755e..1b812011004 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java
@@ -12,7 +12,6 @@
 package org.eclipse.papyrus.dd.dc.impl;
 
 import java.awt.Color;
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
@@ -105,7 +104,8 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
 	 * package package URI value.
 	 * <p>
-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.dd.dc.DCPackage#eNS_URI
@@ -128,7 +128,8 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 * and for any others upon which it depends.
 	 *
 	 * <p>
-	 * This method is used to initialize {@link DCPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * This method is used to initialize {@link DCPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they
+	 * should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
@@ -136,11 +137,11 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 * @generated
 	 */
 	public static DCPackage init() {
-		if (isInited) {
-			return (DCPackage) EPackage.Registry.INSTANCE.getEPackage(DCPackage.eNS_URI);
+		if(isInited) {
+			return (DCPackage)EPackage.Registry.INSTANCE.getEPackage(DCPackage.eNS_URI);
 		}
 		// Obtain or create and register package
-		DCPackageImpl theDCPackage = (DCPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DCPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DCPackageImpl());
+		DCPackageImpl theDCPackage = (DCPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DCPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DCPackageImpl());
 		isInited = true;
 		// Create package meta-data objects
 		theDCPackage.createPackageContents();
@@ -178,7 +179,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 */
 	@Override
 	public EAttribute getPoint_X() {
-		return (EAttribute) pointEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)pointEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -188,7 +189,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 */
 	@Override
 	public EAttribute getPoint_Y() {
-		return (EAttribute) pointEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)pointEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -208,7 +209,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 */
 	@Override
 	public EAttribute getDimension_Width() {
-		return (EAttribute) dimensionEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)dimensionEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -218,7 +219,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 */
 	@Override
 	public EAttribute getDimension_Height() {
-		return (EAttribute) dimensionEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)dimensionEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -258,7 +259,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 */
 	@Override
 	public EAttribute getBounds_X() {
-		return (EAttribute) boundsEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)boundsEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -268,7 +269,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 */
 	@Override
 	public EAttribute getBounds_Y() {
-		return (EAttribute) boundsEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)boundsEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -278,7 +279,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 */
 	@Override
 	public EAttribute getBounds_Width() {
-		return (EAttribute) boundsEClass.getEStructuralFeatures().get(2);
+		return (EAttribute)boundsEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -288,7 +289,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 */
 	@Override
 	public EAttribute getBounds_Height() {
-		return (EAttribute) boundsEClass.getEStructuralFeatures().get(3);
+		return (EAttribute)boundsEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -378,7 +379,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 */
 	@Override
 	public DCFactory getDCFactory() {
-		return (DCFactory) getEFactoryInstance();
+		return (DCFactory)getEFactoryInstance();
 	}
 
 	/**
@@ -397,7 +398,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) {
+		if(isCreated) {
 			return;
 		}
 		isCreated = true;
@@ -442,7 +443,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) {
+		if(isInitialized) {
 			return;
 		}
 		isInitialized = true;
@@ -540,7 +541,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 */
 	protected void createEcoreAnnotations() {
 		String source = "http://www.eclipse.org/emf/2002/Ecore";
-		addAnnotation(this, source, new String[] { "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL" });
+		addAnnotation(this, source, new String[]{ "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL" });
 	}
 
 	/**
@@ -552,9 +553,9 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 */
 	protected void createOCLAnnotations() {
 		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL";
-		addAnnotation(getDimension__NonNegativeWidth__DiagnosticChain_Map(), source, new String[] { "body", "width >=0" });
-		addAnnotation(getDimension__NonNegativeHeight__DiagnosticChain_Map(), source, new String[] { "body", "height >=0" });
-		addAnnotation(getBounds__NonNegativeWidth__DiagnosticChain_Map(), source, new String[] { "body", "width >= 0" });
-		addAnnotation(getBounds__NonNegativeHeight__DiagnosticChain_Map(), source, new String[] { "body", "height >=0" });
+		addAnnotation(getDimension__NonNegativeWidth__DiagnosticChain_Map(), source, new String[]{ "body", "width >=0" });
+		addAnnotation(getDimension__NonNegativeHeight__DiagnosticChain_Map(), source, new String[]{ "body", "height >=0" });
+		addAnnotation(getBounds__NonNegativeWidth__DiagnosticChain_Map(), source, new String[]{ "body", "width >= 0" });
+		addAnnotation(getBounds__NonNegativeHeight__DiagnosticChain_Map(), source, new String[]{ "body", "height >=0" });
 	}
 } // DCPackageImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java
index 4b9e04fb8ee..f3c60597899 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java
@@ -12,17 +12,23 @@
 package org.eclipse.papyrus.dd.dc.impl;
 
 import java.lang.reflect.InvocationTargetException;
+
 import java.util.Map;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.papyrus.dd.dc.DCPackage;
 import org.eclipse.papyrus.dd.dc.Dimension;
+
 import org.eclipse.papyrus.dd.dc.util.DCValidator;
 
 /**
@@ -139,7 +145,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 		width = newWidth;
 		boolean oldWidthESet = widthESet;
 		widthESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.DIMENSION__WIDTH, oldWidth, width, !oldWidthESet));
 		}
 	}
@@ -155,7 +161,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 		boolean oldWidthESet = widthESet;
 		width = WIDTH_EDEFAULT;
 		widthESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.DIMENSION__WIDTH, oldWidth, WIDTH_EDEFAULT, oldWidthESet));
 		}
 	}
@@ -191,7 +197,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 		height = newHeight;
 		boolean oldHeightESet = heightESet;
 		heightESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.DIMENSION__HEIGHT, oldHeight, height, !oldHeightESet));
 		}
 	}
@@ -207,7 +213,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 		boolean oldHeightESet = heightESet;
 		height = HEIGHT_EDEFAULT;
 		heightESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.DIMENSION__HEIGHT, oldHeight, HEIGHT_EDEFAULT, oldHeightESet));
 		}
 	}
@@ -241,8 +247,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 	 */
 	@Override
 	public boolean nonNegativeWidth(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DCValidator.validate(DCPackage.Literals.DIMENSION, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DCPackage.Literals.DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP,
-				NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, DCValidator.DIMENSION__NON_NEGATIVE_WIDTH);
+		return DCValidator.validate(DCPackage.Literals.DIMENSION, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DCPackage.Literals.DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP, NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, DCValidator.DIMENSION__NON_NEGATIVE_WIDTH);
 	}
 
 	/**
@@ -264,8 +269,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 	 */
 	@Override
 	public boolean nonNegativeHeight(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DCValidator.validate(DCPackage.Literals.DIMENSION, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DCPackage.Literals.DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP,
-				NON_NEGATIVE_HEIGHT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, DCValidator.DIMENSION__NON_NEGATIVE_HEIGHT);
+		return DCValidator.validate(DCPackage.Literals.DIMENSION, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DCPackage.Literals.DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP, NON_NEGATIVE_HEIGHT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, DCValidator.DIMENSION__NON_NEGATIVE_HEIGHT);
 	}
 
 	/**
@@ -275,7 +279,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DCPackage.DIMENSION__WIDTH:
 			return getWidth();
 		case DCPackage.DIMENSION__HEIGHT:
@@ -291,12 +295,12 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DCPackage.DIMENSION__WIDTH:
-			setWidth((Double) newValue);
+			setWidth((Double)newValue);
 			return;
 		case DCPackage.DIMENSION__HEIGHT:
-			setHeight((Double) newValue);
+			setHeight((Double)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -309,7 +313,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DCPackage.DIMENSION__WIDTH:
 			unsetWidth();
 			return;
@@ -327,7 +331,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DCPackage.DIMENSION__WIDTH:
 			return isSetWidth();
 		case DCPackage.DIMENSION__HEIGHT:
@@ -344,11 +348,11 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
+		switch(operationID) {
 		case DCPackage.DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP:
-			return nonNegativeWidth((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return nonNegativeWidth((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		case DCPackage.DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP:
-			return nonNegativeHeight((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return nonNegativeHeight((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
@@ -360,18 +364,18 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimen
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (width: ");
-		if (widthESet) {
+		if(widthESet) {
 			result.append(width);
 		} else {
 			result.append("<unset>");
 		}
 		result.append(", height: ");
-		if (heightESet) {
+		if(heightESet) {
 			result.append(height);
 		} else {
 			result.append("<unset>");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java
index 4648c39612c..bb1384a47e9 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java
@@ -12,9 +12,12 @@
 package org.eclipse.papyrus.dd.dc.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.papyrus.dd.dc.DCPackage;
 import org.eclipse.papyrus.dd.dc.Point;
 
@@ -132,7 +135,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 		x = newX;
 		boolean oldXESet = xESet;
 		xESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.POINT__X, oldX, x, !oldXESet));
 		}
 	}
@@ -148,7 +151,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 		boolean oldXESet = xESet;
 		x = X_EDEFAULT;
 		xESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.POINT__X, oldX, X_EDEFAULT, oldXESet));
 		}
 	}
@@ -184,7 +187,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 		y = newY;
 		boolean oldYESet = yESet;
 		yESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.POINT__Y, oldY, y, !oldYESet));
 		}
 	}
@@ -200,7 +203,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 		boolean oldYESet = yESet;
 		y = Y_EDEFAULT;
 		yESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.POINT__Y, oldY, Y_EDEFAULT, oldYESet));
 		}
 	}
@@ -222,7 +225,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DCPackage.POINT__X:
 			return getX();
 		case DCPackage.POINT__Y:
@@ -238,12 +241,12 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DCPackage.POINT__X:
-			setX((Double) newValue);
+			setX((Double)newValue);
 			return;
 		case DCPackage.POINT__Y:
-			setY((Double) newValue);
+			setY((Double)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -256,7 +259,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DCPackage.POINT__X:
 			unsetX();
 			return;
@@ -274,7 +277,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DCPackage.POINT__X:
 			return isSetX();
 		case DCPackage.POINT__Y:
@@ -290,18 +293,18 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (x: ");
-		if (xESet) {
+		if(xESet) {
 			result.append(x);
 		} else {
 			result.append("<unset>");
 		}
 		result.append(", y: ");
-		if (yESet) {
+		if(yESet) {
 			result.append(y);
 		} else {
 			result.append("<unset>");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java
index 1c3817509ec..148e3c2d45e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java
@@ -13,12 +13,12 @@ package org.eclipse.papyrus.dd.dc.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
+
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.dd.dc.Bounds;
-import org.eclipse.papyrus.dd.dc.DCPackage;
-import org.eclipse.papyrus.dd.dc.Dimension;
-import org.eclipse.papyrus.dd.dc.Point;
+
+import org.eclipse.papyrus.dd.dc.*;
 
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
@@ -46,7 +46,7 @@ public class DCAdapterFactory extends AdapterFactoryImpl {
 	 * @generated
 	 */
 	public DCAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = DCPackage.eINSTANCE;
 		}
 	}
@@ -62,11 +62,11 @@ public class DCAdapterFactory extends AdapterFactoryImpl {
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
+		if(object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
 	}
@@ -106,13 +106,13 @@ public class DCAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param target
-	 *            the object to adapt.
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
 	@Override
 	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject) target);
+		return modelSwitch.doSwitch((EObject)target);
 	}
 
 	/**
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java
index da652b88121..4e8ca219f65 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java
@@ -13,11 +13,10 @@ package org.eclipse.papyrus.dd.dc.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.dd.dc.Bounds;
-import org.eclipse.papyrus.dd.dc.DCPackage;
-import org.eclipse.papyrus.dd.dc.Dimension;
-import org.eclipse.papyrus.dd.dc.Point;
+
+import org.eclipse.papyrus.dd.dc.*;
 
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
@@ -47,7 +46,7 @@ public class DCSwitch<T> extends Switch<T> {
 	 * @generated
 	 */
 	public DCSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = DCPackage.eINSTANCE;
 		}
 	}
@@ -75,27 +74,30 @@ public class DCSwitch<T> extends Switch<T> {
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-		case DCPackage.POINT: {
-			Point point = (Point) theEObject;
+		switch(classifierID) {
+		case DCPackage.POINT:
+		{
+			Point point = (Point)theEObject;
 			T result = casePoint(point);
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DCPackage.DIMENSION: {
-			Dimension dimension = (Dimension) theEObject;
+		case DCPackage.DIMENSION:
+		{
+			Dimension dimension = (Dimension)theEObject;
 			T result = caseDimension(dimension);
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DCPackage.BOUNDS: {
-			Bounds bounds = (Bounds) theEObject;
+		case DCPackage.BOUNDS:
+		{
+			Bounds bounds = (Bounds)theEObject;
 			T result = caseBounds(bounds);
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
@@ -112,7 +114,7 @@ public class DCSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Point</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -128,7 +130,7 @@ public class DCSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Dimension</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -144,7 +146,7 @@ public class DCSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Bounds</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -160,7 +162,7 @@ public class DCSwitch<T> extends Switch<T> {
 	 * the last case anyway. <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java
index d97f3f07f50..44fae16b215 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java
@@ -12,20 +12,20 @@
 package org.eclipse.papyrus.dd.dc.util;
 
 import java.awt.Color;
+
 import java.util.Map;
 
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.emf.ecore.util.EObjectValidator;
-import org.eclipse.papyrus.dd.dc.Bounds;
-import org.eclipse.papyrus.dd.dc.DCPackage;
-import org.eclipse.papyrus.dd.dc.Dimension;
-import org.eclipse.papyrus.dd.dc.KnownColor;
-import org.eclipse.papyrus.dd.dc.Point;
+
+import org.eclipse.papyrus.dd.dc.*;
 
 /**
  * <!-- begin-user-doc --> The <b>Validator</b> for the model. <!-- end-user-doc
@@ -45,7 +45,8 @@ public class DCValidator extends EObjectValidator {
 	public static final DCValidator INSTANCE = new DCValidator();
 
 	/**
-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic
+	 * {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
@@ -149,25 +150,25 @@ public class DCValidator extends EObjectValidator {
 	 */
 	@Override
 	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		switch (classifierID) {
+		switch(classifierID) {
 		case DCPackage.POINT:
-			return validatePoint((Point) value, diagnostics, context);
+			return validatePoint((Point)value, diagnostics, context);
 		case DCPackage.DIMENSION:
-			return validateDimension((Dimension) value, diagnostics, context);
+			return validateDimension((Dimension)value, diagnostics, context);
 		case DCPackage.BOUNDS:
-			return validateBounds((Bounds) value, diagnostics, context);
+			return validateBounds((Bounds)value, diagnostics, context);
 		case DCPackage.KNOWN_COLOR:
-			return validateKnownColor((KnownColor) value, diagnostics, context);
+			return validateKnownColor((KnownColor)value, diagnostics, context);
 		case DCPackage.BOOLEAN:
-			return validateBoolean((Boolean) value, diagnostics, context);
+			return validateBoolean((Boolean)value, diagnostics, context);
 		case DCPackage.INTEGER:
-			return validateInteger((Integer) value, diagnostics, context);
+			return validateInteger((Integer)value, diagnostics, context);
 		case DCPackage.REAL:
-			return validateReal((Double) value, diagnostics, context);
+			return validateReal((Double)value, diagnostics, context);
 		case DCPackage.STRING:
-			return validateString((String) value, diagnostics, context);
+			return validateString((String)value, diagnostics, context);
 		case DCPackage.COLOR:
-			return validateColor((Color) value, diagnostics, context);
+			return validateColor((Color)value, diagnostics, context);
 		default:
 			return true;
 		}
@@ -188,35 +189,35 @@ public class DCValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateDimension(Dimension dimension, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(dimension, diagnostics, context)) {
+		if(!validate_NoCircularContainment(dimension, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(dimension, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(dimension, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(dimension, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(dimension, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(dimension, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(dimension, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(dimension, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(dimension, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDimension_nonNegativeWidth(dimension, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDimension_nonNegativeHeight(dimension, diagnostics, context);
 		}
 		return result;
@@ -248,35 +249,35 @@ public class DCValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateBounds(Bounds bounds, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(bounds, diagnostics, context)) {
+		if(!validate_NoCircularContainment(bounds, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(bounds, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(bounds, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(bounds, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(bounds, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(bounds, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(bounds, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(bounds, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(bounds, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateBounds_nonNegativeWidth(bounds, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateBounds_nonNegativeHeight(bounds, diagnostics, context);
 		}
 		return result;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java
index 10c5033f586..63bc010d5f1 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java
@@ -12,7 +12,6 @@
 package org.eclipse.papyrus.dd.dg;
 
 import java.util.Map;
-
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.papyrus.dd.dc.Bounds;
 
@@ -56,7 +55,7 @@ public interface Canvas extends Group {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Bounds</em>' containment reference.
+	 *        the new value of the '<em>Bounds</em>' containment reference.
 	 * @see #getBounds()
 	 * @generated
 	 */
@@ -66,10 +65,10 @@ public interface Canvas extends Group {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='transform->isEmpty()'"
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java
index e79e733c58d..ccd4b9f76af 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java
@@ -14,6 +14,7 @@ package org.eclipse.papyrus.dd.dg;
 import java.util.Map;
 
 import org.eclipse.emf.common.util.DiagnosticChain;
+
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
@@ -57,7 +58,7 @@ public interface Circle extends GraphicalElement {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Center</em>' containment reference.
+	 *        the new value of the '<em>Center</em>' containment reference.
 	 * @see #getCenter()
 	 * @generated
 	 */
@@ -85,7 +86,7 @@ public interface Circle extends GraphicalElement {
 	 * -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Radius</em>' attribute.
+	 *        the new value of the '<em>Radius</em>' attribute.
 	 * @see #getRadius()
 	 * @generated
 	 */
@@ -96,10 +97,10 @@ public interface Circle extends GraphicalElement {
 	 * The radius of a circle cannot be negative
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='radius >= 0'"
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java
index 66ff20bdf82..4d1d7410246 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java
@@ -58,7 +58,7 @@ public interface CubicCurveTo extends PathCommand {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Point</em>' containment reference.
+	 *        the new value of the '<em>Point</em>' containment reference.
 	 * @see #getPoint()
 	 * @generated
 	 */
@@ -84,7 +84,7 @@ public interface CubicCurveTo extends PathCommand {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Start Control</em>' containment reference.
+	 *        the new value of the '<em>Start Control</em>' containment reference.
 	 * @see #getStartControl()
 	 * @generated
 	 */
@@ -110,7 +110,7 @@ public interface CubicCurveTo extends PathCommand {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>End Control</em>' containment reference.
+	 *        the new value of the '<em>End Control</em>' containment reference.
 	 * @see #getEndControl()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java
index 0e1b1a8af74..e41e69e6afe 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java
@@ -1284,13 +1284,14 @@ public interface DGPackage extends EPackage {
 	int DEFINITIONS = 14;
 
 	/**
-	 * The feature id for the '<em><b>Defnition</b></em>' containment reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Definition</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int DEFINITIONS__DEFNITION = 0;
+	int DEFINITIONS__DEFINITION = 0;
 
 	/**
 	 * The feature id for the '<em><b>Style Sheet</b></em>' containment reference.
@@ -3994,13 +3995,14 @@ public interface DGPackage extends EPackage {
 	int TEXT__DATA = GRAPHICAL_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Position</b></em>' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int TEXT__POSITION = GRAPHICAL_ELEMENT_FEATURE_COUNT + 1;
+	int TEXT__BOUNDS = GRAPHICAL_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Anchor</b></em>' attribute.
@@ -4295,7 +4297,8 @@ public interface DGPackage extends EPackage {
 	EReference getCanvas_Bounds();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Canvas#canvasCannotHaveTransforms(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Canvas#canvasCannotHaveTransforms(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Canvas Cannot Have Transforms</em>}' operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
@@ -4395,7 +4398,8 @@ public interface DGPackage extends EPackage {
 	EReference getGraphicalElement_Style();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getTransforms <em>Transform</em>} '.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getTransforms <em>Transform</em>}
+	 * '.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @return the meta object for the containment reference list '<em>Transform</em>'.
@@ -4418,7 +4422,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getGraphicalElement_LayoutData();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.GraphicalElement#referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.GraphicalElement#referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Referenced Clippath Has Id</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -4451,7 +4456,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getDefinition_Id();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Definition#idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Definition#idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Id Cannot Be Empty</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -4647,7 +4653,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getStyle_FontDecoration();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Style#validFontSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Font Size</em>}'
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Style#validFontSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Font Size</em>}'
 	 * operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -4659,7 +4666,8 @@ public interface DGPackage extends EPackage {
 	EOperation getStyle__ValidFontSize__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Style#validFillOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Style#validFillOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Valid Fill Opacity</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -4671,7 +4679,8 @@ public interface DGPackage extends EPackage {
 	EOperation getStyle__ValidFillOpacity__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Style#validStrokeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Style#validStrokeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Valid Stroke Width</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -4683,7 +4692,8 @@ public interface DGPackage extends EPackage {
 	EOperation getStyle__ValidStrokeWidth__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Style#validDashLengthSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Style#validDashLengthSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Valid Dash Length Size</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -4695,7 +4705,8 @@ public interface DGPackage extends EPackage {
 	EOperation getStyle__ValidDashLengthSize__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Style#validStrokeOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Style#validStrokeOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Valid Stroke Opacity</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -4739,7 +4750,8 @@ public interface DGPackage extends EPackage {
 	EReference getPaint_PaintServer();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Paint#referencedPaintServerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Paint#referencedPaintServerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Referenced Paint Server Has Id</em>}' operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
@@ -4814,7 +4826,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getCircle_Radius();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Circle#nonNegativeRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Circle#nonNegativeRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Non Negative Radius</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -4889,15 +4902,16 @@ public interface DGPackage extends EPackage {
 	EClass getDefinitions();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.Definitions#getDefnitions <em>Defnition</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.Definitions#getDefinitions <em>Definition</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 *
-	 * @return the meta object for the containment reference list '<em>Defnition</em>'.
-	 * @see org.eclipse.papyrus.dd.dg.Definitions#getDefnitions()
+	 * @return the meta object for the containment reference list '<em>Definition</em>'.
+	 * @see org.eclipse.papyrus.dd.dg.Definitions#getDefinitions()
 	 * @see #getDefinitions()
 	 * @generated
 	 */
-	EReference getDefinitions_Defnition();
+	EReference getDefinitions_Definition();
 
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.Definitions#getStyleSheet <em>Style Sheet</em>}'.
@@ -5191,7 +5205,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getGradientStop_Opacity();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.GradientStop#validOffset(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Offset</em>}'
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.GradientStop#validOffset(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Offset</em>}'
 	 * operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -5203,7 +5218,8 @@ public interface DGPackage extends EPackage {
 	EOperation getGradientStop__ValidOffset__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.GradientStop#validOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Opacity</em>}'
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.GradientStop#validOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Opacity</em>}'
 	 * operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -5259,7 +5275,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getImage_IsAspectRatioPreserved();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Image#sourceCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Image#sourceCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Source Cannot Be Empty</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -5346,7 +5363,8 @@ public interface DGPackage extends EPackage {
 	EReference getMarkedElement_StartMarker();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedStartMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedStartMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Referenced Start Marker Has Id</em>}' operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
@@ -5358,7 +5376,8 @@ public interface DGPackage extends EPackage {
 	EOperation getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedMidMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedMidMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Referenced Mid Marker Has Id</em>}' operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
@@ -5370,7 +5389,8 @@ public interface DGPackage extends EPackage {
 	EOperation getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedEndMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedEndMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Referenced End Marker Has Id</em>}' operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
@@ -5446,7 +5466,8 @@ public interface DGPackage extends EPackage {
 	EReference getLinearGradient_End();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.LinearGradient#validGradientVector(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.LinearGradient#validGradientVector(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Valid Gradient Vector</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -5576,7 +5597,8 @@ public interface DGPackage extends EPackage {
 	EReference getPath_Command();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Path#firstCommandMustBeMove(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Path#firstCommandMustBeMove(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>First Command Must Be Move</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -5705,7 +5727,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getRadialGradient_Radius();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.RadialGradient#validCenterPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.RadialGradient#validCenterPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Valid Center Point</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -5717,7 +5740,8 @@ public interface DGPackage extends EPackage {
 	EOperation getRadialGradient__ValidCenterPoint__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.RadialGradient#validFocusPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.RadialGradient#validFocusPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Valid Focus Point</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -5729,7 +5753,8 @@ public interface DGPackage extends EPackage {
 	EOperation getRadialGradient__ValidFocusPoint__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.RadialGradient#validRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Radius</em>}'
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.RadialGradient#validRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Radius</em>}'
 	 * operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -5773,7 +5798,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getRectangle_CornerRadius();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Rectangle#nonNegativeCornerRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Rectangle#nonNegativeCornerRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Non Negative Corner Radius</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -5907,7 +5933,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getScale_FactorY();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Scale#nonnegativescale(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Nonnegativescale</em>}'
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Scale#nonnegativescale(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Nonnegativescale</em>}'
 	 * operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -5972,15 +5999,16 @@ public interface DGPackage extends EPackage {
 	EAttribute getText_Data();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.Text#getPosition <em>Position</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.Text#getBounds <em>Bounds</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 *
-	 * @return the meta object for the containment reference '<em>Position</em>'.
-	 * @see org.eclipse.papyrus.dd.dg.Text#getPosition()
+	 * @return the meta object for the containment reference '<em>Bounds</em>'.
+	 * @see org.eclipse.papyrus.dd.dg.Text#getBounds()
 	 * @see #getText()
 	 * @generated
 	 */
-	EReference getText_Position();
+	EReference getText_Bounds();
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Text#getAnchor <em>Anchor</em>}'.
@@ -5995,7 +6023,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getText_Anchor();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Text#dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Text#dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Data Cannot Be Empty</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -6072,7 +6101,8 @@ public interface DGPackage extends EPackage {
 	EReference getUse_ReferencedElement();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.dd.dg.Use#referencedElementHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Use#referencedElementHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Referenced Element Has Id</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -6633,13 +6663,13 @@ public interface DGPackage extends EPackage {
 		EClass DEFINITIONS = eINSTANCE.getDefinitions();
 
 		/**
-		 * The meta object literal for the '<em><b>Defnition</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
+		 * The meta object literal for the '<em><b>Definition</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
 		 *
 		 * @generated
 		 */
-		EReference DEFINITIONS__DEFNITION = eINSTANCE.getDefinitions_Defnition();
+		EReference DEFINITIONS__DEFINITION = eINSTANCE.getDefinitions_Definition();
 
 		/**
 		 * The meta object literal for the '<em><b>Style Sheet</b></em>' containment reference feature.
@@ -7495,13 +7525,13 @@ public interface DGPackage extends EPackage {
 		EAttribute TEXT__DATA = eINSTANCE.getText_Data();
 
 		/**
-		 * The meta object literal for the '<em><b>Position</b></em>' containment reference feature.
-		 * <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
+		 * The meta object literal for the '<em><b>Bounds</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
 		 *
 		 * @generated
 		 */
-		EReference TEXT__POSITION = eINSTANCE.getText_Position();
+		EReference TEXT__BOUNDS = eINSTANCE.getText_Bounds();
 
 		/**
 		 * The meta object literal for the '<em><b>Anchor</b></em>' attribute feature.
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java
index 2045a729452..4aefdd376a4 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java
@@ -12,7 +12,6 @@
 package org.eclipse.papyrus.dd.dg;
 
 import java.util.Map;
-
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.ecore.EObject;
 
@@ -51,7 +50,7 @@ public interface Definition extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Id</em>' attribute.
+	 *        the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
@@ -61,10 +60,10 @@ public interface Definition extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='id->notEmpty() implies id.size() > 0'"
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java
index b1e4253ec3c..32f5fe6802d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java
@@ -12,6 +12,7 @@
 package org.eclipse.papyrus.dd.dg;
 
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -20,7 +21,11 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
+ * <<<<<<< HEAD
+ * <li>{@link org.eclipse.papyrus.dd.dg.Definitions#getDefinitions <em>Definition</em>}</li>
+ * =======
  * <li>{@link org.eclipse.papyrus.dd.dg.Definitions#getDefnitions <em>Defnition</em>}</li>
+ * >>>>>>> branch 'master' of ssh://melaasar6nr@git.eclipse.org:29418/papyrus/org.eclipse.papyrus
  * <li>{@link org.eclipse.papyrus.dd.dg.Definitions#getStyleSheet <em>Style Sheet</em>}</li>
  * </ul>
  * </p>
@@ -32,18 +37,28 @@ import org.eclipse.emf.ecore.EObject;
 public interface Definitions extends EObject {
 
 	/**
+	 * <<<<<<< HEAD
+	 * Returns the value of the '<em><b>Definition</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.dd.dg.Definition}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * A set of clip paths that are referenced by graphical elements in the containing canvas.
+	 * <!-- end-model-doc -->
+	 * =======
 	 * Returns the value of the '<em><b>Defnition</b></em>' containment
 	 * reference list. The list contents are of type {@link org.eclipse.papyrus.dd.dg.Definition}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc --> <!-- begin-model-doc --> A set of clip paths that
 	 * are referenced by graphical elements in the containing canvas. <!--
 	 * end-model-doc -->
+	 * >>>>>>> branch 'master' of ssh://melaasar6nr@git.eclipse.org:29418/papyrus/org.eclipse.papyrus
 	 *
-	 * @return the value of the '<em>Defnition</em>' containment reference list.
-	 * @see org.eclipse.papyrus.dd.dg.DGPackage#getDefinitions_Defnition()
+	 * @return the value of the '<em>Definition</em>' containment reference list.
+	 * @see org.eclipse.papyrus.dd.dg.DGPackage#getDefinitions_Definition()
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<Definition> getDefnitions();
+	EList<Definition> getDefinitions();
 
 	/**
 	 * Returns the value of the '<em><b>Style Sheet</b></em>' containment
@@ -65,7 +80,7 @@ public interface Definitions extends EObject {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Style Sheet</em>' containment reference.
+	 *        the new value of the '<em>Style Sheet</em>' containment reference.
 	 * @see #getStyleSheet()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ElementKind.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ElementKind.java
index ea4eb8e7b32..0904a6dbd03 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ElementKind.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ElementKind.java
@@ -384,7 +384,7 @@ public enum ElementKind implements Enumerator {
 	 *
 	 * @generated
 	 */
-	private static final ElementKind[] VALUES_ARRAY = new ElementKind[] { CANVAS, CIRCLE, CLIP_PATH, ELLIPSE, GROUP, IMAGE, LINE, MARKER, PATH, POLYGON, POLYLINE, RECTANGLE, TEXT, USE, };
+	private static final ElementKind[] VALUES_ARRAY = new ElementKind[]{ CANVAS, CIRCLE, CLIP_PATH, ELLIPSE, GROUP, IMAGE, LINE, MARKER, PATH, POLYGON, POLYLINE, RECTANGLE, TEXT, USE, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Element Kind</b></em>' enumerators.
@@ -401,9 +401,9 @@ public enum ElementKind implements Enumerator {
 	 * @generated
 	 */
 	public static ElementKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			ElementKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -417,9 +417,9 @@ public enum ElementKind implements Enumerator {
 	 * @generated
 	 */
 	public static ElementKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			ElementKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -433,7 +433,7 @@ public enum ElementKind implements Enumerator {
 	 * @generated
 	 */
 	public static ElementKind get(int value) {
-		switch (value) {
+		switch(value) {
 		case CANVAS_VALUE:
 			return CANVAS;
 		case CIRCLE_VALUE:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Ellipse.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Ellipse.java
index c7a4f89efd1..75a962b0c3d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Ellipse.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Ellipse.java
@@ -54,7 +54,7 @@ public interface Ellipse extends GraphicalElement {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Center</em>' containment reference.
+	 *        the new value of the '<em>Center</em>' containment reference.
 	 * @see #getCenter()
 	 * @generated
 	 */
@@ -80,7 +80,7 @@ public interface Ellipse extends GraphicalElement {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Radii</em>' containment reference.
+	 *        the new value of the '<em>Radii</em>' containment reference.
 	 * @see #getRadii()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalArcTo.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalArcTo.java
index 6a4b84481f7..25f506c1662 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalArcTo.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalArcTo.java
@@ -53,7 +53,7 @@ public interface EllipticalArcTo extends PathCommand {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Radii</em>' containment reference.
+	 *        the new value of the '<em>Radii</em>' containment reference.
 	 * @see #getRadii()
 	 * @generated
 	 */
@@ -80,7 +80,7 @@ public interface EllipticalArcTo extends PathCommand {
 	 * -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Rotation</em>' attribute.
+	 *        the new value of the '<em>Rotation</em>' attribute.
 	 * @see #getRotation()
 	 * @generated
 	 */
@@ -107,7 +107,7 @@ public interface EllipticalArcTo extends PathCommand {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Is Large Arc</em>' attribute.
+	 *        the new value of the '<em>Is Large Arc</em>' attribute.
 	 * @see #isLargeArc()
 	 * @generated
 	 */
@@ -133,7 +133,7 @@ public interface EllipticalArcTo extends PathCommand {
 	 * -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Is Sweep</em>' attribute.
+	 *        the new value of the '<em>Is Sweep</em>' attribute.
 	 * @see #isSweep()
 	 * @generated
 	 */
@@ -158,7 +158,7 @@ public interface EllipticalArcTo extends PathCommand {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Point</em>' containment reference.
+	 *        the new value of the '<em>Point</em>' containment reference.
 	 * @see #getPoint()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/FontDecoration.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/FontDecoration.java
index 4604c5b0b52..0f0e8d73654 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/FontDecoration.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/FontDecoration.java
@@ -109,7 +109,7 @@ public enum FontDecoration implements Enumerator {
 	 *
 	 * @generated
 	 */
-	private static final FontDecoration[] VALUES_ARRAY = new FontDecoration[] { UNDERLINE, OVERLINE, LINE_THROUGH, };
+	private static final FontDecoration[] VALUES_ARRAY = new FontDecoration[]{ UNDERLINE, OVERLINE, LINE_THROUGH, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Font Decoration</b></em>' enumerators.
@@ -126,9 +126,9 @@ public enum FontDecoration implements Enumerator {
 	 * @generated
 	 */
 	public static FontDecoration get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			FontDecoration result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -142,9 +142,9 @@ public enum FontDecoration implements Enumerator {
 	 * @generated
 	 */
 	public static FontDecoration getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			FontDecoration result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -158,7 +158,7 @@ public enum FontDecoration implements Enumerator {
 	 * @generated
 	 */
 	public static FontDecoration get(int value) {
-		switch (value) {
+		switch(value) {
 		case UNDERLINE_VALUE:
 			return UNDERLINE;
 		case OVERLINE_VALUE:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java
index 88288dce508..3dafff004de 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java
@@ -12,9 +12,11 @@
 package org.eclipse.papyrus.dd.dg;
 
 import java.awt.Color;
+
 import java.util.Map;
 
 import org.eclipse.emf.common.util.DiagnosticChain;
+
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -60,7 +62,7 @@ public interface GradientStop extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Color</em>' attribute.
+	 *        the new value of the '<em>Color</em>' attribute.
 	 * @see #isSetColor()
 	 * @see #unsetColor()
 	 * @see #getColor()
@@ -114,7 +116,7 @@ public interface GradientStop extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Offset</em>' attribute.
+	 *        the new value of the '<em>Offset</em>' attribute.
 	 * @see #isSetOffset()
 	 * @see #unsetOffset()
 	 * @see #getOffset()
@@ -169,7 +171,7 @@ public interface GradientStop extends EObject {
 	 * -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Opacity</em>' attribute.
+	 *        the new value of the '<em>Opacity</em>' attribute.
 	 * @see #isSetOpacity()
 	 * @see #unsetOpacity()
 	 * @see #getOpacity()
@@ -207,10 +209,10 @@ public interface GradientStop extends EObject {
 	 * the offset must be between 0 and 1.
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='offset>=0 and offset<=1'"
 	 * @generated
@@ -222,10 +224,10 @@ public interface GradientStop extends EObject {
 	 * the opacity must be between 0 and 1.
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='opacity>=0 and opacity<=1'"
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java
index b00f5383184..c5f09bfa149 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java
@@ -12,7 +12,6 @@
 package org.eclipse.papyrus.dd.dg;
 
 import java.util.Map;
-
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
 
@@ -61,7 +60,7 @@ public interface GraphicalElement extends Definition {
 	 * -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Clip Path</em>' reference.
+	 *        the new value of the '<em>Clip Path</em>' reference.
 	 * @see #getClipPath()
 	 * @generated
 	 */
@@ -88,7 +87,7 @@ public interface GraphicalElement extends Definition {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Group</em>' container reference.
+	 *        the new value of the '<em>Group</em>' container reference.
 	 * @see #getGroup()
 	 * @generated
 	 */
@@ -127,7 +126,7 @@ public interface GraphicalElement extends Definition {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Style</em>' containment reference.
+	 *        the new value of the '<em>Style</em>' containment reference.
 	 * @see #getStyle()
 	 * @generated
 	 */
@@ -168,7 +167,7 @@ public interface GraphicalElement extends Definition {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Layout Data</em>' attribute.
+	 *        the new value of the '<em>Layout Data</em>' attribute.
 	 * @see #getLayoutData()
 	 * @generated
 	 */
@@ -178,10 +177,10 @@ public interface GraphicalElement extends Definition {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='clipPath->notEmpty() implies clipPath.id->notEmpty()'"
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Group.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Group.java
index 660edb82ae4..31ae74b739d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Group.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Group.java
@@ -72,7 +72,7 @@ public interface Group extends GraphicalElement {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Layout</em>' attribute.
+	 *        the new value of the '<em>Layout</em>' attribute.
 	 * @see #getLayout()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java
index f681a6b2fda..115f24e2a34 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java
@@ -12,7 +12,6 @@
 package org.eclipse.papyrus.dd.dg;
 
 import java.util.Map;
-
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.papyrus.dd.dc.Bounds;
 
@@ -58,7 +57,7 @@ public interface Image extends GraphicalElement {
 	 * -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Source</em>' attribute.
+	 *        the new value of the '<em>Source</em>' attribute.
 	 * @see #getSource()
 	 * @generated
 	 */
@@ -83,7 +82,7 @@ public interface Image extends GraphicalElement {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Bounds</em>' containment reference.
+	 *        the new value of the '<em>Bounds</em>' containment reference.
 	 * @see #getBounds()
 	 * @generated
 	 */
@@ -111,7 +110,7 @@ public interface Image extends GraphicalElement {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Is Aspect Ratio Preserved</em>' attribute.
+	 *        the new value of the '<em>Is Aspect Ratio Preserved</em>' attribute.
 	 * @see #isAspectRatioPreserved()
 	 * @generated
 	 */
@@ -121,10 +120,10 @@ public interface Image extends GraphicalElement {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='source->notEmpty() implies source.size() > 0'"
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Line.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Line.java
index 54d82e5987e..5f3c4ba5a43 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Line.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Line.java
@@ -54,7 +54,7 @@ public interface Line extends MarkedElement {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Start</em>' containment reference.
+	 *        the new value of the '<em>Start</em>' containment reference.
 	 * @see #getStart()
 	 * @generated
 	 */
@@ -80,7 +80,7 @@ public interface Line extends MarkedElement {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>End</em>' containment reference.
+	 *        the new value of the '<em>End</em>' containment reference.
 	 * @see #getEnd()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LineTo.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LineTo.java
index c13f89aff51..af2728a2b05 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LineTo.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LineTo.java
@@ -53,7 +53,7 @@ public interface LineTo extends PathCommand {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Point</em>' containment reference.
+	 *        the new value of the '<em>Point</em>' containment reference.
 	 * @see #getPoint()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LinearGradient.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LinearGradient.java
index c2f3718cad0..51802d51f5f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LinearGradient.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LinearGradient.java
@@ -56,7 +56,7 @@ public interface LinearGradient extends Gradient {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Start</em>' containment reference.
+	 *        the new value of the '<em>Start</em>' containment reference.
 	 * @see #getStart()
 	 * @generated
 	 */
@@ -81,7 +81,7 @@ public interface LinearGradient extends Gradient {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>End</em>' containment reference.
+	 *        the new value of the '<em>End</em>' containment reference.
 	 * @see #getEnd()
 	 * @generated
 	 */
@@ -92,10 +92,10 @@ public interface LinearGradient extends Gradient {
 	 * all the components of the gradient vector must be between 0 and 1.
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='start.x>=0 and start.x<=1 and end.x>=0 and end.x<=1 and start.y>=0 and start.y<=1 and end.y>=0 and end.y<=1'"
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java
index 9da7536ee71..7eb8e387d28 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java
@@ -12,7 +12,6 @@
 package org.eclipse.papyrus.dd.dg;
 
 import java.util.Map;
-
 import org.eclipse.emf.common.util.DiagnosticChain;
 
 /**
@@ -57,7 +56,7 @@ public interface MarkedElement extends GraphicalElement {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>End Marker</em>' reference.
+	 *        the new value of the '<em>End Marker</em>' reference.
 	 * @see #getEndMarker()
 	 * @generated
 	 */
@@ -83,7 +82,7 @@ public interface MarkedElement extends GraphicalElement {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Mid Marker</em>' reference.
+	 *        the new value of the '<em>Mid Marker</em>' reference.
 	 * @see #getMidMarker()
 	 * @generated
 	 */
@@ -109,7 +108,7 @@ public interface MarkedElement extends GraphicalElement {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Start Marker</em>' reference.
+	 *        the new value of the '<em>Start Marker</em>' reference.
 	 * @see #getStartMarker()
 	 * @generated
 	 */
@@ -119,10 +118,10 @@ public interface MarkedElement extends GraphicalElement {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='startMarker->notEmpty() implies startMarker.id->notEmpty()'"
 	 * @generated
@@ -133,10 +132,10 @@ public interface MarkedElement extends GraphicalElement {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='midMarker->notEmpty() implies midMarker.id->notEmpty()'"
 	 * @generated
@@ -147,10 +146,10 @@ public interface MarkedElement extends GraphicalElement {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='endMarker->notEmpty() implies endMarker.id->notEmpty()'"
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Marker.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Marker.java
index 43e9a6d4c55..4b5319aa4f3 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Marker.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Marker.java
@@ -54,7 +54,7 @@ public interface Marker extends Group {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Size</em>' containment reference.
+	 *        the new value of the '<em>Size</em>' containment reference.
 	 * @see #getSize()
 	 * @generated
 	 */
@@ -79,7 +79,7 @@ public interface Marker extends Group {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Reference</em>' containment reference.
+	 *        the new value of the '<em>Reference</em>' containment reference.
 	 * @see #getReference()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Matrix.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Matrix.java
index 2c26fb2ad92..ff81e75da13 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Matrix.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Matrix.java
@@ -55,7 +55,7 @@ public interface Matrix extends Transform {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>A</em>' attribute.
+	 *        the new value of the '<em>A</em>' attribute.
 	 * @see #getA()
 	 * @generated
 	 */
@@ -80,7 +80,7 @@ public interface Matrix extends Transform {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>B</em>' attribute.
+	 *        the new value of the '<em>B</em>' attribute.
 	 * @see #getB()
 	 * @generated
 	 */
@@ -105,7 +105,7 @@ public interface Matrix extends Transform {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>C</em>' attribute.
+	 *        the new value of the '<em>C</em>' attribute.
 	 * @see #getC()
 	 * @generated
 	 */
@@ -130,7 +130,7 @@ public interface Matrix extends Transform {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>D</em>' attribute.
+	 *        the new value of the '<em>D</em>' attribute.
 	 * @see #getD()
 	 * @generated
 	 */
@@ -155,7 +155,7 @@ public interface Matrix extends Transform {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>E</em>' attribute.
+	 *        the new value of the '<em>E</em>' attribute.
 	 * @see #getE()
 	 * @generated
 	 */
@@ -180,7 +180,7 @@ public interface Matrix extends Transform {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>F</em>' attribute.
+	 *        the new value of the '<em>F</em>' attribute.
 	 * @see #getF()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MoveTo.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MoveTo.java
index f1b3d687397..74588cf5caf 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MoveTo.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MoveTo.java
@@ -53,7 +53,7 @@ public interface MoveTo extends PathCommand {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Point</em>' containment reference.
+	 *        the new value of the '<em>Point</em>' containment reference.
 	 * @see #getPoint()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java
index 648574d91bb..7004838ed86 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java
@@ -12,8 +12,8 @@
 package org.eclipse.papyrus.dd.dg;
 
 import java.awt.Color;
-import java.util.Map;
 
+import java.util.Map;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.ecore.EObject;
 
@@ -52,7 +52,7 @@ public interface Paint extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Color</em>' attribute.
+	 *        the new value of the '<em>Color</em>' attribute.
 	 * @see #getColor()
 	 * @generated
 	 */
@@ -77,7 +77,7 @@ public interface Paint extends EObject {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Paint Server</em>' reference.
+	 *        the new value of the '<em>Paint Server</em>' reference.
 	 * @see #getPaintServer()
 	 * @generated
 	 */
@@ -87,10 +87,10 @@ public interface Paint extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='paintServer->notEmpty() implies paintServer.id->notEmpty()'"
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java
index a5db0f313bf..26f9c5da6a3 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java
@@ -12,7 +12,6 @@
 package org.eclipse.papyrus.dd.dg;
 
 import java.util.Map;
-
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
 
@@ -53,10 +52,10 @@ public interface Path extends MarkedElement {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='command->first().oclIsKindOf(MoveTo)'"
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PathCommand.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PathCommand.java
index bc8fffc48a3..14c761e5df7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PathCommand.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PathCommand.java
@@ -56,7 +56,7 @@ public interface PathCommand extends EObject {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Is Relative</em>' attribute.
+	 *        the new value of the '<em>Is Relative</em>' attribute.
 	 * @see #isRelative()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Pattern.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Pattern.java
index 3c9e3e429ec..5027f115739 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Pattern.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Pattern.java
@@ -54,7 +54,7 @@ public interface Pattern extends PaintServer {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Bounds</em>' containment reference.
+	 *        the new value of the '<em>Bounds</em>' containment reference.
 	 * @see #getBounds()
 	 * @generated
 	 */
@@ -81,7 +81,7 @@ public interface Pattern extends PaintServer {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Tile</em>' containment reference.
+	 *        the new value of the '<em>Tile</em>' containment reference.
 	 * @see #getTile()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java
index ad26d5e4c6c..d4d447a9832 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java
@@ -12,6 +12,7 @@
 package org.eclipse.papyrus.dd.dg;
 
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java
index f9ac66c41c2..b191f3ed37b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java
@@ -12,6 +12,7 @@
 package org.eclipse.papyrus.dd.dg;
 
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/QuadraticCurveTo.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/QuadraticCurveTo.java
index 1de21d25465..cacc06d0ca1 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/QuadraticCurveTo.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/QuadraticCurveTo.java
@@ -55,7 +55,7 @@ public interface QuadraticCurveTo extends PathCommand {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Point</em>' containment reference.
+	 *        the new value of the '<em>Point</em>' containment reference.
 	 * @see #getPoint()
 	 * @generated
 	 */
@@ -80,7 +80,7 @@ public interface QuadraticCurveTo extends PathCommand {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Control</em>' containment reference.
+	 *        the new value of the '<em>Control</em>' containment reference.
 	 * @see #getControl()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RadialGradient.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RadialGradient.java
index cfa1a559c8d..5d3d045d5aa 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RadialGradient.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RadialGradient.java
@@ -58,7 +58,7 @@ public interface RadialGradient extends Gradient {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Center</em>' containment reference.
+	 *        the new value of the '<em>Center</em>' containment reference.
 	 * @see #getCenter()
 	 * @generated
 	 */
@@ -83,7 +83,7 @@ public interface RadialGradient extends Gradient {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Focus</em>' containment reference.
+	 *        the new value of the '<em>Focus</em>' containment reference.
 	 * @see #getFocus()
 	 * @generated
 	 */
@@ -111,7 +111,7 @@ public interface RadialGradient extends Gradient {
 	 * -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Radius</em>' attribute.
+	 *        the new value of the '<em>Radius</em>' attribute.
 	 * @see #getRadius()
 	 * @generated
 	 */
@@ -122,10 +122,10 @@ public interface RadialGradient extends Gradient {
 	 * the center point coordinates must be between 0 and 1
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='centerX>=0 and centerX<=1 and centerY>=0 and centerY<=1'"
 	 * @generated
@@ -137,10 +137,10 @@ public interface RadialGradient extends Gradient {
 	 * the focus point coordinates must be between 0 and 1
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='focusX>=0 and focusX<=1 and focusY>=0 and focusY<=1'"
 	 * @generated
@@ -152,10 +152,10 @@ public interface RadialGradient extends Gradient {
 	 * the radius must be between 0 and 1
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='radius>=0 and radius<=1'"
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java
index 657c4060b46..04eddb163a6 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java
@@ -12,7 +12,6 @@
 package org.eclipse.papyrus.dd.dg;
 
 import java.util.Map;
-
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.papyrus.dd.dc.Bounds;
 
@@ -57,7 +56,7 @@ public interface Rectangle extends GraphicalElement {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Bounds</em>' containment reference.
+	 *        the new value of the '<em>Bounds</em>' containment reference.
 	 * @see #getBounds()
 	 * @generated
 	 */
@@ -87,7 +86,7 @@ public interface Rectangle extends GraphicalElement {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Corner Radius</em>' attribute.
+	 *        the new value of the '<em>Corner Radius</em>' attribute.
 	 * @see #isSetCornerRadius()
 	 * @see #unsetCornerRadius()
 	 * @see #getCornerRadius()
@@ -124,10 +123,10 @@ public interface Rectangle extends GraphicalElement {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='cornerRadius >= 0'"
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RootCanvas.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RootCanvas.java
index 5d354c44f08..872e942534b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RootCanvas.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RootCanvas.java
@@ -60,7 +60,7 @@ public interface RootCanvas extends Canvas {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Background Color</em>' attribute.
+	 *        the new value of the '<em>Background Color</em>' attribute.
 	 * @see #isSetBackgroundColor()
 	 * @see #unsetBackgroundColor()
 	 * @see #getBackgroundColor()
@@ -113,7 +113,7 @@ public interface RootCanvas extends Canvas {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Definitions</em>' containment reference.
+	 *        the new value of the '<em>Definitions</em>' containment reference.
 	 * @see #getDefinitions()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rotate.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rotate.java
index 0c7ec8bfb6e..40eb6e9ef13 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rotate.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rotate.java
@@ -55,7 +55,7 @@ public interface Rotate extends Transform {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Angle</em>' attribute.
+	 *        the new value of the '<em>Angle</em>' attribute.
 	 * @see #getAngle()
 	 * @generated
 	 */
@@ -82,7 +82,7 @@ public interface Rotate extends Transform {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Center</em>' containment reference.
+	 *        the new value of the '<em>Center</em>' containment reference.
 	 * @see #getCenter()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Scale.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Scale.java
index b910f4d14aa..305d216164e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Scale.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Scale.java
@@ -57,7 +57,7 @@ public interface Scale extends Transform {
 	 * -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Factor X</em>' attribute.
+	 *        the new value of the '<em>Factor X</em>' attribute.
 	 * @see #getFactorX()
 	 * @generated
 	 */
@@ -84,7 +84,7 @@ public interface Scale extends Transform {
 	 * -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Factor Y</em>' attribute.
+	 *        the new value of the '<em>Factor Y</em>' attribute.
 	 * @see #getFactorY()
 	 * @generated
 	 */
@@ -95,10 +95,10 @@ public interface Scale extends Transform {
 	 * scale factors cannot be negative.
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='factorX>=0 and factorY>=0'"
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Skew.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Skew.java
index 3ab7adc81a0..44dc623fe91 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Skew.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Skew.java
@@ -54,7 +54,7 @@ public interface Skew extends Transform {
 	 * -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Angle X</em>' attribute.
+	 *        the new value of the '<em>Angle X</em>' attribute.
 	 * @see #getAngleX()
 	 * @generated
 	 */
@@ -82,7 +82,7 @@ public interface Skew extends Transform {
 	 * -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Angle Y</em>' attribute.
+	 *        the new value of the '<em>Angle Y</em>' attribute.
 	 * @see #getAngleY()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java
index 81955caa1bf..055b16311c5 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java
@@ -15,6 +15,7 @@ import java.util.Map;
 
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -69,7 +70,7 @@ public interface Style extends EObject {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Fill</em>' containment reference.
+	 *        the new value of the '<em>Fill</em>' containment reference.
 	 * @see #isSetFill()
 	 * @see #unsetFill()
 	 * @see #getFill()
@@ -127,7 +128,7 @@ public interface Style extends EObject {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Fill Opacity</em>' attribute.
+	 *        the new value of the '<em>Fill Opacity</em>' attribute.
 	 * @see #isSetFillOpacity()
 	 * @see #unsetFillOpacity()
 	 * @see #getFillOpacity()
@@ -182,7 +183,7 @@ public interface Style extends EObject {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Stroke</em>' containment reference.
+	 *        the new value of the '<em>Stroke</em>' containment reference.
 	 * @see #isSetStroke()
 	 * @see #unsetStroke()
 	 * @see #getStroke()
@@ -239,7 +240,7 @@ public interface Style extends EObject {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Stroke Width</em>' attribute.
+	 *        the new value of the '<em>Stroke Width</em>' attribute.
 	 * @see #isSetStrokeWidth()
 	 * @see #unsetStrokeWidth()
 	 * @see #getStrokeWidth()
@@ -296,7 +297,7 @@ public interface Style extends EObject {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Stroke Opacity</em>' attribute.
+	 *        the new value of the '<em>Stroke Opacity</em>' attribute.
 	 * @see #isSetStrokeOpacity()
 	 * @see #unsetStrokeOpacity()
 	 * @see #getStrokeOpacity()
@@ -395,7 +396,7 @@ public interface Style extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Font Size</em>' attribute.
+	 *        the new value of the '<em>Font Size</em>' attribute.
 	 * @see #isSetFontSize()
 	 * @see #unsetFontSize()
 	 * @see #getFontSize()
@@ -448,7 +449,7 @@ public interface Style extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Font Name</em>' attribute.
+	 *        the new value of the '<em>Font Name</em>' attribute.
 	 * @see #isSetFontName()
 	 * @see #unsetFontName()
 	 * @see #getFontName()
@@ -501,7 +502,7 @@ public interface Style extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Font Italic</em>' attribute.
+	 *        the new value of the '<em>Font Italic</em>' attribute.
 	 * @see #isSetFontItalic()
 	 * @see #unsetFontItalic()
 	 * @see #isFontItalic()
@@ -555,7 +556,7 @@ public interface Style extends EObject {
 	 * -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Font Bold</em>' attribute.
+	 *        the new value of the '<em>Font Bold</em>' attribute.
 	 * @see #isSetFontBold()
 	 * @see #unsetFontBold()
 	 * @see #isFontBold()
@@ -610,7 +611,7 @@ public interface Style extends EObject {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Font Decoration</em>' attribute.
+	 *        the new value of the '<em>Font Decoration</em>' attribute.
 	 * @see org.eclipse.papyrus.dd.dg.FontDecoration
 	 * @see #isSetFontDecoration()
 	 * @see #unsetFontDecoration()
@@ -649,10 +650,10 @@ public interface Style extends EObject {
 	 * the font size is non-negative
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='fontSize >=  0'"
 	 * @generated
@@ -664,10 +665,10 @@ public interface Style extends EObject {
 	 * the stroke width is non-negative
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='fillOpacity >=  0 and fillOpacity <=1'"
 	 * @generated
@@ -679,10 +680,10 @@ public interface Style extends EObject {
 	 * the stroke width is non-negative
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='strokeWidth >=  0'"
 	 * @generated
@@ -694,10 +695,10 @@ public interface Style extends EObject {
 	 * the size of the stroke dash length list must be even.
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='strokeDashLength->size().mod(2) = 0'"
 	 * @generated
@@ -709,10 +710,10 @@ public interface Style extends EObject {
 	 * the opacity of the fill is non-negative
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='strokeOpacity >=  0 and strokeOpacity <=1'"
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java
index 7af3427c323..d3453f0be35 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java
@@ -12,6 +12,7 @@
 package org.eclipse.papyrus.dd.dg;
 
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -63,7 +64,7 @@ public interface StyleRule extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Style</em>' containment reference.
+	 *        the new value of the '<em>Style</em>' containment reference.
 	 * @see #getStyle()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSelector.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSelector.java
index 829ecc73817..524f983280e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSelector.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSelector.java
@@ -53,7 +53,7 @@ public interface StyleSelector extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Kind</em>' attribute.
+	 *        the new value of the '<em>Kind</em>' attribute.
 	 * @see org.eclipse.papyrus.dd.dg.ElementKind
 	 * @see #isSetKind()
 	 * @see #unsetKind()
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java
index 67a6ab4927b..cd4b245eebd 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java
@@ -12,6 +12,7 @@
 package org.eclipse.papyrus.dd.dg;
 
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EObject;
 
 /**
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java
index e6afadc5cb8..44ac1bfa455 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java
@@ -12,9 +12,8 @@
 package org.eclipse.papyrus.dd.dg;
 
 import java.util.Map;
-
 import org.eclipse.emf.common.util.DiagnosticChain;
-import org.eclipse.papyrus.dd.dc.Point;
+import org.eclipse.papyrus.dd.dc.Bounds;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Text</b></em>'. <!-- end-user-doc -->
@@ -27,7 +26,7 @@ import org.eclipse.papyrus.dd.dc.Point;
  * The following features are supported:
  * <ul>
  * <li>{@link org.eclipse.papyrus.dd.dg.Text#getData <em>Data</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Text#getPosition <em>Position</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Text#getBounds <em>Bounds</em>}</li>
  * <li>{@link org.eclipse.papyrus.dd.dg.Text#getAnchor <em>Anchor</em>}</li>
  * </ul>
  * </p>
@@ -57,37 +56,39 @@ public interface Text extends GraphicalElement {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Data</em>' attribute.
+	 *        the new value of the '<em>Data</em>' attribute.
 	 * @see #getData()
 	 * @generated
 	 */
 	void setData(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Position</b></em>' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
-	 * begin-model-doc --> the bounds inside which the text is rendered
-	 * (possibly wrapped into multiple lines) <!-- end-model-doc -->
+	 * Returns the value of the '<em><b>Bounds</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * the bounds inside which the text is rendered (possibly wrapped into multiple lines)
+	 * <!-- end-model-doc -->
 	 *
-	 * @return the value of the '<em>Position</em>' containment reference.
-	 * @see #setPosition(Point)
-	 * @see org.eclipse.papyrus.dd.dg.DGPackage#getText_Position()
+	 * @return the value of the '<em>Bounds</em>' containment reference.
+	 * @see #setBounds(Bounds)
+	 * @see org.eclipse.papyrus.dd.dg.DGPackage#getText_Bounds()
 	 * @model containment="true" required="true" ordered="false"
 	 * @generated
 	 */
-	Point getPosition();
+	Bounds getBounds();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Text#getPosition <em>Position</em>}' containment reference.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Text#getBounds <em>Bounds</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Position</em>' containment reference.
-	 * @see #getPosition()
+	 *        the new value of the '<em>Bounds</em>' containment reference.
+	 * @see #getBounds()
 	 * @generated
 	 */
-	void setPosition(Point value);
+	void setBounds(Bounds value);
 
 	/**
 	 * Returns the value of the '<em><b>Anchor</b></em>' attribute.
@@ -113,7 +114,7 @@ public interface Text extends GraphicalElement {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Anchor</em>' attribute.
+	 *        the new value of the '<em>Anchor</em>' attribute.
 	 * @see org.eclipse.papyrus.dd.dg.TextAnchor
 	 * @see #getAnchor()
 	 * @generated
@@ -124,10 +125,10 @@ public interface Text extends GraphicalElement {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='data->notEmpty() implies data.size() > 0'"
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/TextAnchor.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/TextAnchor.java
index 7f59661ac2c..01f17edb9ce 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/TextAnchor.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/TextAnchor.java
@@ -111,7 +111,7 @@ public enum TextAnchor implements Enumerator {
 	 *
 	 * @generated
 	 */
-	private static final TextAnchor[] VALUES_ARRAY = new TextAnchor[] { START, MIDDLE, END, };
+	private static final TextAnchor[] VALUES_ARRAY = new TextAnchor[]{ START, MIDDLE, END, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Text Anchor</b></em>' enumerators.
@@ -130,9 +130,9 @@ public enum TextAnchor implements Enumerator {
 	 * @generated
 	 */
 	public static TextAnchor get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			TextAnchor result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -147,9 +147,9 @@ public enum TextAnchor implements Enumerator {
 	 * @generated
 	 */
 	public static TextAnchor getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			TextAnchor result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -164,7 +164,7 @@ public enum TextAnchor implements Enumerator {
 	 * @generated
 	 */
 	public static TextAnchor get(int value) {
-		switch (value) {
+		switch(value) {
 		case START_VALUE:
 			return START;
 		case MIDDLE_VALUE:
@@ -256,4 +256,4 @@ public enum TextAnchor implements Enumerator {
 	public String toString() {
 		return literal;
 	}
-} // TextAnchor
+} //TextAnchor
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Translate.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Translate.java
index d3c1794760a..fc6c14b4068 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Translate.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Translate.java
@@ -52,7 +52,7 @@ public interface Translate extends Transform {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Delta X</em>' attribute.
+	 *        the new value of the '<em>Delta X</em>' attribute.
 	 * @see #getDeltaX()
 	 * @generated
 	 */
@@ -78,7 +78,7 @@ public interface Translate extends Transform {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Delta Y</em>' attribute.
+	 *        the new value of the '<em>Delta Y</em>' attribute.
 	 * @see #getDeltaY()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java
index 95709b28f55..3c88f791238 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java
@@ -12,7 +12,6 @@
 package org.eclipse.papyrus.dd.dg;
 
 import java.util.Map;
-
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.papyrus.dd.dc.Bounds;
 
@@ -58,7 +57,7 @@ public interface Use extends GraphicalElement {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Bounds</em>' containment reference.
+	 *        the new value of the '<em>Bounds</em>' containment reference.
 	 * @see #getBounds()
 	 * @generated
 	 */
@@ -84,7 +83,7 @@ public interface Use extends GraphicalElement {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Referenced Element</em>' reference.
+	 *        the new value of the '<em>Referenced Element</em>' reference.
 	 * @see #getReferencedElement()
 	 * @generated
 	 */
@@ -94,10 +93,10 @@ public interface Use extends GraphicalElement {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='referencedElement->notEmpty() implies referencedElement.id->notEmpty()'"
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java
index a4ee191d1b8..48e1f1a9a04 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java
@@ -13,16 +13,19 @@ package org.eclipse.papyrus.dd.dg.impl;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
-
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dc.Bounds;
+
 import org.eclipse.papyrus.dd.dg.Canvas;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
@@ -87,9 +90,9 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 	public NotificationChain basicSetBounds(Bounds newBounds, NotificationChain msgs) {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.CANVAS__BOUNDS, oldBounds, newBounds);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -105,19 +108,19 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 	 */
 	@Override
 	public void setBounds(Bounds newBounds) {
-		if (newBounds != bounds) {
+		if(newBounds != bounds) {
 			NotificationChain msgs = null;
-			if (bounds != null) {
-				msgs = ((InternalEObject) bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CANVAS__BOUNDS, null, msgs);
+			if(bounds != null) {
+				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CANVAS__BOUNDS, null, msgs);
 			}
-			if (newBounds != null) {
-				msgs = ((InternalEObject) newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CANVAS__BOUNDS, null, msgs);
+			if(newBounds != null) {
+				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CANVAS__BOUNDS, null, msgs);
 			}
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.CANVAS__BOUNDS, newBounds, newBounds));
 		}
 	}
@@ -140,8 +143,7 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 	 */
 	@Override
 	public boolean canvasCannotHaveTransforms(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.CANVAS, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP,
-				CANVAS_CANNOT_HAVE_TRANSFORMS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.CANVAS__CANVAS_CANNOT_HAVE_TRANSFORMS);
+		return DGValidator.validate(DGPackage.Literals.CANVAS, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP, CANVAS_CANNOT_HAVE_TRANSFORMS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.CANVAS__CANVAS_CANNOT_HAVE_TRANSFORMS);
 	}
 
 	/**
@@ -151,7 +153,7 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.CANVAS__BOUNDS:
 			return basicSetBounds(null, msgs);
 		}
@@ -165,7 +167,7 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.CANVAS__BOUNDS:
 			return getBounds();
 		}
@@ -179,9 +181,9 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.CANVAS__BOUNDS:
-			setBounds((Bounds) newValue);
+			setBounds((Bounds)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -194,9 +196,9 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.CANVAS__BOUNDS:
-			setBounds((Bounds) null);
+			setBounds((Bounds)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -209,7 +211,7 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.CANVAS__BOUNDS:
 			return bounds != null;
 		}
@@ -224,9 +226,9 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
+		switch(operationID) {
 		case DGPackage.CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP:
-			return canvasCannotHaveTransforms((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return canvasCannotHaveTransforms((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CircleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CircleImpl.java
index 8446f633b31..c0069ef24b0 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CircleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CircleImpl.java
@@ -12,19 +12,26 @@
 package org.eclipse.papyrus.dd.dg.impl;
 
 import java.lang.reflect.InvocationTargetException;
+
 import java.util.Map;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dc.Point;
+
 import org.eclipse.papyrus.dd.dg.Circle;
 import org.eclipse.papyrus.dd.dg.DGPackage;
+
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
@@ -108,9 +115,9 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 	public NotificationChain basicSetCenter(Point newCenter, NotificationChain msgs) {
 		Point oldCenter = center;
 		center = newCenter;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.CIRCLE__CENTER, oldCenter, newCenter);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -126,19 +133,19 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 	 */
 	@Override
 	public void setCenter(Point newCenter) {
-		if (newCenter != center) {
+		if(newCenter != center) {
 			NotificationChain msgs = null;
-			if (center != null) {
-				msgs = ((InternalEObject) center).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CIRCLE__CENTER, null, msgs);
+			if(center != null) {
+				msgs = ((InternalEObject)center).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CIRCLE__CENTER, null, msgs);
 			}
-			if (newCenter != null) {
-				msgs = ((InternalEObject) newCenter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CIRCLE__CENTER, null, msgs);
+			if(newCenter != null) {
+				msgs = ((InternalEObject)newCenter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CIRCLE__CENTER, null, msgs);
 			}
 			msgs = basicSetCenter(newCenter, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.CIRCLE__CENTER, newCenter, newCenter));
 		}
 	}
@@ -162,7 +169,7 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 	public void setRadius(double newRadius) {
 		double oldRadius = radius;
 		radius = newRadius;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.CIRCLE__RADIUS, oldRadius, radius));
 		}
 	}
@@ -186,8 +193,7 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 	 */
 	@Override
 	public boolean nonNegativeRadius(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.CIRCLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.CIRCLE___NON_NEGATIVE_RADIUS__DIAGNOSTICCHAIN_MAP,
-				NON_NEGATIVE_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.CIRCLE__NON_NEGATIVE_RADIUS);
+		return DGValidator.validate(DGPackage.Literals.CIRCLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.CIRCLE___NON_NEGATIVE_RADIUS__DIAGNOSTICCHAIN_MAP, NON_NEGATIVE_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.CIRCLE__NON_NEGATIVE_RADIUS);
 	}
 
 	/**
@@ -197,7 +203,7 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.CIRCLE__CENTER:
 			return basicSetCenter(null, msgs);
 		}
@@ -211,7 +217,7 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.CIRCLE__CENTER:
 			return getCenter();
 		case DGPackage.CIRCLE__RADIUS:
@@ -227,12 +233,12 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.CIRCLE__CENTER:
-			setCenter((Point) newValue);
+			setCenter((Point)newValue);
 			return;
 		case DGPackage.CIRCLE__RADIUS:
-			setRadius((Double) newValue);
+			setRadius((Double)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -245,9 +251,9 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.CIRCLE__CENTER:
-			setCenter((Point) null);
+			setCenter((Point)null);
 			return;
 		case DGPackage.CIRCLE__RADIUS:
 			setRadius(RADIUS_EDEFAULT);
@@ -263,7 +269,7 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.CIRCLE__CENTER:
 			return center != null;
 		case DGPackage.CIRCLE__RADIUS:
@@ -280,9 +286,9 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
+		switch(operationID) {
 		case DGPackage.CIRCLE___NON_NEGATIVE_RADIUS__DIAGNOSTICCHAIN_MAP:
-			return nonNegativeRadius((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return nonNegativeRadius((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
@@ -294,7 +300,7 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClipPathImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClipPathImpl.java
index 245e37acd6b..b1a02b6e3a0 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClipPathImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClipPathImpl.java
@@ -12,6 +12,7 @@
 package org.eclipse.papyrus.dd.dg.impl;
 
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.papyrus.dd.dg.ClipPath;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClosePathImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClosePathImpl.java
index 7bd2549bfa2..e21f6b574ff 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClosePathImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClosePathImpl.java
@@ -12,6 +12,7 @@
 package org.eclipse.papyrus.dd.dg.impl;
 
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.papyrus.dd.dg.ClosePath;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java
index f1caa1c0c02..ce2586dcae9 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java
@@ -13,10 +13,14 @@ package org.eclipse.papyrus.dd.dg.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dc.Point;
+
 import org.eclipse.papyrus.dd.dg.CubicCurveTo;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 
@@ -103,9 +107,9 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 	public NotificationChain basicSetPoint(Point newPoint, NotificationChain msgs) {
 		Point oldPoint = point;
 		point = newPoint;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.CUBIC_CURVE_TO__POINT, oldPoint, newPoint);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -121,19 +125,19 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 	 */
 	@Override
 	public void setPoint(Point newPoint) {
-		if (newPoint != point) {
+		if(newPoint != point) {
 			NotificationChain msgs = null;
-			if (point != null) {
-				msgs = ((InternalEObject) point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__POINT, null, msgs);
+			if(point != null) {
+				msgs = ((InternalEObject)point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__POINT, null, msgs);
 			}
-			if (newPoint != null) {
-				msgs = ((InternalEObject) newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__POINT, null, msgs);
+			if(newPoint != null) {
+				msgs = ((InternalEObject)newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__POINT, null, msgs);
 			}
 			msgs = basicSetPoint(newPoint, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.CUBIC_CURVE_TO__POINT, newPoint, newPoint));
 		}
 	}
@@ -156,9 +160,9 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 	public NotificationChain basicSetStartControl(Point newStartControl, NotificationChain msgs) {
 		Point oldStartControl = startControl;
 		startControl = newStartControl;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.CUBIC_CURVE_TO__START_CONTROL, oldStartControl, newStartControl);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -174,19 +178,19 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 	 */
 	@Override
 	public void setStartControl(Point newStartControl) {
-		if (newStartControl != startControl) {
+		if(newStartControl != startControl) {
 			NotificationChain msgs = null;
-			if (startControl != null) {
-				msgs = ((InternalEObject) startControl).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__START_CONTROL, null, msgs);
+			if(startControl != null) {
+				msgs = ((InternalEObject)startControl).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__START_CONTROL, null, msgs);
 			}
-			if (newStartControl != null) {
-				msgs = ((InternalEObject) newStartControl).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__START_CONTROL, null, msgs);
+			if(newStartControl != null) {
+				msgs = ((InternalEObject)newStartControl).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__START_CONTROL, null, msgs);
 			}
 			msgs = basicSetStartControl(newStartControl, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.CUBIC_CURVE_TO__START_CONTROL, newStartControl, newStartControl));
 		}
 	}
@@ -209,9 +213,9 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 	public NotificationChain basicSetEndControl(Point newEndControl, NotificationChain msgs) {
 		Point oldEndControl = endControl;
 		endControl = newEndControl;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.CUBIC_CURVE_TO__END_CONTROL, oldEndControl, newEndControl);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -227,19 +231,19 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 	 */
 	@Override
 	public void setEndControl(Point newEndControl) {
-		if (newEndControl != endControl) {
+		if(newEndControl != endControl) {
 			NotificationChain msgs = null;
-			if (endControl != null) {
-				msgs = ((InternalEObject) endControl).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__END_CONTROL, null, msgs);
+			if(endControl != null) {
+				msgs = ((InternalEObject)endControl).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__END_CONTROL, null, msgs);
 			}
-			if (newEndControl != null) {
-				msgs = ((InternalEObject) newEndControl).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__END_CONTROL, null, msgs);
+			if(newEndControl != null) {
+				msgs = ((InternalEObject)newEndControl).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__END_CONTROL, null, msgs);
 			}
 			msgs = basicSetEndControl(newEndControl, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.CUBIC_CURVE_TO__END_CONTROL, newEndControl, newEndControl));
 		}
 	}
@@ -251,7 +255,7 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
 			return basicSetStartControl(null, msgs);
 		case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
@@ -269,7 +273,7 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
 			return getStartControl();
 		case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
@@ -287,15 +291,15 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
-			setStartControl((Point) newValue);
+			setStartControl((Point)newValue);
 			return;
 		case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
-			setEndControl((Point) newValue);
+			setEndControl((Point)newValue);
 			return;
 		case DGPackage.CUBIC_CURVE_TO__POINT:
-			setPoint((Point) newValue);
+			setPoint((Point)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -308,15 +312,15 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
-			setStartControl((Point) null);
+			setStartControl((Point)null);
 			return;
 		case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
-			setEndControl((Point) null);
+			setEndControl((Point)null);
 			return;
 		case DGPackage.CUBIC_CURVE_TO__POINT:
-			setPoint((Point) null);
+			setPoint((Point)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -329,7 +333,7 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
 			return startControl != null;
 		case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java
index d84d244d7d1..76a8747381a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java
@@ -15,49 +15,12 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.dd.dg.Canvas;
-import org.eclipse.papyrus.dd.dg.Circle;
-import org.eclipse.papyrus.dd.dg.ClipPath;
-import org.eclipse.papyrus.dd.dg.ClosePath;
-import org.eclipse.papyrus.dd.dg.CubicCurveTo;
-import org.eclipse.papyrus.dd.dg.DGFactory;
-import org.eclipse.papyrus.dd.dg.DGPackage;
-import org.eclipse.papyrus.dd.dg.Definitions;
-import org.eclipse.papyrus.dd.dg.ElementKind;
-import org.eclipse.papyrus.dd.dg.Ellipse;
-import org.eclipse.papyrus.dd.dg.EllipticalArcTo;
-import org.eclipse.papyrus.dd.dg.FontDecoration;
-import org.eclipse.papyrus.dd.dg.GradientStop;
-import org.eclipse.papyrus.dd.dg.Group;
-import org.eclipse.papyrus.dd.dg.Image;
-import org.eclipse.papyrus.dd.dg.Line;
-import org.eclipse.papyrus.dd.dg.LineTo;
-import org.eclipse.papyrus.dd.dg.LinearGradient;
-import org.eclipse.papyrus.dd.dg.Marker;
-import org.eclipse.papyrus.dd.dg.Matrix;
-import org.eclipse.papyrus.dd.dg.MoveTo;
-import org.eclipse.papyrus.dd.dg.Paint;
-import org.eclipse.papyrus.dd.dg.Path;
-import org.eclipse.papyrus.dd.dg.Pattern;
-import org.eclipse.papyrus.dd.dg.Polygon;
-import org.eclipse.papyrus.dd.dg.Polyline;
-import org.eclipse.papyrus.dd.dg.QuadraticCurveTo;
-import org.eclipse.papyrus.dd.dg.RadialGradient;
-import org.eclipse.papyrus.dd.dg.Rectangle;
-import org.eclipse.papyrus.dd.dg.RootCanvas;
-import org.eclipse.papyrus.dd.dg.Rotate;
-import org.eclipse.papyrus.dd.dg.Scale;
-import org.eclipse.papyrus.dd.dg.Skew;
-import org.eclipse.papyrus.dd.dg.Style;
-import org.eclipse.papyrus.dd.dg.StyleRule;
-import org.eclipse.papyrus.dd.dg.StyleSelector;
-import org.eclipse.papyrus.dd.dg.StyleSheet;
-import org.eclipse.papyrus.dd.dg.Text;
-import org.eclipse.papyrus.dd.dg.TextAnchor;
-import org.eclipse.papyrus.dd.dg.Translate;
-import org.eclipse.papyrus.dd.dg.Use;
+
+import org.eclipse.papyrus.dd.dg.*;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
@@ -76,8 +39,8 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 	 */
 	public static DGFactory init() {
 		try {
-			DGFactory theDGFactory = (DGFactory) EPackage.Registry.INSTANCE.getEFactory(DGPackage.eNS_URI);
-			if (theDGFactory != null) {
+			DGFactory theDGFactory = (DGFactory)EPackage.Registry.INSTANCE.getEFactory(DGPackage.eNS_URI);
+			if(theDGFactory != null) {
 				return theDGFactory;
 			}
 		} catch (Exception exception) {
@@ -104,7 +67,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
+		switch(eClass.getClassifierID()) {
 		case DGPackage.CANVAS:
 			return createCanvas();
 		case DGPackage.GROUP:
@@ -189,7 +152,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
+		switch(eDataType.getClassifierID()) {
 		case DGPackage.FONT_DECORATION:
 			return createFontDecorationFromString(eDataType, initialValue);
 		case DGPackage.ELEMENT_KIND:
@@ -208,7 +171,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
+		switch(eDataType.getClassifierID()) {
 		case DGPackage.FONT_DECORATION:
 			return convertFontDecorationToString(eDataType, instanceValue);
 		case DGPackage.ELEMENT_KIND:
@@ -623,7 +586,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 	 */
 	public FontDecoration createFontDecorationFromString(EDataType eDataType, String initialValue) {
 		FontDecoration result = FontDecoration.get(initialValue);
-		if (result == null) {
+		if(result == null) {
 			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		}
 		return result;
@@ -645,7 +608,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 	 */
 	public ElementKind createElementKindFromString(EDataType eDataType, String initialValue) {
 		ElementKind result = ElementKind.get(initialValue);
-		if (result == null) {
+		if(result == null) {
 			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		}
 		return result;
@@ -668,7 +631,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 	 */
 	public TextAnchor createTextAnchorFromString(EDataType eDataType, String initialValue) {
 		TextAnchor result = TextAnchor.get(initialValue);
-		if (result == null) {
+		if(result == null) {
 			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		}
 		return result;
@@ -691,7 +654,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 	 */
 	@Override
 	public DGPackage getDGPackage() {
-		return (DGPackage) getEPackage();
+		return (DGPackage)getEPackage();
 	}
 
 	/**
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGPackageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGPackageImpl.java
index 989e7c4f093..bde3fa3c5a7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGPackageImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGPackageImpl.java
@@ -404,9 +404,11 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
-	 * package package URI value.
+	 * package
+	 * package URI value.
 	 * <p>
-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.dd.dg.DGPackage#eNS_URI
@@ -425,11 +427,11 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	private static boolean isInited = false;
 
 	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model,
-	 * and for any others upon which it depends.
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
 	 *
 	 * <p>
-	 * This method is used to initialize {@link DGPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * This method is used to initialize {@link DGPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they
+	 * should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
@@ -437,11 +439,11 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 * @generated
 	 */
 	public static DGPackage init() {
-		if (isInited) {
-			return (DGPackage) EPackage.Registry.INSTANCE.getEPackage(DGPackage.eNS_URI);
+		if(isInited) {
+			return (DGPackage)EPackage.Registry.INSTANCE.getEPackage(DGPackage.eNS_URI);
 		}
 		// Obtain or create and register package
-		DGPackageImpl theDGPackage = (DGPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DGPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DGPackageImpl());
+		DGPackageImpl theDGPackage = (DGPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DGPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DGPackageImpl());
 		isInited = true;
 		// Initialize simple dependencies
 		DCPackage.eINSTANCE.eClass();
@@ -481,7 +483,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getCanvas_Bounds() {
-		return (EReference) canvasEClass.getEStructuralFeatures().get(0);
+		return (EReference)canvasEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -511,7 +513,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getGroup_Member() {
-		return (EReference) groupEClass.getEStructuralFeatures().get(0);
+		return (EReference)groupEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -522,7 +524,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getGroup_Layout() {
-		return (EAttribute) groupEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)groupEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -542,7 +544,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getGraphicalElement_ClipPath() {
-		return (EReference) graphicalElementEClass.getEStructuralFeatures().get(0);
+		return (EReference)graphicalElementEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -552,7 +554,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getGraphicalElement_Group() {
-		return (EReference) graphicalElementEClass.getEStructuralFeatures().get(1);
+		return (EReference)graphicalElementEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -562,7 +564,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getGraphicalElement_Class() {
-		return (EAttribute) graphicalElementEClass.getEStructuralFeatures().get(2);
+		return (EAttribute)graphicalElementEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -572,7 +574,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getGraphicalElement_Style() {
-		return (EReference) graphicalElementEClass.getEStructuralFeatures().get(3);
+		return (EReference)graphicalElementEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -582,7 +584,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getGraphicalElement_Transform() {
-		return (EReference) graphicalElementEClass.getEStructuralFeatures().get(4);
+		return (EReference)graphicalElementEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -593,7 +595,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getGraphicalElement_LayoutData() {
-		return (EAttribute) graphicalElementEClass.getEStructuralFeatures().get(5);
+		return (EAttribute)graphicalElementEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -623,7 +625,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getDefinition_Id() {
-		return (EAttribute) definitionEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)definitionEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -653,7 +655,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getMoveTo_Point() {
-		return (EReference) moveToEClass.getEStructuralFeatures().get(0);
+		return (EReference)moveToEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -673,7 +675,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getPathCommand_IsRelative() {
-		return (EAttribute) pathCommandEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)pathCommandEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -703,7 +705,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getStyle_Fill() {
-		return (EReference) styleEClass.getEStructuralFeatures().get(0);
+		return (EReference)styleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -713,7 +715,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getStyle_FillOpacity() {
-		return (EAttribute) styleEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)styleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -723,7 +725,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getStyle_Stroke() {
-		return (EReference) styleEClass.getEStructuralFeatures().get(2);
+		return (EReference)styleEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -733,7 +735,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getStyle_StrokeWidth() {
-		return (EAttribute) styleEClass.getEStructuralFeatures().get(3);
+		return (EAttribute)styleEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -743,7 +745,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getStyle_StrokeOpacity() {
-		return (EAttribute) styleEClass.getEStructuralFeatures().get(4);
+		return (EAttribute)styleEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -753,7 +755,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getStyle_StrokeDashLength() {
-		return (EAttribute) styleEClass.getEStructuralFeatures().get(5);
+		return (EAttribute)styleEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -763,7 +765,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getStyle_FontSize() {
-		return (EAttribute) styleEClass.getEStructuralFeatures().get(6);
+		return (EAttribute)styleEClass.getEStructuralFeatures().get(6);
 	}
 
 	/**
@@ -773,7 +775,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getStyle_FontName() {
-		return (EAttribute) styleEClass.getEStructuralFeatures().get(7);
+		return (EAttribute)styleEClass.getEStructuralFeatures().get(7);
 	}
 
 	/**
@@ -783,7 +785,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getStyle_FontItalic() {
-		return (EAttribute) styleEClass.getEStructuralFeatures().get(8);
+		return (EAttribute)styleEClass.getEStructuralFeatures().get(8);
 	}
 
 	/**
@@ -793,7 +795,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getStyle_FontBold() {
-		return (EAttribute) styleEClass.getEStructuralFeatures().get(9);
+		return (EAttribute)styleEClass.getEStructuralFeatures().get(9);
 	}
 
 	/**
@@ -803,7 +805,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getStyle_FontDecoration() {
-		return (EAttribute) styleEClass.getEStructuralFeatures().get(10);
+		return (EAttribute)styleEClass.getEStructuralFeatures().get(10);
 	}
 
 	/**
@@ -873,7 +875,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getPaint_Color() {
-		return (EAttribute) paintEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)paintEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -883,7 +885,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getPaint_PaintServer() {
-		return (EReference) paintEClass.getEStructuralFeatures().get(1);
+		return (EReference)paintEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -913,7 +915,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getPaintServer_Transform() {
-		return (EReference) paintServerEClass.getEStructuralFeatures().get(0);
+		return (EReference)paintServerEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -943,7 +945,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getCircle_Center() {
-		return (EReference) circleEClass.getEStructuralFeatures().get(0);
+		return (EReference)circleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -953,7 +955,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getCircle_Radius() {
-		return (EAttribute) circleEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)circleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -993,7 +995,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getCubicCurveTo_Point() {
-		return (EReference) cubicCurveToEClass.getEStructuralFeatures().get(2);
+		return (EReference)cubicCurveToEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -1003,7 +1005,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getCubicCurveTo_StartControl() {
-		return (EReference) cubicCurveToEClass.getEStructuralFeatures().get(0);
+		return (EReference)cubicCurveToEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1013,7 +1015,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getCubicCurveTo_EndControl() {
-		return (EReference) cubicCurveToEClass.getEStructuralFeatures().get(1);
+		return (EReference)cubicCurveToEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1027,13 +1029,14 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 */
 	@Override
-	public EReference getDefinitions_Defnition() {
-		return (EReference) definitionsEClass.getEStructuralFeatures().get(0);
+	public EReference getDefinitions_Definition() {
+		return (EReference)definitionsEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1043,7 +1046,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getDefinitions_StyleSheet() {
-		return (EReference) definitionsEClass.getEStructuralFeatures().get(1);
+		return (EReference)definitionsEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1063,7 +1066,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getStyleSheet_Rule() {
-		return (EReference) styleSheetEClass.getEStructuralFeatures().get(0);
+		return (EReference)styleSheetEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1083,7 +1086,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getStyleRule_Selector() {
-		return (EReference) styleRuleEClass.getEStructuralFeatures().get(0);
+		return (EReference)styleRuleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1093,7 +1096,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getStyleRule_Style() {
-		return (EReference) styleRuleEClass.getEStructuralFeatures().get(1);
+		return (EReference)styleRuleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1113,7 +1116,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getStyleSelector_Kind() {
-		return (EAttribute) styleSelectorEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)styleSelectorEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1123,7 +1126,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getStyleSelector_Class() {
-		return (EAttribute) styleSelectorEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)styleSelectorEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1143,7 +1146,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getEllipse_Center() {
-		return (EReference) ellipseEClass.getEStructuralFeatures().get(0);
+		return (EReference)ellipseEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1153,7 +1156,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getEllipse_Radii() {
-		return (EReference) ellipseEClass.getEStructuralFeatures().get(1);
+		return (EReference)ellipseEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1173,7 +1176,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getEllipticalArcTo_Point() {
-		return (EReference) ellipticalArcToEClass.getEStructuralFeatures().get(4);
+		return (EReference)ellipticalArcToEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -1183,7 +1186,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getEllipticalArcTo_Radii() {
-		return (EReference) ellipticalArcToEClass.getEStructuralFeatures().get(0);
+		return (EReference)ellipticalArcToEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1193,7 +1196,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getEllipticalArcTo_Rotation() {
-		return (EAttribute) ellipticalArcToEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)ellipticalArcToEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1203,7 +1206,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getEllipticalArcTo_IsLargeArc() {
-		return (EAttribute) ellipticalArcToEClass.getEStructuralFeatures().get(2);
+		return (EAttribute)ellipticalArcToEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -1213,7 +1216,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getEllipticalArcTo_IsSweep() {
-		return (EAttribute) ellipticalArcToEClass.getEStructuralFeatures().get(3);
+		return (EAttribute)ellipticalArcToEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -1233,7 +1236,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getQuadraticCurveTo_Point() {
-		return (EReference) quadraticCurveToEClass.getEStructuralFeatures().get(1);
+		return (EReference)quadraticCurveToEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1243,7 +1246,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getQuadraticCurveTo_Control() {
-		return (EReference) quadraticCurveToEClass.getEStructuralFeatures().get(0);
+		return (EReference)quadraticCurveToEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1263,7 +1266,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getGradient_Stop() {
-		return (EReference) gradientEClass.getEStructuralFeatures().get(0);
+		return (EReference)gradientEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1283,7 +1286,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getGradientStop_Color() {
-		return (EAttribute) gradientStopEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)gradientStopEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1293,7 +1296,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getGradientStop_Offset() {
-		return (EAttribute) gradientStopEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)gradientStopEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1303,7 +1306,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getGradientStop_Opacity() {
-		return (EAttribute) gradientStopEClass.getEStructuralFeatures().get(2);
+		return (EAttribute)gradientStopEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -1343,7 +1346,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getImage_Source() {
-		return (EAttribute) imageEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)imageEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1353,7 +1356,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getImage_Bounds() {
-		return (EReference) imageEClass.getEStructuralFeatures().get(1);
+		return (EReference)imageEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1363,7 +1366,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getImage_IsAspectRatioPreserved() {
-		return (EAttribute) imageEClass.getEStructuralFeatures().get(2);
+		return (EAttribute)imageEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -1393,7 +1396,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getLine_Start() {
-		return (EReference) lineEClass.getEStructuralFeatures().get(0);
+		return (EReference)lineEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1403,7 +1406,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getLine_End() {
-		return (EReference) lineEClass.getEStructuralFeatures().get(1);
+		return (EReference)lineEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1423,7 +1426,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getMarkedElement_EndMarker() {
-		return (EReference) markedElementEClass.getEStructuralFeatures().get(0);
+		return (EReference)markedElementEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1433,7 +1436,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getMarkedElement_MidMarker() {
-		return (EReference) markedElementEClass.getEStructuralFeatures().get(1);
+		return (EReference)markedElementEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1443,7 +1446,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getMarkedElement_StartMarker() {
-		return (EReference) markedElementEClass.getEStructuralFeatures().get(2);
+		return (EReference)markedElementEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -1493,7 +1496,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getMarker_Size() {
-		return (EReference) markerEClass.getEStructuralFeatures().get(0);
+		return (EReference)markerEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1503,7 +1506,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getMarker_Reference() {
-		return (EReference) markerEClass.getEStructuralFeatures().get(1);
+		return (EReference)markerEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1523,7 +1526,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getLinearGradient_Start() {
-		return (EReference) linearGradientEClass.getEStructuralFeatures().get(0);
+		return (EReference)linearGradientEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1533,7 +1536,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getLinearGradient_End() {
-		return (EReference) linearGradientEClass.getEStructuralFeatures().get(1);
+		return (EReference)linearGradientEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1563,7 +1566,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getLineTo_Point() {
-		return (EReference) lineToEClass.getEStructuralFeatures().get(0);
+		return (EReference)lineToEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1583,7 +1586,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getMatrix_A() {
-		return (EAttribute) matrixEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)matrixEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1593,7 +1596,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getMatrix_B() {
-		return (EAttribute) matrixEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)matrixEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1603,7 +1606,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getMatrix_C() {
-		return (EAttribute) matrixEClass.getEStructuralFeatures().get(2);
+		return (EAttribute)matrixEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -1613,7 +1616,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getMatrix_D() {
-		return (EAttribute) matrixEClass.getEStructuralFeatures().get(3);
+		return (EAttribute)matrixEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -1623,7 +1626,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getMatrix_E() {
-		return (EAttribute) matrixEClass.getEStructuralFeatures().get(4);
+		return (EAttribute)matrixEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -1633,7 +1636,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getMatrix_F() {
-		return (EAttribute) matrixEClass.getEStructuralFeatures().get(5);
+		return (EAttribute)matrixEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -1653,7 +1656,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getPath_Command() {
-		return (EReference) pathEClass.getEStructuralFeatures().get(0);
+		return (EReference)pathEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1683,7 +1686,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getPattern_Bounds() {
-		return (EReference) patternEClass.getEStructuralFeatures().get(0);
+		return (EReference)patternEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1693,7 +1696,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getPattern_Tile() {
-		return (EReference) patternEClass.getEStructuralFeatures().get(1);
+		return (EReference)patternEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1713,7 +1716,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getPolygon_Point() {
-		return (EReference) polygonEClass.getEStructuralFeatures().get(0);
+		return (EReference)polygonEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1733,7 +1736,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getPolyline_Point() {
-		return (EReference) polylineEClass.getEStructuralFeatures().get(0);
+		return (EReference)polylineEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1753,7 +1756,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getRadialGradient_Center() {
-		return (EReference) radialGradientEClass.getEStructuralFeatures().get(0);
+		return (EReference)radialGradientEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1763,7 +1766,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getRadialGradient_Focus() {
-		return (EReference) radialGradientEClass.getEStructuralFeatures().get(1);
+		return (EReference)radialGradientEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1773,7 +1776,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getRadialGradient_Radius() {
-		return (EAttribute) radialGradientEClass.getEStructuralFeatures().get(2);
+		return (EAttribute)radialGradientEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -1823,7 +1826,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getRectangle_Bounds() {
-		return (EReference) rectangleEClass.getEStructuralFeatures().get(0);
+		return (EReference)rectangleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1833,7 +1836,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getRectangle_CornerRadius() {
-		return (EAttribute) rectangleEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)rectangleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1863,7 +1866,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getRootCanvas_BackgroundColor() {
-		return (EAttribute) rootCanvasEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)rootCanvasEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1873,7 +1876,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getRootCanvas_Definitions() {
-		return (EReference) rootCanvasEClass.getEStructuralFeatures().get(1);
+		return (EReference)rootCanvasEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1883,7 +1886,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getRootCanvas_ExternalStyleSheet() {
-		return (EReference) rootCanvasEClass.getEStructuralFeatures().get(2);
+		return (EReference)rootCanvasEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -1894,7 +1897,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getRootCanvas_Script() {
-		return (EAttribute) rootCanvasEClass.getEStructuralFeatures().get(3);
+		return (EAttribute)rootCanvasEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -1914,7 +1917,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getRotate_Angle() {
-		return (EAttribute) rotateEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)rotateEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1924,7 +1927,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getRotate_Center() {
-		return (EReference) rotateEClass.getEStructuralFeatures().get(1);
+		return (EReference)rotateEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1944,7 +1947,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getScale_FactorX() {
-		return (EAttribute) scaleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)scaleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1954,7 +1957,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getScale_FactorY() {
-		return (EAttribute) scaleEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)scaleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1984,7 +1987,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getSkew_AngleX() {
-		return (EAttribute) skewEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)skewEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1994,7 +1997,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getSkew_AngleY() {
-		return (EAttribute) skewEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)skewEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -2014,17 +2017,18 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getText_Data() {
-		return (EAttribute) textEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)textEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 */
 	@Override
-	public EReference getText_Position() {
-		return (EReference) textEClass.getEStructuralFeatures().get(1);
+	public EReference getText_Bounds() {
+		return (EReference)textEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -2035,7 +2039,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getText_Anchor() {
-		return (EAttribute) textEClass.getEStructuralFeatures().get(2);
+		return (EAttribute)textEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -2065,7 +2069,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getTranslate_DeltaX() {
-		return (EAttribute) translateEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)translateEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -2075,7 +2079,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EAttribute getTranslate_DeltaY() {
-		return (EAttribute) translateEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)translateEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -2095,7 +2099,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getUse_Bounds() {
-		return (EReference) useEClass.getEStructuralFeatures().get(0);
+		return (EReference)useEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -2105,7 +2109,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public EReference getUse_ReferencedElement() {
-		return (EReference) useEClass.getEStructuralFeatures().get(1);
+		return (EReference)useEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -2156,7 +2160,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	@Override
 	public DGFactory getDGFactory() {
-		return (DGFactory) getEFactoryInstance();
+		return (DGFactory)getEFactoryInstance();
 	}
 
 	/**
@@ -2175,7 +2179,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) {
+		if(isCreated) {
 			return;
 		}
 		isCreated = true;
@@ -2236,7 +2240,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		createEReference(cubicCurveToEClass, CUBIC_CURVE_TO__END_CONTROL);
 		createEReference(cubicCurveToEClass, CUBIC_CURVE_TO__POINT);
 		definitionsEClass = createEClass(DEFINITIONS);
-		createEReference(definitionsEClass, DEFINITIONS__DEFNITION);
+		createEReference(definitionsEClass, DEFINITIONS__DEFINITION);
 		createEReference(definitionsEClass, DEFINITIONS__STYLE_SHEET);
 		styleSheetEClass = createEClass(STYLE_SHEET);
 		createEReference(styleSheetEClass, STYLE_SHEET__RULE);
@@ -2335,7 +2339,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		createEAttribute(skewEClass, SKEW__ANGLE_Y);
 		textEClass = createEClass(TEXT);
 		createEAttribute(textEClass, TEXT__DATA);
-		createEReference(textEClass, TEXT__POSITION);
+		createEReference(textEClass, TEXT__BOUNDS);
 		createEAttribute(textEClass, TEXT__ANCHOR);
 		createEOperation(textEClass, TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP);
 		translateEClass = createEClass(TRANSLATE);
@@ -2366,7 +2370,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) {
+		if(isInitialized) {
 			return;
 		}
 		isInitialized = true;
@@ -2375,7 +2379,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		setNsPrefix(eNS_PREFIX);
 		setNsURI(eNS_URI);
 		// Obtain other dependent packages
-		DCPackage theDCPackage = (DCPackage) EPackage.Registry.INSTANCE.getEPackage(DCPackage.eNS_URI);
+		DCPackage theDCPackage = (DCPackage)EPackage.Registry.INSTANCE.getEPackage(DCPackage.eNS_URI);
 		// Create type parameters
 		// Set bounds for type parameters
 		// Add supertypes to classes
@@ -2424,17 +2428,14 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 		initEClass(groupEClass, Group.class, "Group", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getGroup_Member(), this.getGraphicalElement(), this.getGraphicalElement_Group(), "member", null, 0, -1, Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
+		initEReference(getGroup_Member(), this.getGraphicalElement(), this.getGraphicalElement_Group(), "member", null, 0, -1, Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getGroup_Layout(), theDCPackage.getString(), "layout", null, 0, 1, Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEClass(graphicalElementEClass, GraphicalElement.class, "GraphicalElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getGraphicalElement_ClipPath(), this.getClipPath(), null, "clipPath", null, 0, 1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getGraphicalElement_Group(), this.getGroup(), this.getGroup_Member(), "group", null, 0, 1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
+		initEReference(getGraphicalElement_Group(), this.getGroup(), this.getGroup_Member(), "group", null, 0, 1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getGraphicalElement_Class(), theDCPackage.getString(), "class", null, 0, -1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getGraphicalElement_Style(), this.getStyle(), null, "style", null, 0, 1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getGraphicalElement_Transform(), this.getTransform(), null, "transform", null, 0, -1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
+		initEReference(getGraphicalElement_Transform(), this.getTransform(), null, "transform", null, 0, -1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getGraphicalElement_LayoutData(), theDCPackage.getString(), "layoutData", null, 0, 1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		op = initEOperation(getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "referencedClippathHasId", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
@@ -2538,13 +2539,11 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 		initEClass(closePathEClass, ClosePath.class, "ClosePath", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(cubicCurveToEClass, CubicCurveTo.class, "CubicCurveTo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getCubicCurveTo_StartControl(), theDCPackage.getPoint(), null, "startControl", null, 1, 1, CubicCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEReference(getCubicCurveTo_EndControl(), theDCPackage.getPoint(), null, "endControl", null, 1, 1, CubicCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
+		initEReference(getCubicCurveTo_StartControl(), theDCPackage.getPoint(), null, "startControl", null, 1, 1, CubicCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getCubicCurveTo_EndControl(), theDCPackage.getPoint(), null, "endControl", null, 1, 1, CubicCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getCubicCurveTo_Point(), theDCPackage.getPoint(), null, "point", null, 1, 1, CubicCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEClass(definitionsEClass, Definitions.class, "Definitions", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDefinitions_Defnition(), this.getDefinition(), null, "defnition", null, 0, -1, Definitions.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDefinitions_Definition(), this.getDefinition(), null, "definition", null, 0, -1, Definitions.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getDefinitions_StyleSheet(), this.getStyleSheet(), null, "styleSheet", null, 0, 1, Definitions.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEClass(styleSheetEClass, StyleSheet.class, "StyleSheet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getStyleSheet_Rule(), this.getStyleRule(), null, "rule", null, 0, -1, StyleSheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2558,15 +2557,13 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		initEReference(getEllipse_Center(), theDCPackage.getPoint(), null, "center", null, 1, 1, Ellipse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getEllipse_Radii(), theDCPackage.getDimension(), null, "radii", null, 1, 1, Ellipse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEClass(ellipticalArcToEClass, EllipticalArcTo.class, "EllipticalArcTo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getEllipticalArcTo_Radii(), theDCPackage.getDimension(), null, "radii", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
+		initEReference(getEllipticalArcTo_Radii(), theDCPackage.getDimension(), null, "radii", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getEllipticalArcTo_Rotation(), theDCPackage.getReal(), "rotation", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getEllipticalArcTo_IsLargeArc(), theDCPackage.getBoolean(), "isLargeArc", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getEllipticalArcTo_IsSweep(), theDCPackage.getBoolean(), "isSweep", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getEllipticalArcTo_Point(), theDCPackage.getPoint(), null, "point", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEClass(quadraticCurveToEClass, QuadraticCurveTo.class, "QuadraticCurveTo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getQuadraticCurveTo_Control(), theDCPackage.getPoint(), null, "control", null, 1, 1, QuadraticCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
+		initEReference(getQuadraticCurveTo_Control(), theDCPackage.getPoint(), null, "control", null, 1, 1, QuadraticCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getQuadraticCurveTo_Point(), theDCPackage.getPoint(), null, "point", null, 1, 1, QuadraticCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEClass(gradientEClass, Gradient.class, "Gradient", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getGradient_Stop(), this.getGradientStop(), null, "stop", null, 2, -1, Gradient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2715,8 +2712,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		initEClass(rootCanvasEClass, RootCanvas.class, "RootCanvas", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getRootCanvas_BackgroundColor(), theDCPackage.getColor(), "backgroundColor", null, 0, 1, RootCanvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getRootCanvas_Definitions(), this.getDefinitions(), null, "definitions", null, 0, 1, RootCanvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getRootCanvas_ExternalStyleSheet(), this.getStyleSheet(), null, "externalStyleSheet", null, 0, -1, RootCanvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
+		initEReference(getRootCanvas_ExternalStyleSheet(), this.getStyleSheet(), null, "externalStyleSheet", null, 0, -1, RootCanvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getRootCanvas_Script(), theDCPackage.getString(), "script", null, 0, -1, RootCanvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEClass(rotateEClass, Rotate.class, "Rotate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getRotate_Angle(), theDCPackage.getReal(), "angle", null, 1, 1, Rotate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
@@ -2737,7 +2733,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		initEAttribute(getSkew_AngleY(), theDCPackage.getReal(), "angleY", null, 1, 1, Skew.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEClass(textEClass, Text.class, "Text", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getText_Data(), theDCPackage.getString(), "data", null, 1, 1, Text.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getText_Position(), theDCPackage.getPoint(), null, "position", null, 1, 1, Text.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getText_Bounds(), theDCPackage.getBounds(), null, "bounds", null, 1, 1, Text.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getText_Anchor(), this.getTextAnchor(), "anchor", null, 0, 1, Text.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		op = initEOperation(getText__DataCannotBeEmpty__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "dataCannotBeEmpty", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
@@ -2803,7 +2799,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	protected void createEcoreAnnotations() {
 		String source = "http://www.eclipse.org/emf/2002/Ecore";
-		addAnnotation(this, source, new String[] { "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL" });
+		addAnnotation(this, source, new String[]{ "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL" });
 	}
 
 	/**
@@ -2815,30 +2811,30 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 */
 	protected void createOCLAnnotations() {
 		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL";
-		addAnnotation(getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map(), source, new String[] { "body", "transform->isEmpty()" });
-		addAnnotation(getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map(), source, new String[] { "body", "clipPath->notEmpty() implies clipPath.id->notEmpty()" });
-		addAnnotation(getDefinition__IdCannotBeEmpty__DiagnosticChain_Map(), source, new String[] { "body", "id->notEmpty() implies id.size() > 0" });
-		addAnnotation(getStyle__ValidFontSize__DiagnosticChain_Map(), source, new String[] { "body", "fontSize >=  0" });
-		addAnnotation(getStyle__ValidFillOpacity__DiagnosticChain_Map(), source, new String[] { "body", "fillOpacity >=  0 and fillOpacity <=1" });
-		addAnnotation(getStyle__ValidStrokeWidth__DiagnosticChain_Map(), source, new String[] { "body", "strokeWidth >=  0" });
-		addAnnotation(getStyle__ValidDashLengthSize__DiagnosticChain_Map(), source, new String[] { "body", "strokeDashLength->size().mod(2) = 0" });
-		addAnnotation(getStyle__ValidStrokeOpacity__DiagnosticChain_Map(), source, new String[] { "body", "strokeOpacity >=  0 and strokeOpacity <=1" });
-		addAnnotation(getPaint__ReferencedPaintServerHasId__DiagnosticChain_Map(), source, new String[] { "body", "paintServer->notEmpty() implies paintServer.id->notEmpty()" });
-		addAnnotation(getCircle__NonNegativeRadius__DiagnosticChain_Map(), source, new String[] { "body", "radius >= 0" });
-		addAnnotation(getGradientStop__ValidOffset__DiagnosticChain_Map(), source, new String[] { "body", "offset>=0 and offset<=1" });
-		addAnnotation(getGradientStop__ValidOpacity__DiagnosticChain_Map(), source, new String[] { "body", "opacity>=0 and opacity<=1" });
-		addAnnotation(getImage__SourceCannotBeEmpty__DiagnosticChain_Map(), source, new String[] { "body", "source->notEmpty() implies source.size() > 0" });
-		addAnnotation(getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map(), source, new String[] { "body", "startMarker->notEmpty() implies startMarker.id->notEmpty()" });
-		addAnnotation(getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map(), source, new String[] { "body", "midMarker->notEmpty() implies midMarker.id->notEmpty()" });
-		addAnnotation(getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map(), source, new String[] { "body", "endMarker->notEmpty() implies endMarker.id->notEmpty()" });
-		addAnnotation(getLinearGradient__ValidGradientVector__DiagnosticChain_Map(), source, new String[] { "body", "start.x>=0 and start.x<=1 and end.x>=0 and end.x<=1 and start.y>=0 and start.y<=1 and end.y>=0 and end.y<=1" });
-		addAnnotation(getPath__FirstCommandMustBeMove__DiagnosticChain_Map(), source, new String[] { "body", "command->first().oclIsKindOf(MoveTo)" });
-		addAnnotation(getRadialGradient__ValidCenterPoint__DiagnosticChain_Map(), source, new String[] { "body", "centerX>=0 and centerX<=1 and centerY>=0 and centerY<=1" });
-		addAnnotation(getRadialGradient__ValidFocusPoint__DiagnosticChain_Map(), source, new String[] { "body", "focusX>=0 and focusX<=1 and focusY>=0 and focusY<=1" });
-		addAnnotation(getRadialGradient__ValidRadius__DiagnosticChain_Map(), source, new String[] { "body", "radius>=0 and radius<=1" });
-		addAnnotation(getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map(), source, new String[] { "body", "cornerRadius >= 0" });
-		addAnnotation(getScale__Nonnegativescale__DiagnosticChain_Map(), source, new String[] { "body", "factorX>=0 and factorY>=0" });
-		addAnnotation(getText__DataCannotBeEmpty__DiagnosticChain_Map(), source, new String[] { "body", "data->notEmpty() implies data.size() > 0" });
-		addAnnotation(getUse__ReferencedElementHasId__DiagnosticChain_Map(), source, new String[] { "body", "referencedElement->notEmpty() implies referencedElement.id->notEmpty()" });
+		addAnnotation(getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map(), source, new String[]{ "body", "transform->isEmpty()" });
+		addAnnotation(getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map(), source, new String[]{ "body", "clipPath->notEmpty() implies clipPath.id->notEmpty()" });
+		addAnnotation(getDefinition__IdCannotBeEmpty__DiagnosticChain_Map(), source, new String[]{ "body", "id->notEmpty() implies id.size() > 0" });
+		addAnnotation(getStyle__ValidFontSize__DiagnosticChain_Map(), source, new String[]{ "body", "fontSize >=  0" });
+		addAnnotation(getStyle__ValidFillOpacity__DiagnosticChain_Map(), source, new String[]{ "body", "fillOpacity >=  0 and fillOpacity <=1" });
+		addAnnotation(getStyle__ValidStrokeWidth__DiagnosticChain_Map(), source, new String[]{ "body", "strokeWidth >=  0" });
+		addAnnotation(getStyle__ValidDashLengthSize__DiagnosticChain_Map(), source, new String[]{ "body", "strokeDashLength->size().mod(2) = 0" });
+		addAnnotation(getStyle__ValidStrokeOpacity__DiagnosticChain_Map(), source, new String[]{ "body", "strokeOpacity >=  0 and strokeOpacity <=1" });
+		addAnnotation(getPaint__ReferencedPaintServerHasId__DiagnosticChain_Map(), source, new String[]{ "body", "paintServer->notEmpty() implies paintServer.id->notEmpty()" });
+		addAnnotation(getCircle__NonNegativeRadius__DiagnosticChain_Map(), source, new String[]{ "body", "radius >= 0" });
+		addAnnotation(getGradientStop__ValidOffset__DiagnosticChain_Map(), source, new String[]{ "body", "offset>=0 and offset<=1" });
+		addAnnotation(getGradientStop__ValidOpacity__DiagnosticChain_Map(), source, new String[]{ "body", "opacity>=0 and opacity<=1" });
+		addAnnotation(getImage__SourceCannotBeEmpty__DiagnosticChain_Map(), source, new String[]{ "body", "source->notEmpty() implies source.size() > 0" });
+		addAnnotation(getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map(), source, new String[]{ "body", "startMarker->notEmpty() implies startMarker.id->notEmpty()" });
+		addAnnotation(getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map(), source, new String[]{ "body", "midMarker->notEmpty() implies midMarker.id->notEmpty()" });
+		addAnnotation(getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map(), source, new String[]{ "body", "endMarker->notEmpty() implies endMarker.id->notEmpty()" });
+		addAnnotation(getLinearGradient__ValidGradientVector__DiagnosticChain_Map(), source, new String[]{ "body", "start.x>=0 and start.x<=1 and end.x>=0 and end.x<=1 and start.y>=0 and start.y<=1 and end.y>=0 and end.y<=1" });
+		addAnnotation(getPath__FirstCommandMustBeMove__DiagnosticChain_Map(), source, new String[]{ "body", "command->first().oclIsKindOf(MoveTo)" });
+		addAnnotation(getRadialGradient__ValidCenterPoint__DiagnosticChain_Map(), source, new String[]{ "body", "centerX>=0 and centerX<=1 and centerY>=0 and centerY<=1" });
+		addAnnotation(getRadialGradient__ValidFocusPoint__DiagnosticChain_Map(), source, new String[]{ "body", "focusX>=0 and focusX<=1 and focusY>=0 and focusY<=1" });
+		addAnnotation(getRadialGradient__ValidRadius__DiagnosticChain_Map(), source, new String[]{ "body", "radius>=0 and radius<=1" });
+		addAnnotation(getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map(), source, new String[]{ "body", "cornerRadius >= 0" });
+		addAnnotation(getScale__Nonnegativescale__DiagnosticChain_Map(), source, new String[]{ "body", "factorX>=0 and factorY>=0" });
+		addAnnotation(getText__DataCannotBeEmpty__DiagnosticChain_Map(), source, new String[]{ "body", "data->notEmpty() implies data.size() > 0" });
+		addAnnotation(getUse__ReferencedElementHasId__DiagnosticChain_Map(), source, new String[]{ "body", "referencedElement->notEmpty() implies referencedElement.id->notEmpty()" });
 	}
 } // DGPackageImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java
index 029bb578d26..ceeb46972f9 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java
@@ -13,14 +13,16 @@ package org.eclipse.papyrus.dd.dg.impl;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
-
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Definition;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
@@ -96,7 +98,7 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container implem
 	public void setId(String newId) {
 		String oldId = id;
 		id = newId;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.DEFINITION__ID, oldId, id));
 		}
 	}
@@ -120,8 +122,7 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container implem
 	 */
 	@Override
 	public boolean idCannotBeEmpty(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.DEFINITION, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP,
-				ID_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.DEFINITION__ID_CANNOT_BE_EMPTY);
+		return DGValidator.validate(DGPackage.Literals.DEFINITION, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP, ID_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.DEFINITION__ID_CANNOT_BE_EMPTY);
 	}
 
 	/**
@@ -131,7 +132,7 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container implem
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.DEFINITION__ID:
 			return getId();
 		}
@@ -145,9 +146,9 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container implem
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.DEFINITION__ID:
-			setId((String) newValue);
+			setId((String)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -160,7 +161,7 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container implem
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.DEFINITION__ID:
 			setId(ID_EDEFAULT);
 			return;
@@ -175,7 +176,7 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container implem
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.DEFINITION__ID:
 			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
 		}
@@ -190,9 +191,9 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container implem
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
+		switch(operationID) {
 		case DGPackage.DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP:
-			return idCannotBeEmpty((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return idCannotBeEmpty((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
@@ -204,7 +205,7 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container implem
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java
index fad14ab1375..8f3c3cddf05 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java
@@ -15,13 +15,18 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Definition;
 import org.eclipse.papyrus.dd.dg.Definitions;
@@ -32,7 +37,7 @@ import org.eclipse.papyrus.dd.dg.StyleSheet;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl#getDefnitions <em>Defnition</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl#getDefinitions <em>Definition</em>}</li>
  * <li>{@link org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl#getStyleSheet <em>Style Sheet</em>}</li>
  * </ul>
  * </p>
@@ -42,14 +47,15 @@ import org.eclipse.papyrus.dd.dg.StyleSheet;
 public class DefinitionsImpl extends MinimalEObjectImpl.Container implements Definitions {
 
 	/**
-	 * The cached value of the '{@link #getDefnitions() <em>Defnition</em>}' containment reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDefinitions() <em>Definition</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 *
-	 * @see #getDefnitions()
+	 * @see #getDefinitions()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<Definition> defnitions;
+	protected EList<Definition> definitions;
 
 	/**
 	 * The cached value of the '{@link #getStyleSheet() <em>Style Sheet</em>}' containment reference.
@@ -81,16 +87,17 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements Def
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 */
 	@Override
-	public EList<Definition> getDefnitions() {
-		if (defnitions == null) {
-			defnitions = new EObjectContainmentEList<Definition>(Definition.class, this, DGPackage.DEFINITIONS__DEFNITION);
+	public EList<Definition> getDefinitions() {
+		if(definitions == null) {
+			definitions = new EObjectContainmentEList<Definition>(Definition.class, this, DGPackage.DEFINITIONS__DEFINITION);
 		}
-		return defnitions;
+		return definitions;
 	}
 
 	/**
@@ -111,9 +118,9 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements Def
 	public NotificationChain basicSetStyleSheet(StyleSheet newStyleSheet, NotificationChain msgs) {
 		StyleSheet oldStyleSheet = styleSheet;
 		styleSheet = newStyleSheet;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.DEFINITIONS__STYLE_SHEET, oldStyleSheet, newStyleSheet);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -129,19 +136,19 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements Def
 	 */
 	@Override
 	public void setStyleSheet(StyleSheet newStyleSheet) {
-		if (newStyleSheet != styleSheet) {
+		if(newStyleSheet != styleSheet) {
 			NotificationChain msgs = null;
-			if (styleSheet != null) {
-				msgs = ((InternalEObject) styleSheet).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.DEFINITIONS__STYLE_SHEET, null, msgs);
+			if(styleSheet != null) {
+				msgs = ((InternalEObject)styleSheet).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.DEFINITIONS__STYLE_SHEET, null, msgs);
 			}
-			if (newStyleSheet != null) {
-				msgs = ((InternalEObject) newStyleSheet).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.DEFINITIONS__STYLE_SHEET, null, msgs);
+			if(newStyleSheet != null) {
+				msgs = ((InternalEObject)newStyleSheet).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.DEFINITIONS__STYLE_SHEET, null, msgs);
 			}
 			msgs = basicSetStyleSheet(newStyleSheet, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.DEFINITIONS__STYLE_SHEET, newStyleSheet, newStyleSheet));
 		}
 	}
@@ -153,9 +160,9 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements Def
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case DGPackage.DEFINITIONS__DEFNITION:
-			return ((InternalEList<?>) getDefnitions()).basicRemove(otherEnd, msgs);
+		switch(featureID) {
+		case DGPackage.DEFINITIONS__DEFINITION:
+			return ((InternalEList<?>)getDefinitions()).basicRemove(otherEnd, msgs);
 		case DGPackage.DEFINITIONS__STYLE_SHEET:
 			return basicSetStyleSheet(null, msgs);
 		}
@@ -169,9 +176,9 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements Def
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case DGPackage.DEFINITIONS__DEFNITION:
-			return getDefnitions();
+		switch(featureID) {
+		case DGPackage.DEFINITIONS__DEFINITION:
+			return getDefinitions();
 		case DGPackage.DEFINITIONS__STYLE_SHEET:
 			return getStyleSheet();
 		}
@@ -186,13 +193,13 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements Def
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case DGPackage.DEFINITIONS__DEFNITION:
-			getDefnitions().clear();
-			getDefnitions().addAll((Collection<? extends Definition>) newValue);
+		switch(featureID) {
+		case DGPackage.DEFINITIONS__DEFINITION:
+			getDefinitions().clear();
+			getDefinitions().addAll((Collection<? extends Definition>)newValue);
 			return;
 		case DGPackage.DEFINITIONS__STYLE_SHEET:
-			setStyleSheet((StyleSheet) newValue);
+			setStyleSheet((StyleSheet)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -205,12 +212,12 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements Def
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-		case DGPackage.DEFINITIONS__DEFNITION:
-			getDefnitions().clear();
+		switch(featureID) {
+		case DGPackage.DEFINITIONS__DEFINITION:
+			getDefinitions().clear();
 			return;
 		case DGPackage.DEFINITIONS__STYLE_SHEET:
-			setStyleSheet((StyleSheet) null);
+			setStyleSheet((StyleSheet)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -223,9 +230,9 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements Def
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case DGPackage.DEFINITIONS__DEFNITION:
-			return defnitions != null && !defnitions.isEmpty();
+		switch(featureID) {
+		case DGPackage.DEFINITIONS__DEFINITION:
+			return definitions != null && !definitions.isEmpty();
 		case DGPackage.DEFINITIONS__STYLE_SHEET:
 			return styleSheet != null;
 		}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipseImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipseImpl.java
index 0185203693a..ae535e9c4fe 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipseImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipseImpl.java
@@ -13,11 +13,15 @@ package org.eclipse.papyrus.dd.dg.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dc.Dimension;
 import org.eclipse.papyrus.dd.dc.Point;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Ellipse;
 
@@ -92,9 +96,9 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 	public NotificationChain basicSetCenter(Point newCenter, NotificationChain msgs) {
 		Point oldCenter = center;
 		center = newCenter;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPSE__CENTER, oldCenter, newCenter);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -110,19 +114,19 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 	 */
 	@Override
 	public void setCenter(Point newCenter) {
-		if (newCenter != center) {
+		if(newCenter != center) {
 			NotificationChain msgs = null;
-			if (center != null) {
-				msgs = ((InternalEObject) center).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__CENTER, null, msgs);
+			if(center != null) {
+				msgs = ((InternalEObject)center).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__CENTER, null, msgs);
 			}
-			if (newCenter != null) {
-				msgs = ((InternalEObject) newCenter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__CENTER, null, msgs);
+			if(newCenter != null) {
+				msgs = ((InternalEObject)newCenter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__CENTER, null, msgs);
 			}
 			msgs = basicSetCenter(newCenter, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPSE__CENTER, newCenter, newCenter));
 		}
 	}
@@ -145,9 +149,9 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 	public NotificationChain basicSetRadii(Dimension newRadii, NotificationChain msgs) {
 		Dimension oldRadii = radii;
 		radii = newRadii;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPSE__RADII, oldRadii, newRadii);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -163,19 +167,19 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 	 */
 	@Override
 	public void setRadii(Dimension newRadii) {
-		if (newRadii != radii) {
+		if(newRadii != radii) {
 			NotificationChain msgs = null;
-			if (radii != null) {
-				msgs = ((InternalEObject) radii).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__RADII, null, msgs);
+			if(radii != null) {
+				msgs = ((InternalEObject)radii).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__RADII, null, msgs);
 			}
-			if (newRadii != null) {
-				msgs = ((InternalEObject) newRadii).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__RADII, null, msgs);
+			if(newRadii != null) {
+				msgs = ((InternalEObject)newRadii).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__RADII, null, msgs);
 			}
 			msgs = basicSetRadii(newRadii, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPSE__RADII, newRadii, newRadii));
 		}
 	}
@@ -187,7 +191,7 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ELLIPSE__CENTER:
 			return basicSetCenter(null, msgs);
 		case DGPackage.ELLIPSE__RADII:
@@ -203,7 +207,7 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ELLIPSE__CENTER:
 			return getCenter();
 		case DGPackage.ELLIPSE__RADII:
@@ -219,12 +223,12 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ELLIPSE__CENTER:
-			setCenter((Point) newValue);
+			setCenter((Point)newValue);
 			return;
 		case DGPackage.ELLIPSE__RADII:
-			setRadii((Dimension) newValue);
+			setRadii((Dimension)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -237,12 +241,12 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ELLIPSE__CENTER:
-			setCenter((Point) null);
+			setCenter((Point)null);
 			return;
 		case DGPackage.ELLIPSE__RADII:
-			setRadii((Dimension) null);
+			setRadii((Dimension)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -255,7 +259,7 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ELLIPSE__CENTER:
 			return center != null;
 		case DGPackage.ELLIPSE__RADII:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java
index 65685f105a2..e3a9cd890e3 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java
@@ -13,11 +13,15 @@ package org.eclipse.papyrus.dd.dg.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dc.Dimension;
 import org.eclipse.papyrus.dd.dc.Point;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.EllipticalArcTo;
 
@@ -155,9 +159,9 @@ public class EllipticalArcToImpl extends PathCommandImpl implements EllipticalAr
 	public NotificationChain basicSetRadii(Dimension newRadii, NotificationChain msgs) {
 		Dimension oldRadii = radii;
 		radii = newRadii;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__RADII, oldRadii, newRadii);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -173,19 +177,19 @@ public class EllipticalArcToImpl extends PathCommandImpl implements EllipticalAr
 	 */
 	@Override
 	public void setRadii(Dimension newRadii) {
-		if (newRadii != radii) {
+		if(newRadii != radii) {
 			NotificationChain msgs = null;
-			if (radii != null) {
-				msgs = ((InternalEObject) radii).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPTICAL_ARC_TO__RADII, null, msgs);
+			if(radii != null) {
+				msgs = ((InternalEObject)radii).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPTICAL_ARC_TO__RADII, null, msgs);
 			}
-			if (newRadii != null) {
-				msgs = ((InternalEObject) newRadii).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPTICAL_ARC_TO__RADII, null, msgs);
+			if(newRadii != null) {
+				msgs = ((InternalEObject)newRadii).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPTICAL_ARC_TO__RADII, null, msgs);
 			}
 			msgs = basicSetRadii(newRadii, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__RADII, newRadii, newRadii));
 		}
 	}
@@ -209,7 +213,7 @@ public class EllipticalArcToImpl extends PathCommandImpl implements EllipticalAr
 	public void setRotation(double newRotation) {
 		double oldRotation = rotation;
 		rotation = newRotation;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__ROTATION, oldRotation, rotation));
 		}
 	}
@@ -233,7 +237,7 @@ public class EllipticalArcToImpl extends PathCommandImpl implements EllipticalAr
 	public void setIsLargeArc(boolean newIsLargeArc) {
 		boolean oldIsLargeArc = isLargeArc;
 		isLargeArc = newIsLargeArc;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC, oldIsLargeArc, isLargeArc));
 		}
 	}
@@ -257,7 +261,7 @@ public class EllipticalArcToImpl extends PathCommandImpl implements EllipticalAr
 	public void setIsSweep(boolean newIsSweep) {
 		boolean oldIsSweep = isSweep;
 		isSweep = newIsSweep;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP, oldIsSweep, isSweep));
 		}
 	}
@@ -280,9 +284,9 @@ public class EllipticalArcToImpl extends PathCommandImpl implements EllipticalAr
 	public NotificationChain basicSetPoint(Point newPoint, NotificationChain msgs) {
 		Point oldPoint = point;
 		point = newPoint;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__POINT, oldPoint, newPoint);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -298,19 +302,19 @@ public class EllipticalArcToImpl extends PathCommandImpl implements EllipticalAr
 	 */
 	@Override
 	public void setPoint(Point newPoint) {
-		if (newPoint != point) {
+		if(newPoint != point) {
 			NotificationChain msgs = null;
-			if (point != null) {
-				msgs = ((InternalEObject) point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPTICAL_ARC_TO__POINT, null, msgs);
+			if(point != null) {
+				msgs = ((InternalEObject)point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPTICAL_ARC_TO__POINT, null, msgs);
 			}
-			if (newPoint != null) {
-				msgs = ((InternalEObject) newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPTICAL_ARC_TO__POINT, null, msgs);
+			if(newPoint != null) {
+				msgs = ((InternalEObject)newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPTICAL_ARC_TO__POINT, null, msgs);
 			}
 			msgs = basicSetPoint(newPoint, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__POINT, newPoint, newPoint));
 		}
 	}
@@ -322,7 +326,7 @@ public class EllipticalArcToImpl extends PathCommandImpl implements EllipticalAr
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ELLIPTICAL_ARC_TO__RADII:
 			return basicSetRadii(null, msgs);
 		case DGPackage.ELLIPTICAL_ARC_TO__POINT:
@@ -338,7 +342,7 @@ public class EllipticalArcToImpl extends PathCommandImpl implements EllipticalAr
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ELLIPTICAL_ARC_TO__RADII:
 			return getRadii();
 		case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
@@ -360,21 +364,21 @@ public class EllipticalArcToImpl extends PathCommandImpl implements EllipticalAr
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ELLIPTICAL_ARC_TO__RADII:
-			setRadii((Dimension) newValue);
+			setRadii((Dimension)newValue);
 			return;
 		case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
-			setRotation((Double) newValue);
+			setRotation((Double)newValue);
 			return;
 		case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
-			setIsLargeArc((Boolean) newValue);
+			setIsLargeArc((Boolean)newValue);
 			return;
 		case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
-			setIsSweep((Boolean) newValue);
+			setIsSweep((Boolean)newValue);
 			return;
 		case DGPackage.ELLIPTICAL_ARC_TO__POINT:
-			setPoint((Point) newValue);
+			setPoint((Point)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -387,9 +391,9 @@ public class EllipticalArcToImpl extends PathCommandImpl implements EllipticalAr
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ELLIPTICAL_ARC_TO__RADII:
-			setRadii((Dimension) null);
+			setRadii((Dimension)null);
 			return;
 		case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
 			setRotation(ROTATION_EDEFAULT);
@@ -401,7 +405,7 @@ public class EllipticalArcToImpl extends PathCommandImpl implements EllipticalAr
 			setIsSweep(IS_SWEEP_EDEFAULT);
 			return;
 		case DGPackage.ELLIPTICAL_ARC_TO__POINT:
-			setPoint((Point) null);
+			setPoint((Point)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -414,7 +418,7 @@ public class EllipticalArcToImpl extends PathCommandImpl implements EllipticalAr
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ELLIPTICAL_ARC_TO__RADII:
 			return radii != null;
 		case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
@@ -436,7 +440,7 @@ public class EllipticalArcToImpl extends PathCommandImpl implements EllipticalAr
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java
index 3ffa5a16ea1..7f67054b35e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java
@@ -12,7 +12,6 @@
 package org.eclipse.papyrus.dd.dg.impl;
 
 import java.util.Collection;
-
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -72,7 +71,7 @@ public abstract class GradientImpl extends PaintServerImpl implements Gradient {
 	 */
 	@Override
 	public EList<GradientStop> getStops() {
-		if (stops == null) {
+		if(stops == null) {
 			stops = new EObjectContainmentEList<GradientStop>(GradientStop.class, this, DGPackage.GRADIENT__STOP);
 		}
 		return stops;
@@ -85,9 +84,9 @@ public abstract class GradientImpl extends PaintServerImpl implements Gradient {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GRADIENT__STOP:
-			return ((InternalEList<?>) getStops()).basicRemove(otherEnd, msgs);
+			return ((InternalEList<?>)getStops()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -99,7 +98,7 @@ public abstract class GradientImpl extends PaintServerImpl implements Gradient {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GRADIENT__STOP:
 			return getStops();
 		}
@@ -114,10 +113,10 @@ public abstract class GradientImpl extends PaintServerImpl implements Gradient {
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GRADIENT__STOP:
 			getStops().clear();
-			getStops().addAll((Collection<? extends GradientStop>) newValue);
+			getStops().addAll((Collection<? extends GradientStop>)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -130,7 +129,7 @@ public abstract class GradientImpl extends PaintServerImpl implements Gradient {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GRADIENT__STOP:
 			getStops().clear();
 			return;
@@ -145,7 +144,7 @@ public abstract class GradientImpl extends PaintServerImpl implements Gradient {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GRADIENT__STOP:
 			return stops != null && !stops.isEmpty();
 		}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java
index b3e0467491e..098c084879d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java
@@ -12,18 +12,25 @@
 package org.eclipse.papyrus.dd.dg.impl;
 
 import java.awt.Color;
+
 import java.lang.reflect.InvocationTargetException;
+
 import java.util.Map;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.GradientStop;
+
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
@@ -171,7 +178,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements Gr
 		color = newColor;
 		boolean oldColorESet = colorESet;
 		colorESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRADIENT_STOP__COLOR, oldColor, color, !oldColorESet));
 		}
 	}
@@ -187,7 +194,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements Gr
 		boolean oldColorESet = colorESet;
 		color = COLOR_EDEFAULT;
 		colorESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.GRADIENT_STOP__COLOR, oldColor, COLOR_EDEFAULT, oldColorESet));
 		}
 	}
@@ -223,7 +230,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements Gr
 		offset = newOffset;
 		boolean oldOffsetESet = offsetESet;
 		offsetESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRADIENT_STOP__OFFSET, oldOffset, offset, !oldOffsetESet));
 		}
 	}
@@ -239,7 +246,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements Gr
 		boolean oldOffsetESet = offsetESet;
 		offset = OFFSET_EDEFAULT;
 		offsetESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.GRADIENT_STOP__OFFSET, oldOffset, OFFSET_EDEFAULT, oldOffsetESet));
 		}
 	}
@@ -275,7 +282,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements Gr
 		opacity = newOpacity;
 		boolean oldOpacityESet = opacityESet;
 		opacityESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRADIENT_STOP__OPACITY, oldOpacity, opacity, !oldOpacityESet));
 		}
 	}
@@ -291,7 +298,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements Gr
 		boolean oldOpacityESet = opacityESet;
 		opacity = OPACITY_EDEFAULT;
 		opacityESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.GRADIENT_STOP__OPACITY, oldOpacity, OPACITY_EDEFAULT, oldOpacityESet));
 		}
 	}
@@ -325,8 +332,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements Gr
 	 */
 	@Override
 	public boolean validOffset(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.GRADIENT_STOP, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.GRADIENT_STOP___VALID_OFFSET__DIAGNOSTICCHAIN_MAP,
-				VALID_OFFSET_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.GRADIENT_STOP__VALID_OFFSET);
+		return DGValidator.validate(DGPackage.Literals.GRADIENT_STOP, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.GRADIENT_STOP___VALID_OFFSET__DIAGNOSTICCHAIN_MAP, VALID_OFFSET_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.GRADIENT_STOP__VALID_OFFSET);
 	}
 
 	/**
@@ -348,8 +354,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements Gr
 	 */
 	@Override
 	public boolean validOpacity(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.GRADIENT_STOP, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.GRADIENT_STOP___VALID_OPACITY__DIAGNOSTICCHAIN_MAP,
-				VALID_OPACITY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.GRADIENT_STOP__VALID_OPACITY);
+		return DGValidator.validate(DGPackage.Literals.GRADIENT_STOP, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.GRADIENT_STOP___VALID_OPACITY__DIAGNOSTICCHAIN_MAP, VALID_OPACITY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.GRADIENT_STOP__VALID_OPACITY);
 	}
 
 	/**
@@ -359,7 +364,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements Gr
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GRADIENT_STOP__COLOR:
 			return getColor();
 		case DGPackage.GRADIENT_STOP__OFFSET:
@@ -377,15 +382,15 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements Gr
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GRADIENT_STOP__COLOR:
-			setColor((Color) newValue);
+			setColor((Color)newValue);
 			return;
 		case DGPackage.GRADIENT_STOP__OFFSET:
-			setOffset((Double) newValue);
+			setOffset((Double)newValue);
 			return;
 		case DGPackage.GRADIENT_STOP__OPACITY:
-			setOpacity((Double) newValue);
+			setOpacity((Double)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -398,7 +403,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements Gr
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GRADIENT_STOP__COLOR:
 			unsetColor();
 			return;
@@ -419,7 +424,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements Gr
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GRADIENT_STOP__COLOR:
 			return isSetColor();
 		case DGPackage.GRADIENT_STOP__OFFSET:
@@ -438,11 +443,11 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements Gr
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
+		switch(operationID) {
 		case DGPackage.GRADIENT_STOP___VALID_OFFSET__DIAGNOSTICCHAIN_MAP:
-			return validOffset((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return validOffset((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		case DGPackage.GRADIENT_STOP___VALID_OPACITY__DIAGNOSTICCHAIN_MAP:
-			return validOpacity((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return validOpacity((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
@@ -454,24 +459,24 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements Gr
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (color: ");
-		if (colorESet) {
+		if(colorESet) {
 			result.append(color);
 		} else {
 			result.append("<unset>");
 		}
 		result.append(", offset: ");
-		if (offsetESet) {
+		if(offsetESet) {
 			result.append(offset);
 		} else {
 			result.append("<unset>");
 		}
 		result.append(", opacity: ");
-		if (opacityESet) {
+		if(opacityESet) {
 			result.append(opacity);
 		} else {
 			result.append("<unset>");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java
index 99b2c630a6d..933cd989cba 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java
@@ -14,7 +14,6 @@ package org.eclipse.papyrus.dd.dg.impl;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
 import java.util.Map;
-
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.Diagnostic;
@@ -141,11 +140,11 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	 */
 	@Override
 	public ClipPath getClipPath() {
-		if (clipPath != null && clipPath.eIsProxy()) {
-			InternalEObject oldClipPath = (InternalEObject) clipPath;
-			clipPath = (ClipPath) eResolveProxy(oldClipPath);
-			if (clipPath != oldClipPath) {
-				if (eNotificationRequired()) {
+		if(clipPath != null && clipPath.eIsProxy()) {
+			InternalEObject oldClipPath = (InternalEObject)clipPath;
+			clipPath = (ClipPath)eResolveProxy(oldClipPath);
+			if(clipPath != oldClipPath) {
+				if(eNotificationRequired()) {
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH, oldClipPath, clipPath));
 				}
 			}
@@ -171,7 +170,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	public void setClipPath(ClipPath newClipPath) {
 		ClipPath oldClipPath = clipPath;
 		clipPath = newClipPath;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH, oldClipPath, clipPath));
 		}
 	}
@@ -183,10 +182,10 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	 */
 	@Override
 	public Group getGroup() {
-		if (eContainerFeatureID() != DGPackage.GRAPHICAL_ELEMENT__GROUP) {
+		if(eContainerFeatureID() != DGPackage.GRAPHICAL_ELEMENT__GROUP) {
 			return null;
 		}
-		return (Group) eInternalContainer();
+		return (Group)eInternalContainer();
 	}
 
 	/**
@@ -195,7 +194,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	 * @generated
 	 */
 	public NotificationChain basicSetGroup(Group newGroup, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject) newGroup, DGPackage.GRAPHICAL_ELEMENT__GROUP, msgs);
+		msgs = eBasicSetContainer((InternalEObject)newGroup, DGPackage.GRAPHICAL_ELEMENT__GROUP, msgs);
 		return msgs;
 	}
 
@@ -206,22 +205,22 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	 */
 	@Override
 	public void setGroup(Group newGroup) {
-		if (newGroup != eInternalContainer() || (eContainerFeatureID() != DGPackage.GRAPHICAL_ELEMENT__GROUP && newGroup != null)) {
-			if (EcoreUtil.isAncestor(this, newGroup)) {
+		if(newGroup != eInternalContainer() || (eContainerFeatureID() != DGPackage.GRAPHICAL_ELEMENT__GROUP && newGroup != null)) {
+			if(EcoreUtil.isAncestor(this, newGroup)) {
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			}
 			NotificationChain msgs = null;
-			if (eInternalContainer() != null) {
+			if(eInternalContainer() != null) {
 				msgs = eBasicRemoveFromContainer(msgs);
 			}
-			if (newGroup != null) {
-				msgs = ((InternalEObject) newGroup).eInverseAdd(this, DGPackage.GROUP__MEMBER, Group.class, msgs);
+			if(newGroup != null) {
+				msgs = ((InternalEObject)newGroup).eInverseAdd(this, DGPackage.GROUP__MEMBER, Group.class, msgs);
 			}
 			msgs = basicSetGroup(newGroup, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRAPHICAL_ELEMENT__GROUP, newGroup, newGroup));
 		}
 	}
@@ -233,7 +232,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	 */
 	@Override
 	public EList<String> getClasses() {
-		if (classes == null) {
+		if(classes == null) {
 			classes = new EDataTypeUniqueEList<String>(String.class, this, DGPackage.GRAPHICAL_ELEMENT__CLASS);
 		}
 		return classes;
@@ -257,9 +256,9 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	public NotificationChain basicSetStyle(Style newStyle, NotificationChain msgs) {
 		Style oldStyle = style;
 		style = newStyle;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.GRAPHICAL_ELEMENT__STYLE, oldStyle, newStyle);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -275,19 +274,19 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	 */
 	@Override
 	public void setStyle(Style newStyle) {
-		if (newStyle != style) {
+		if(newStyle != style) {
 			NotificationChain msgs = null;
-			if (style != null) {
-				msgs = ((InternalEObject) style).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.GRAPHICAL_ELEMENT__STYLE, null, msgs);
+			if(style != null) {
+				msgs = ((InternalEObject)style).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.GRAPHICAL_ELEMENT__STYLE, null, msgs);
 			}
-			if (newStyle != null) {
-				msgs = ((InternalEObject) newStyle).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.GRAPHICAL_ELEMENT__STYLE, null, msgs);
+			if(newStyle != null) {
+				msgs = ((InternalEObject)newStyle).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.GRAPHICAL_ELEMENT__STYLE, null, msgs);
 			}
 			msgs = basicSetStyle(newStyle, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRAPHICAL_ELEMENT__STYLE, newStyle, newStyle));
 		}
 	}
@@ -299,7 +298,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	 */
 	@Override
 	public EList<Transform> getTransforms() {
-		if (transforms == null) {
+		if(transforms == null) {
 			transforms = new EObjectContainmentEList<Transform>(Transform.class, this, DGPackage.GRAPHICAL_ELEMENT__TRANSFORM);
 		}
 		return transforms;
@@ -326,7 +325,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	public void setLayoutData(String newLayoutData) {
 		String oldLayoutData = layoutData;
 		layoutData = newLayoutData;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA, oldLayoutData, layoutData));
 		}
 	}
@@ -349,8 +348,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	 */
 	@Override
 	public boolean referencedClippathHasId(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.GRAPHICAL_ELEMENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP,
-				REFERENCED_CLIPPATH_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.GRAPHICAL_ELEMENT__REFERENCED_CLIPPATH_HAS_ID);
+		return DGValidator.validate(DGPackage.Literals.GRAPHICAL_ELEMENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP, REFERENCED_CLIPPATH_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.GRAPHICAL_ELEMENT__REFERENCED_CLIPPATH_HAS_ID);
 	}
 
 	/**
@@ -360,12 +358,12 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	 */
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
-			if (eInternalContainer() != null) {
+			if(eInternalContainer() != null) {
 				msgs = eBasicRemoveFromContainer(msgs);
 			}
-			return basicSetGroup((Group) otherEnd, msgs);
+			return basicSetGroup((Group)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -377,13 +375,13 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
 			return basicSetGroup(null, msgs);
 		case DGPackage.GRAPHICAL_ELEMENT__STYLE:
 			return basicSetStyle(null, msgs);
 		case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
-			return ((InternalEList<?>) getTransforms()).basicRemove(otherEnd, msgs);
+			return ((InternalEList<?>)getTransforms()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -395,7 +393,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	 */
 	@Override
 	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
+		switch(eContainerFeatureID()) {
 		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
 			return eInternalContainer().eInverseRemove(this, DGPackage.GROUP__MEMBER, Group.class, msgs);
 		}
@@ -409,9 +407,9 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
-			if (resolve) {
+			if(resolve) {
 				return getClipPath();
 			}
 			return basicGetClipPath();
@@ -437,26 +435,26 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
-			setClipPath((ClipPath) newValue);
+			setClipPath((ClipPath)newValue);
 			return;
 		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
-			setGroup((Group) newValue);
+			setGroup((Group)newValue);
 			return;
 		case DGPackage.GRAPHICAL_ELEMENT__CLASS:
 			getClasses().clear();
-			getClasses().addAll((Collection<? extends String>) newValue);
+			getClasses().addAll((Collection<? extends String>)newValue);
 			return;
 		case DGPackage.GRAPHICAL_ELEMENT__STYLE:
-			setStyle((Style) newValue);
+			setStyle((Style)newValue);
 			return;
 		case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
 			getTransforms().clear();
-			getTransforms().addAll((Collection<? extends Transform>) newValue);
+			getTransforms().addAll((Collection<? extends Transform>)newValue);
 			return;
 		case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
-			setLayoutData((String) newValue);
+			setLayoutData((String)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -469,18 +467,18 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
-			setClipPath((ClipPath) null);
+			setClipPath((ClipPath)null);
 			return;
 		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
-			setGroup((Group) null);
+			setGroup((Group)null);
 			return;
 		case DGPackage.GRAPHICAL_ELEMENT__CLASS:
 			getClasses().clear();
 			return;
 		case DGPackage.GRAPHICAL_ELEMENT__STYLE:
-			setStyle((Style) null);
+			setStyle((Style)null);
 			return;
 		case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
 			getTransforms().clear();
@@ -499,7 +497,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
 			return clipPath != null;
 		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
@@ -524,9 +522,9 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
+		switch(operationID) {
 		case DGPackage.GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP:
-			return referencedClippathHasId((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return referencedClippathHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
@@ -538,7 +536,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements Gra
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java
index 2bd73fa3b78..55df1ac0504 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java
@@ -15,12 +15,16 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.GraphicalElement;
 import org.eclipse.papyrus.dd.dg.Group;
@@ -97,7 +101,7 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 	 */
 	@Override
 	public EList<GraphicalElement> getMembers() {
-		if (members == null) {
+		if(members == null) {
 			members = new EObjectContainmentWithInverseEList<GraphicalElement>(GraphicalElement.class, this, DGPackage.GROUP__MEMBER, DGPackage.GRAPHICAL_ELEMENT__GROUP);
 		}
 		return members;
@@ -124,7 +128,7 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 	public void setLayout(String newLayout) {
 		String oldLayout = layout;
 		layout = newLayout;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GROUP__LAYOUT, oldLayout, layout));
 		}
 	}
@@ -137,9 +141,9 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 	@SuppressWarnings("unchecked")
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GROUP__MEMBER:
-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getMembers()).basicAdd(otherEnd, msgs);
+			return ((InternalEList<InternalEObject>)(InternalEList<?>)getMembers()).basicAdd(otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -151,9 +155,9 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GROUP__MEMBER:
-			return ((InternalEList<?>) getMembers()).basicRemove(otherEnd, msgs);
+			return ((InternalEList<?>)getMembers()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -165,7 +169,7 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GROUP__MEMBER:
 			return getMembers();
 		case DGPackage.GROUP__LAYOUT:
@@ -182,13 +186,13 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GROUP__MEMBER:
 			getMembers().clear();
-			getMembers().addAll((Collection<? extends GraphicalElement>) newValue);
+			getMembers().addAll((Collection<? extends GraphicalElement>)newValue);
 			return;
 		case DGPackage.GROUP__LAYOUT:
-			setLayout((String) newValue);
+			setLayout((String)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -201,7 +205,7 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GROUP__MEMBER:
 			getMembers().clear();
 			return;
@@ -219,7 +223,7 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.GROUP__MEMBER:
 			return members != null && !members.isEmpty();
 		case DGPackage.GROUP__LAYOUT:
@@ -236,7 +240,7 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java
index a2c17d92cde..4272f521bd6 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java
@@ -13,16 +13,19 @@ package org.eclipse.papyrus.dd.dg.impl;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
-
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dc.Bounds;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Image;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
@@ -132,7 +135,7 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	public void setSource(String newSource) {
 		String oldSource = source;
 		source = newSource;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.IMAGE__SOURCE, oldSource, source));
 		}
 	}
@@ -155,9 +158,9 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	public NotificationChain basicSetBounds(Bounds newBounds, NotificationChain msgs) {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.IMAGE__BOUNDS, oldBounds, newBounds);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -173,19 +176,19 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	 */
 	@Override
 	public void setBounds(Bounds newBounds) {
-		if (newBounds != bounds) {
+		if(newBounds != bounds) {
 			NotificationChain msgs = null;
-			if (bounds != null) {
-				msgs = ((InternalEObject) bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.IMAGE__BOUNDS, null, msgs);
+			if(bounds != null) {
+				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.IMAGE__BOUNDS, null, msgs);
 			}
-			if (newBounds != null) {
-				msgs = ((InternalEObject) newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.IMAGE__BOUNDS, null, msgs);
+			if(newBounds != null) {
+				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.IMAGE__BOUNDS, null, msgs);
 			}
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.IMAGE__BOUNDS, newBounds, newBounds));
 		}
 	}
@@ -209,7 +212,7 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	public void setIsAspectRatioPreserved(boolean newIsAspectRatioPreserved) {
 		boolean oldIsAspectRatioPreserved = isAspectRatioPreserved;
 		isAspectRatioPreserved = newIsAspectRatioPreserved;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED, oldIsAspectRatioPreserved, isAspectRatioPreserved));
 		}
 	}
@@ -232,8 +235,7 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	 */
 	@Override
 	public boolean sourceCannotBeEmpty(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.IMAGE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP,
-				SOURCE_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.IMAGE__SOURCE_CANNOT_BE_EMPTY);
+		return DGValidator.validate(DGPackage.Literals.IMAGE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP, SOURCE_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.IMAGE__SOURCE_CANNOT_BE_EMPTY);
 	}
 
 	/**
@@ -243,7 +245,7 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.IMAGE__BOUNDS:
 			return basicSetBounds(null, msgs);
 		}
@@ -257,7 +259,7 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.IMAGE__SOURCE:
 			return getSource();
 		case DGPackage.IMAGE__BOUNDS:
@@ -275,15 +277,15 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.IMAGE__SOURCE:
-			setSource((String) newValue);
+			setSource((String)newValue);
 			return;
 		case DGPackage.IMAGE__BOUNDS:
-			setBounds((Bounds) newValue);
+			setBounds((Bounds)newValue);
 			return;
 		case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
-			setIsAspectRatioPreserved((Boolean) newValue);
+			setIsAspectRatioPreserved((Boolean)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -296,12 +298,12 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.IMAGE__SOURCE:
 			setSource(SOURCE_EDEFAULT);
 			return;
 		case DGPackage.IMAGE__BOUNDS:
-			setBounds((Bounds) null);
+			setBounds((Bounds)null);
 			return;
 		case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
 			setIsAspectRatioPreserved(IS_ASPECT_RATIO_PRESERVED_EDEFAULT);
@@ -317,7 +319,7 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.IMAGE__SOURCE:
 			return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
 		case DGPackage.IMAGE__BOUNDS:
@@ -336,9 +338,9 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
+		switch(operationID) {
 		case DGPackage.IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP:
-			return sourceCannotBeEmpty((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return sourceCannotBeEmpty((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
@@ -350,7 +352,7 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineImpl.java
index 14da5d6f3d1..4f75dc27196 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineImpl.java
@@ -13,10 +13,14 @@ package org.eclipse.papyrus.dd.dg.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dc.Point;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Line;
 
@@ -91,9 +95,9 @@ public class LineImpl extends MarkedElementImpl implements Line {
 	public NotificationChain basicSetStart(Point newStart, NotificationChain msgs) {
 		Point oldStart = start;
 		start = newStart;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.LINE__START, oldStart, newStart);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -109,19 +113,19 @@ public class LineImpl extends MarkedElementImpl implements Line {
 	 */
 	@Override
 	public void setStart(Point newStart) {
-		if (newStart != start) {
+		if(newStart != start) {
 			NotificationChain msgs = null;
-			if (start != null) {
-				msgs = ((InternalEObject) start).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE__START, null, msgs);
+			if(start != null) {
+				msgs = ((InternalEObject)start).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE__START, null, msgs);
 			}
-			if (newStart != null) {
-				msgs = ((InternalEObject) newStart).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE__START, null, msgs);
+			if(newStart != null) {
+				msgs = ((InternalEObject)newStart).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE__START, null, msgs);
 			}
 			msgs = basicSetStart(newStart, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.LINE__START, newStart, newStart));
 		}
 	}
@@ -144,9 +148,9 @@ public class LineImpl extends MarkedElementImpl implements Line {
 	public NotificationChain basicSetEnd(Point newEnd, NotificationChain msgs) {
 		Point oldEnd = end;
 		end = newEnd;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.LINE__END, oldEnd, newEnd);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -162,19 +166,19 @@ public class LineImpl extends MarkedElementImpl implements Line {
 	 */
 	@Override
 	public void setEnd(Point newEnd) {
-		if (newEnd != end) {
+		if(newEnd != end) {
 			NotificationChain msgs = null;
-			if (end != null) {
-				msgs = ((InternalEObject) end).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE__END, null, msgs);
+			if(end != null) {
+				msgs = ((InternalEObject)end).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE__END, null, msgs);
 			}
-			if (newEnd != null) {
-				msgs = ((InternalEObject) newEnd).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE__END, null, msgs);
+			if(newEnd != null) {
+				msgs = ((InternalEObject)newEnd).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE__END, null, msgs);
 			}
 			msgs = basicSetEnd(newEnd, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.LINE__END, newEnd, newEnd));
 		}
 	}
@@ -186,7 +190,7 @@ public class LineImpl extends MarkedElementImpl implements Line {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.LINE__START:
 			return basicSetStart(null, msgs);
 		case DGPackage.LINE__END:
@@ -202,7 +206,7 @@ public class LineImpl extends MarkedElementImpl implements Line {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.LINE__START:
 			return getStart();
 		case DGPackage.LINE__END:
@@ -218,12 +222,12 @@ public class LineImpl extends MarkedElementImpl implements Line {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.LINE__START:
-			setStart((Point) newValue);
+			setStart((Point)newValue);
 			return;
 		case DGPackage.LINE__END:
-			setEnd((Point) newValue);
+			setEnd((Point)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -236,12 +240,12 @@ public class LineImpl extends MarkedElementImpl implements Line {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.LINE__START:
-			setStart((Point) null);
+			setStart((Point)null);
 			return;
 		case DGPackage.LINE__END:
-			setEnd((Point) null);
+			setEnd((Point)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -254,7 +258,7 @@ public class LineImpl extends MarkedElementImpl implements Line {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.LINE__START:
 			return start != null;
 		case DGPackage.LINE__END:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineToImpl.java
index 56f580d33b6..7f1650d350a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineToImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineToImpl.java
@@ -13,10 +13,14 @@ package org.eclipse.papyrus.dd.dg.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dc.Point;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.LineTo;
 
@@ -80,9 +84,9 @@ public class LineToImpl extends PathCommandImpl implements LineTo {
 	public NotificationChain basicSetPoint(Point newPoint, NotificationChain msgs) {
 		Point oldPoint = point;
 		point = newPoint;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.LINE_TO__POINT, oldPoint, newPoint);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -98,19 +102,19 @@ public class LineToImpl extends PathCommandImpl implements LineTo {
 	 */
 	@Override
 	public void setPoint(Point newPoint) {
-		if (newPoint != point) {
+		if(newPoint != point) {
 			NotificationChain msgs = null;
-			if (point != null) {
-				msgs = ((InternalEObject) point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE_TO__POINT, null, msgs);
+			if(point != null) {
+				msgs = ((InternalEObject)point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE_TO__POINT, null, msgs);
 			}
-			if (newPoint != null) {
-				msgs = ((InternalEObject) newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE_TO__POINT, null, msgs);
+			if(newPoint != null) {
+				msgs = ((InternalEObject)newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE_TO__POINT, null, msgs);
 			}
 			msgs = basicSetPoint(newPoint, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.LINE_TO__POINT, newPoint, newPoint));
 		}
 	}
@@ -122,7 +126,7 @@ public class LineToImpl extends PathCommandImpl implements LineTo {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.LINE_TO__POINT:
 			return basicSetPoint(null, msgs);
 		}
@@ -136,7 +140,7 @@ public class LineToImpl extends PathCommandImpl implements LineTo {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.LINE_TO__POINT:
 			return getPoint();
 		}
@@ -150,9 +154,9 @@ public class LineToImpl extends PathCommandImpl implements LineTo {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.LINE_TO__POINT:
-			setPoint((Point) newValue);
+			setPoint((Point)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -165,9 +169,9 @@ public class LineToImpl extends PathCommandImpl implements LineTo {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.LINE_TO__POINT:
-			setPoint((Point) null);
+			setPoint((Point)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -180,7 +184,7 @@ public class LineToImpl extends PathCommandImpl implements LineTo {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.LINE_TO__POINT:
 			return point != null;
 		}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LinearGradientImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LinearGradientImpl.java
index 131433ad418..76a9fdcf16d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LinearGradientImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LinearGradientImpl.java
@@ -12,19 +12,25 @@
 package org.eclipse.papyrus.dd.dg.impl;
 
 import java.lang.reflect.InvocationTargetException;
+
 import java.util.Map;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dc.Point;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.LinearGradient;
+
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
@@ -98,9 +104,9 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 	public NotificationChain basicSetStart(Point newStart, NotificationChain msgs) {
 		Point oldStart = start;
 		start = newStart;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.LINEAR_GRADIENT__START, oldStart, newStart);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -116,19 +122,19 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 	 */
 	@Override
 	public void setStart(Point newStart) {
-		if (newStart != start) {
+		if(newStart != start) {
 			NotificationChain msgs = null;
-			if (start != null) {
-				msgs = ((InternalEObject) start).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINEAR_GRADIENT__START, null, msgs);
+			if(start != null) {
+				msgs = ((InternalEObject)start).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINEAR_GRADIENT__START, null, msgs);
 			}
-			if (newStart != null) {
-				msgs = ((InternalEObject) newStart).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINEAR_GRADIENT__START, null, msgs);
+			if(newStart != null) {
+				msgs = ((InternalEObject)newStart).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINEAR_GRADIENT__START, null, msgs);
 			}
 			msgs = basicSetStart(newStart, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.LINEAR_GRADIENT__START, newStart, newStart));
 		}
 	}
@@ -151,9 +157,9 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 	public NotificationChain basicSetEnd(Point newEnd, NotificationChain msgs) {
 		Point oldEnd = end;
 		end = newEnd;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.LINEAR_GRADIENT__END, oldEnd, newEnd);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -169,19 +175,19 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 	 */
 	@Override
 	public void setEnd(Point newEnd) {
-		if (newEnd != end) {
+		if(newEnd != end) {
 			NotificationChain msgs = null;
-			if (end != null) {
-				msgs = ((InternalEObject) end).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINEAR_GRADIENT__END, null, msgs);
+			if(end != null) {
+				msgs = ((InternalEObject)end).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINEAR_GRADIENT__END, null, msgs);
 			}
-			if (newEnd != null) {
-				msgs = ((InternalEObject) newEnd).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINEAR_GRADIENT__END, null, msgs);
+			if(newEnd != null) {
+				msgs = ((InternalEObject)newEnd).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINEAR_GRADIENT__END, null, msgs);
 			}
 			msgs = basicSetEnd(newEnd, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.LINEAR_GRADIENT__END, newEnd, newEnd));
 		}
 	}
@@ -205,8 +211,7 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 	 */
 	@Override
 	public boolean validGradientVector(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.LINEAR_GRADIENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.LINEAR_GRADIENT___VALID_GRADIENT_VECTOR__DIAGNOSTICCHAIN_MAP,
-				VALID_GRADIENT_VECTOR_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.LINEAR_GRADIENT__VALID_GRADIENT_VECTOR);
+		return DGValidator.validate(DGPackage.Literals.LINEAR_GRADIENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.LINEAR_GRADIENT___VALID_GRADIENT_VECTOR__DIAGNOSTICCHAIN_MAP, VALID_GRADIENT_VECTOR_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.LINEAR_GRADIENT__VALID_GRADIENT_VECTOR);
 	}
 
 	/**
@@ -216,7 +221,7 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.LINEAR_GRADIENT__START:
 			return basicSetStart(null, msgs);
 		case DGPackage.LINEAR_GRADIENT__END:
@@ -232,7 +237,7 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.LINEAR_GRADIENT__START:
 			return getStart();
 		case DGPackage.LINEAR_GRADIENT__END:
@@ -248,12 +253,12 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.LINEAR_GRADIENT__START:
-			setStart((Point) newValue);
+			setStart((Point)newValue);
 			return;
 		case DGPackage.LINEAR_GRADIENT__END:
-			setEnd((Point) newValue);
+			setEnd((Point)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -266,12 +271,12 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.LINEAR_GRADIENT__START:
-			setStart((Point) null);
+			setStart((Point)null);
 			return;
 		case DGPackage.LINEAR_GRADIENT__END:
-			setEnd((Point) null);
+			setEnd((Point)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -284,7 +289,7 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.LINEAR_GRADIENT__START:
 			return start != null;
 		case DGPackage.LINEAR_GRADIENT__END:
@@ -301,9 +306,9 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
+		switch(operationID) {
 		case DGPackage.LINEAR_GRADIENT___VALID_GRADIENT_VECTOR__DIAGNOSTICCHAIN_MAP:
-			return validGradientVector((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return validGradientVector((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java
index a5022101b64..dd03098e3a8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java
@@ -13,14 +13,16 @@ package org.eclipse.papyrus.dd.dg.impl;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
-
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.MarkedElement;
 import org.eclipse.papyrus.dd.dg.Marker;
@@ -97,11 +99,11 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 	 */
 	@Override
 	public Marker getEndMarker() {
-		if (endMarker != null && endMarker.eIsProxy()) {
-			InternalEObject oldEndMarker = (InternalEObject) endMarker;
-			endMarker = (Marker) eResolveProxy(oldEndMarker);
-			if (endMarker != oldEndMarker) {
-				if (eNotificationRequired()) {
+		if(endMarker != null && endMarker.eIsProxy()) {
+			InternalEObject oldEndMarker = (InternalEObject)endMarker;
+			endMarker = (Marker)eResolveProxy(oldEndMarker);
+			if(endMarker != oldEndMarker) {
+				if(eNotificationRequired()) {
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DGPackage.MARKED_ELEMENT__END_MARKER, oldEndMarker, endMarker));
 				}
 			}
@@ -127,7 +129,7 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 	public void setEndMarker(Marker newEndMarker) {
 		Marker oldEndMarker = endMarker;
 		endMarker = newEndMarker;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MARKED_ELEMENT__END_MARKER, oldEndMarker, endMarker));
 		}
 	}
@@ -139,11 +141,11 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 	 */
 	@Override
 	public Marker getMidMarker() {
-		if (midMarker != null && midMarker.eIsProxy()) {
-			InternalEObject oldMidMarker = (InternalEObject) midMarker;
-			midMarker = (Marker) eResolveProxy(oldMidMarker);
-			if (midMarker != oldMidMarker) {
-				if (eNotificationRequired()) {
+		if(midMarker != null && midMarker.eIsProxy()) {
+			InternalEObject oldMidMarker = (InternalEObject)midMarker;
+			midMarker = (Marker)eResolveProxy(oldMidMarker);
+			if(midMarker != oldMidMarker) {
+				if(eNotificationRequired()) {
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DGPackage.MARKED_ELEMENT__MID_MARKER, oldMidMarker, midMarker));
 				}
 			}
@@ -169,7 +171,7 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 	public void setMidMarker(Marker newMidMarker) {
 		Marker oldMidMarker = midMarker;
 		midMarker = newMidMarker;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MARKED_ELEMENT__MID_MARKER, oldMidMarker, midMarker));
 		}
 	}
@@ -181,11 +183,11 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 	 */
 	@Override
 	public Marker getStartMarker() {
-		if (startMarker != null && startMarker.eIsProxy()) {
-			InternalEObject oldStartMarker = (InternalEObject) startMarker;
-			startMarker = (Marker) eResolveProxy(oldStartMarker);
-			if (startMarker != oldStartMarker) {
-				if (eNotificationRequired()) {
+		if(startMarker != null && startMarker.eIsProxy()) {
+			InternalEObject oldStartMarker = (InternalEObject)startMarker;
+			startMarker = (Marker)eResolveProxy(oldStartMarker);
+			if(startMarker != oldStartMarker) {
+				if(eNotificationRequired()) {
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DGPackage.MARKED_ELEMENT__START_MARKER, oldStartMarker, startMarker));
 				}
 			}
@@ -211,7 +213,7 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 	public void setStartMarker(Marker newStartMarker) {
 		Marker oldStartMarker = startMarker;
 		startMarker = newStartMarker;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MARKED_ELEMENT__START_MARKER, oldStartMarker, startMarker));
 		}
 	}
@@ -234,8 +236,7 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 	 */
 	@Override
 	public boolean referencedStartMarkerHasId(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.MARKED_ELEMENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP,
-				REFERENCED_START_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.MARKED_ELEMENT__REFERENCED_START_MARKER_HAS_ID);
+		return DGValidator.validate(DGPackage.Literals.MARKED_ELEMENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP, REFERENCED_START_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.MARKED_ELEMENT__REFERENCED_START_MARKER_HAS_ID);
 	}
 
 	/**
@@ -256,8 +257,7 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 	 */
 	@Override
 	public boolean referencedMidMarkerHasId(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.MARKED_ELEMENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP,
-				REFERENCED_MID_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.MARKED_ELEMENT__REFERENCED_MID_MARKER_HAS_ID);
+		return DGValidator.validate(DGPackage.Literals.MARKED_ELEMENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP, REFERENCED_MID_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.MARKED_ELEMENT__REFERENCED_MID_MARKER_HAS_ID);
 	}
 
 	/**
@@ -278,8 +278,7 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 	 */
 	@Override
 	public boolean referencedEndMarkerHasId(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.MARKED_ELEMENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP,
-				REFERENCED_END_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.MARKED_ELEMENT__REFERENCED_END_MARKER_HAS_ID);
+		return DGValidator.validate(DGPackage.Literals.MARKED_ELEMENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP, REFERENCED_END_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.MARKED_ELEMENT__REFERENCED_END_MARKER_HAS_ID);
 	}
 
 	/**
@@ -289,19 +288,19 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.MARKED_ELEMENT__END_MARKER:
-			if (resolve) {
+			if(resolve) {
 				return getEndMarker();
 			}
 			return basicGetEndMarker();
 		case DGPackage.MARKED_ELEMENT__MID_MARKER:
-			if (resolve) {
+			if(resolve) {
 				return getMidMarker();
 			}
 			return basicGetMidMarker();
 		case DGPackage.MARKED_ELEMENT__START_MARKER:
-			if (resolve) {
+			if(resolve) {
 				return getStartMarker();
 			}
 			return basicGetStartMarker();
@@ -316,15 +315,15 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.MARKED_ELEMENT__END_MARKER:
-			setEndMarker((Marker) newValue);
+			setEndMarker((Marker)newValue);
 			return;
 		case DGPackage.MARKED_ELEMENT__MID_MARKER:
-			setMidMarker((Marker) newValue);
+			setMidMarker((Marker)newValue);
 			return;
 		case DGPackage.MARKED_ELEMENT__START_MARKER:
-			setStartMarker((Marker) newValue);
+			setStartMarker((Marker)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -337,15 +336,15 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.MARKED_ELEMENT__END_MARKER:
-			setEndMarker((Marker) null);
+			setEndMarker((Marker)null);
 			return;
 		case DGPackage.MARKED_ELEMENT__MID_MARKER:
-			setMidMarker((Marker) null);
+			setMidMarker((Marker)null);
 			return;
 		case DGPackage.MARKED_ELEMENT__START_MARKER:
-			setStartMarker((Marker) null);
+			setStartMarker((Marker)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -358,7 +357,7 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.MARKED_ELEMENT__END_MARKER:
 			return endMarker != null;
 		case DGPackage.MARKED_ELEMENT__MID_MARKER:
@@ -377,13 +376,13 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
+		switch(operationID) {
 		case DGPackage.MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP:
-			return referencedStartMarkerHasId((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return referencedStartMarkerHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		case DGPackage.MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP:
-			return referencedMidMarkerHasId((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return referencedMidMarkerHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		case DGPackage.MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP:
-			return referencedEndMarkerHasId((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return referencedEndMarkerHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkerImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkerImpl.java
index f104d1930e3..69d199fb014 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkerImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkerImpl.java
@@ -13,11 +13,15 @@ package org.eclipse.papyrus.dd.dg.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dc.Dimension;
 import org.eclipse.papyrus.dd.dc.Point;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Marker;
 
@@ -92,9 +96,9 @@ public class MarkerImpl extends GroupImpl implements Marker {
 	public NotificationChain basicSetSize(Dimension newSize, NotificationChain msgs) {
 		Dimension oldSize = size;
 		size = newSize;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.MARKER__SIZE, oldSize, newSize);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -110,19 +114,19 @@ public class MarkerImpl extends GroupImpl implements Marker {
 	 */
 	@Override
 	public void setSize(Dimension newSize) {
-		if (newSize != size) {
+		if(newSize != size) {
 			NotificationChain msgs = null;
-			if (size != null) {
-				msgs = ((InternalEObject) size).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__SIZE, null, msgs);
+			if(size != null) {
+				msgs = ((InternalEObject)size).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__SIZE, null, msgs);
 			}
-			if (newSize != null) {
-				msgs = ((InternalEObject) newSize).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__SIZE, null, msgs);
+			if(newSize != null) {
+				msgs = ((InternalEObject)newSize).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__SIZE, null, msgs);
 			}
 			msgs = basicSetSize(newSize, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MARKER__SIZE, newSize, newSize));
 		}
 	}
@@ -145,9 +149,9 @@ public class MarkerImpl extends GroupImpl implements Marker {
 	public NotificationChain basicSetReference(Point newReference, NotificationChain msgs) {
 		Point oldReference = reference;
 		reference = newReference;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.MARKER__REFERENCE, oldReference, newReference);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -163,19 +167,19 @@ public class MarkerImpl extends GroupImpl implements Marker {
 	 */
 	@Override
 	public void setReference(Point newReference) {
-		if (newReference != reference) {
+		if(newReference != reference) {
 			NotificationChain msgs = null;
-			if (reference != null) {
-				msgs = ((InternalEObject) reference).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__REFERENCE, null, msgs);
+			if(reference != null) {
+				msgs = ((InternalEObject)reference).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__REFERENCE, null, msgs);
 			}
-			if (newReference != null) {
-				msgs = ((InternalEObject) newReference).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__REFERENCE, null, msgs);
+			if(newReference != null) {
+				msgs = ((InternalEObject)newReference).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__REFERENCE, null, msgs);
 			}
 			msgs = basicSetReference(newReference, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MARKER__REFERENCE, newReference, newReference));
 		}
 	}
@@ -187,7 +191,7 @@ public class MarkerImpl extends GroupImpl implements Marker {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.MARKER__SIZE:
 			return basicSetSize(null, msgs);
 		case DGPackage.MARKER__REFERENCE:
@@ -203,7 +207,7 @@ public class MarkerImpl extends GroupImpl implements Marker {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.MARKER__SIZE:
 			return getSize();
 		case DGPackage.MARKER__REFERENCE:
@@ -219,12 +223,12 @@ public class MarkerImpl extends GroupImpl implements Marker {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.MARKER__SIZE:
-			setSize((Dimension) newValue);
+			setSize((Dimension)newValue);
 			return;
 		case DGPackage.MARKER__REFERENCE:
-			setReference((Point) newValue);
+			setReference((Point)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -237,12 +241,12 @@ public class MarkerImpl extends GroupImpl implements Marker {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.MARKER__SIZE:
-			setSize((Dimension) null);
+			setSize((Dimension)null);
 			return;
 		case DGPackage.MARKER__REFERENCE:
-			setReference((Point) null);
+			setReference((Point)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -255,7 +259,7 @@ public class MarkerImpl extends GroupImpl implements Marker {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.MARKER__SIZE:
 			return size != null;
 		case DGPackage.MARKER__REFERENCE:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MatrixImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MatrixImpl.java
index c075a9092f1..6325ac0b346 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MatrixImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MatrixImpl.java
@@ -12,8 +12,11 @@
 package org.eclipse.papyrus.dd.dg.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Matrix;
 
@@ -193,7 +196,7 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 	public void setA(double newA) {
 		double oldA = a;
 		a = newA;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MATRIX__A, oldA, a));
 		}
 	}
@@ -217,7 +220,7 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 	public void setB(double newB) {
 		double oldB = b;
 		b = newB;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MATRIX__B, oldB, b));
 		}
 	}
@@ -241,7 +244,7 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 	public void setC(double newC) {
 		double oldC = c;
 		c = newC;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MATRIX__C, oldC, c));
 		}
 	}
@@ -265,7 +268,7 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 	public void setD(double newD) {
 		double oldD = d;
 		d = newD;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MATRIX__D, oldD, d));
 		}
 	}
@@ -289,7 +292,7 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 	public void setE(double newE) {
 		double oldE = e;
 		e = newE;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MATRIX__E, oldE, e));
 		}
 	}
@@ -313,7 +316,7 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 	public void setF(double newF) {
 		double oldF = f;
 		f = newF;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MATRIX__F, oldF, f));
 		}
 	}
@@ -325,7 +328,7 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.MATRIX__A:
 			return getA();
 		case DGPackage.MATRIX__B:
@@ -349,24 +352,24 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.MATRIX__A:
-			setA((Double) newValue);
+			setA((Double)newValue);
 			return;
 		case DGPackage.MATRIX__B:
-			setB((Double) newValue);
+			setB((Double)newValue);
 			return;
 		case DGPackage.MATRIX__C:
-			setC((Double) newValue);
+			setC((Double)newValue);
 			return;
 		case DGPackage.MATRIX__D:
-			setD((Double) newValue);
+			setD((Double)newValue);
 			return;
 		case DGPackage.MATRIX__E:
-			setE((Double) newValue);
+			setE((Double)newValue);
 			return;
 		case DGPackage.MATRIX__F:
-			setF((Double) newValue);
+			setF((Double)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -379,7 +382,7 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.MATRIX__A:
 			setA(A_EDEFAULT);
 			return;
@@ -409,7 +412,7 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.MATRIX__A:
 			return a != A_EDEFAULT;
 		case DGPackage.MATRIX__B:
@@ -433,7 +436,7 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MoveToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MoveToImpl.java
index 04757881049..9b1237f7027 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MoveToImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MoveToImpl.java
@@ -13,10 +13,14 @@ package org.eclipse.papyrus.dd.dg.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dc.Point;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.MoveTo;
 
@@ -80,9 +84,9 @@ public class MoveToImpl extends PathCommandImpl implements MoveTo {
 	public NotificationChain basicSetPoint(Point newPoint, NotificationChain msgs) {
 		Point oldPoint = point;
 		point = newPoint;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.MOVE_TO__POINT, oldPoint, newPoint);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -98,19 +102,19 @@ public class MoveToImpl extends PathCommandImpl implements MoveTo {
 	 */
 	@Override
 	public void setPoint(Point newPoint) {
-		if (newPoint != point) {
+		if(newPoint != point) {
 			NotificationChain msgs = null;
-			if (point != null) {
-				msgs = ((InternalEObject) point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.MOVE_TO__POINT, null, msgs);
+			if(point != null) {
+				msgs = ((InternalEObject)point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.MOVE_TO__POINT, null, msgs);
 			}
-			if (newPoint != null) {
-				msgs = ((InternalEObject) newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.MOVE_TO__POINT, null, msgs);
+			if(newPoint != null) {
+				msgs = ((InternalEObject)newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.MOVE_TO__POINT, null, msgs);
 			}
 			msgs = basicSetPoint(newPoint, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MOVE_TO__POINT, newPoint, newPoint));
 		}
 	}
@@ -122,7 +126,7 @@ public class MoveToImpl extends PathCommandImpl implements MoveTo {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.MOVE_TO__POINT:
 			return basicSetPoint(null, msgs);
 		}
@@ -136,7 +140,7 @@ public class MoveToImpl extends PathCommandImpl implements MoveTo {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.MOVE_TO__POINT:
 			return getPoint();
 		}
@@ -150,9 +154,9 @@ public class MoveToImpl extends PathCommandImpl implements MoveTo {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.MOVE_TO__POINT:
-			setPoint((Point) newValue);
+			setPoint((Point)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -165,9 +169,9 @@ public class MoveToImpl extends PathCommandImpl implements MoveTo {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.MOVE_TO__POINT:
-			setPoint((Point) null);
+			setPoint((Point)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -180,7 +184,7 @@ public class MoveToImpl extends PathCommandImpl implements MoveTo {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.MOVE_TO__POINT:
 			return point != null;
 		}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java
index 70a02fb7043..315fee84bcd 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java
@@ -12,17 +12,20 @@
 package org.eclipse.papyrus.dd.dg.impl;
 
 import java.awt.Color;
+
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
-
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Paint;
 import org.eclipse.papyrus.dd.dg.PaintServer;
@@ -110,7 +113,7 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 	public void setColor(Color newColor) {
 		Color oldColor = color;
 		color = newColor;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.PAINT__COLOR, oldColor, color));
 		}
 	}
@@ -122,11 +125,11 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 	 */
 	@Override
 	public PaintServer getPaintServer() {
-		if (paintServer != null && paintServer.eIsProxy()) {
-			InternalEObject oldPaintServer = (InternalEObject) paintServer;
-			paintServer = (PaintServer) eResolveProxy(oldPaintServer);
-			if (paintServer != oldPaintServer) {
-				if (eNotificationRequired()) {
+		if(paintServer != null && paintServer.eIsProxy()) {
+			InternalEObject oldPaintServer = (InternalEObject)paintServer;
+			paintServer = (PaintServer)eResolveProxy(oldPaintServer);
+			if(paintServer != oldPaintServer) {
+				if(eNotificationRequired()) {
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DGPackage.PAINT__PAINT_SERVER, oldPaintServer, paintServer));
 				}
 			}
@@ -152,7 +155,7 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 	public void setPaintServer(PaintServer newPaintServer) {
 		PaintServer oldPaintServer = paintServer;
 		paintServer = newPaintServer;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.PAINT__PAINT_SERVER, oldPaintServer, paintServer));
 		}
 	}
@@ -175,8 +178,7 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 	 */
 	@Override
 	public boolean referencedPaintServerHasId(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.PAINT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP,
-				REFERENCED_PAINT_SERVER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.PAINT__REFERENCED_PAINT_SERVER_HAS_ID);
+		return DGValidator.validate(DGPackage.Literals.PAINT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP, REFERENCED_PAINT_SERVER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.PAINT__REFERENCED_PAINT_SERVER_HAS_ID);
 	}
 
 	/**
@@ -186,11 +188,11 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PAINT__COLOR:
 			return getColor();
 		case DGPackage.PAINT__PAINT_SERVER:
-			if (resolve) {
+			if(resolve) {
 				return getPaintServer();
 			}
 			return basicGetPaintServer();
@@ -205,12 +207,12 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PAINT__COLOR:
-			setColor((Color) newValue);
+			setColor((Color)newValue);
 			return;
 		case DGPackage.PAINT__PAINT_SERVER:
-			setPaintServer((PaintServer) newValue);
+			setPaintServer((PaintServer)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -223,12 +225,12 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PAINT__COLOR:
 			setColor(COLOR_EDEFAULT);
 			return;
 		case DGPackage.PAINT__PAINT_SERVER:
-			setPaintServer((PaintServer) null);
+			setPaintServer((PaintServer)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -241,7 +243,7 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PAINT__COLOR:
 			return COLOR_EDEFAULT == null ? color != null : !COLOR_EDEFAULT.equals(color);
 		case DGPackage.PAINT__PAINT_SERVER:
@@ -258,9 +260,9 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
+		switch(operationID) {
 		case DGPackage.PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP:
-			return referencedPaintServerHasId((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return referencedPaintServerHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
@@ -272,7 +274,7 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java
index 731c4603ec2..7e4a9cbd89e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java
@@ -14,11 +14,15 @@ package org.eclipse.papyrus.dd.dg.impl;
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.PaintServer;
 import org.eclipse.papyrus.dd.dg.Transform;
@@ -72,7 +76,7 @@ public abstract class PaintServerImpl extends DefinitionImpl implements PaintSer
 	 */
 	@Override
 	public EList<Transform> getTransforms() {
-		if (transforms == null) {
+		if(transforms == null) {
 			transforms = new EObjectContainmentEList<Transform>(Transform.class, this, DGPackage.PAINT_SERVER__TRANSFORM);
 		}
 		return transforms;
@@ -85,9 +89,9 @@ public abstract class PaintServerImpl extends DefinitionImpl implements PaintSer
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PAINT_SERVER__TRANSFORM:
-			return ((InternalEList<?>) getTransforms()).basicRemove(otherEnd, msgs);
+			return ((InternalEList<?>)getTransforms()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -99,7 +103,7 @@ public abstract class PaintServerImpl extends DefinitionImpl implements PaintSer
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PAINT_SERVER__TRANSFORM:
 			return getTransforms();
 		}
@@ -114,10 +118,10 @@ public abstract class PaintServerImpl extends DefinitionImpl implements PaintSer
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PAINT_SERVER__TRANSFORM:
 			getTransforms().clear();
-			getTransforms().addAll((Collection<? extends Transform>) newValue);
+			getTransforms().addAll((Collection<? extends Transform>)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -130,7 +134,7 @@ public abstract class PaintServerImpl extends DefinitionImpl implements PaintSer
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PAINT_SERVER__TRANSFORM:
 			getTransforms().clear();
 			return;
@@ -145,7 +149,7 @@ public abstract class PaintServerImpl extends DefinitionImpl implements PaintSer
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PAINT_SERVER__TRANSFORM:
 			return transforms != null && !transforms.isEmpty();
 		}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathCommandImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathCommandImpl.java
index 9601b765032..0e973108602 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathCommandImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathCommandImpl.java
@@ -12,9 +12,12 @@
 package org.eclipse.papyrus.dd.dg.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.PathCommand;
 
@@ -89,7 +92,7 @@ public abstract class PathCommandImpl extends MinimalEObjectImpl.Container imple
 	public void setIsRelative(boolean newIsRelative) {
 		boolean oldIsRelative = isRelative;
 		isRelative = newIsRelative;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.PATH_COMMAND__IS_RELATIVE, oldIsRelative, isRelative));
 		}
 	}
@@ -101,7 +104,7 @@ public abstract class PathCommandImpl extends MinimalEObjectImpl.Container imple
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PATH_COMMAND__IS_RELATIVE:
 			return isRelative();
 		}
@@ -115,9 +118,9 @@ public abstract class PathCommandImpl extends MinimalEObjectImpl.Container imple
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PATH_COMMAND__IS_RELATIVE:
-			setIsRelative((Boolean) newValue);
+			setIsRelative((Boolean)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -130,7 +133,7 @@ public abstract class PathCommandImpl extends MinimalEObjectImpl.Container imple
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PATH_COMMAND__IS_RELATIVE:
 			setIsRelative(IS_RELATIVE_EDEFAULT);
 			return;
@@ -145,7 +148,7 @@ public abstract class PathCommandImpl extends MinimalEObjectImpl.Container imple
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PATH_COMMAND__IS_RELATIVE:
 			return isRelative != IS_RELATIVE_EDEFAULT;
 		}
@@ -159,7 +162,7 @@ public abstract class PathCommandImpl extends MinimalEObjectImpl.Container imple
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java
index a5f62ea5f81..40055d331b5 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java
@@ -13,16 +13,20 @@ package org.eclipse.papyrus.dd.dg.impl;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
-import java.util.Map;
 
+import java.util.Map;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Path;
 import org.eclipse.papyrus.dd.dg.PathCommand;
@@ -77,7 +81,7 @@ public class PathImpl extends MarkedElementImpl implements Path {
 	 */
 	@Override
 	public EList<PathCommand> getCommands() {
-		if (commands == null) {
+		if(commands == null) {
 			commands = new EObjectContainmentEList<PathCommand>(PathCommand.class, this, DGPackage.PATH__COMMAND);
 		}
 		return commands;
@@ -101,8 +105,7 @@ public class PathImpl extends MarkedElementImpl implements Path {
 	 */
 	@Override
 	public boolean firstCommandMustBeMove(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.PATH, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP,
-				FIRST_COMMAND_MUST_BE_MOVE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.PATH__FIRST_COMMAND_MUST_BE_MOVE);
+		return DGValidator.validate(DGPackage.Literals.PATH, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP, FIRST_COMMAND_MUST_BE_MOVE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.PATH__FIRST_COMMAND_MUST_BE_MOVE);
 	}
 
 	/**
@@ -112,9 +115,9 @@ public class PathImpl extends MarkedElementImpl implements Path {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PATH__COMMAND:
-			return ((InternalEList<?>) getCommands()).basicRemove(otherEnd, msgs);
+			return ((InternalEList<?>)getCommands()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -126,7 +129,7 @@ public class PathImpl extends MarkedElementImpl implements Path {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PATH__COMMAND:
 			return getCommands();
 		}
@@ -141,10 +144,10 @@ public class PathImpl extends MarkedElementImpl implements Path {
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PATH__COMMAND:
 			getCommands().clear();
-			getCommands().addAll((Collection<? extends PathCommand>) newValue);
+			getCommands().addAll((Collection<? extends PathCommand>)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -157,7 +160,7 @@ public class PathImpl extends MarkedElementImpl implements Path {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PATH__COMMAND:
 			getCommands().clear();
 			return;
@@ -172,7 +175,7 @@ public class PathImpl extends MarkedElementImpl implements Path {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PATH__COMMAND:
 			return commands != null && !commands.isEmpty();
 		}
@@ -187,9 +190,9 @@ public class PathImpl extends MarkedElementImpl implements Path {
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
+		switch(operationID) {
 		case DGPackage.PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP:
-			return firstCommandMustBeMove((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return firstCommandMustBeMove((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PatternImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PatternImpl.java
index bd35f31f1f1..09129ec4764 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PatternImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PatternImpl.java
@@ -13,10 +13,14 @@ package org.eclipse.papyrus.dd.dg.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dc.Bounds;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.GraphicalElement;
 import org.eclipse.papyrus.dd.dg.Pattern;
@@ -92,9 +96,9 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 	public NotificationChain basicSetBounds(Bounds newBounds, NotificationChain msgs) {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.PATTERN__BOUNDS, oldBounds, newBounds);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -110,19 +114,19 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 	 */
 	@Override
 	public void setBounds(Bounds newBounds) {
-		if (newBounds != bounds) {
+		if(newBounds != bounds) {
 			NotificationChain msgs = null;
-			if (bounds != null) {
-				msgs = ((InternalEObject) bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__BOUNDS, null, msgs);
+			if(bounds != null) {
+				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__BOUNDS, null, msgs);
 			}
-			if (newBounds != null) {
-				msgs = ((InternalEObject) newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__BOUNDS, null, msgs);
+			if(newBounds != null) {
+				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__BOUNDS, null, msgs);
 			}
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.PATTERN__BOUNDS, newBounds, newBounds));
 		}
 	}
@@ -145,9 +149,9 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 	public NotificationChain basicSetTile(GraphicalElement newTile, NotificationChain msgs) {
 		GraphicalElement oldTile = tile;
 		tile = newTile;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.PATTERN__TILE, oldTile, newTile);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -163,19 +167,19 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 	 */
 	@Override
 	public void setTile(GraphicalElement newTile) {
-		if (newTile != tile) {
+		if(newTile != tile) {
 			NotificationChain msgs = null;
-			if (tile != null) {
-				msgs = ((InternalEObject) tile).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__TILE, null, msgs);
+			if(tile != null) {
+				msgs = ((InternalEObject)tile).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__TILE, null, msgs);
 			}
-			if (newTile != null) {
-				msgs = ((InternalEObject) newTile).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__TILE, null, msgs);
+			if(newTile != null) {
+				msgs = ((InternalEObject)newTile).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__TILE, null, msgs);
 			}
 			msgs = basicSetTile(newTile, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.PATTERN__TILE, newTile, newTile));
 		}
 	}
@@ -187,7 +191,7 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PATTERN__BOUNDS:
 			return basicSetBounds(null, msgs);
 		case DGPackage.PATTERN__TILE:
@@ -203,7 +207,7 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PATTERN__BOUNDS:
 			return getBounds();
 		case DGPackage.PATTERN__TILE:
@@ -219,12 +223,12 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PATTERN__BOUNDS:
-			setBounds((Bounds) newValue);
+			setBounds((Bounds)newValue);
 			return;
 		case DGPackage.PATTERN__TILE:
-			setTile((GraphicalElement) newValue);
+			setTile((GraphicalElement)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -237,12 +241,12 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PATTERN__BOUNDS:
-			setBounds((Bounds) null);
+			setBounds((Bounds)null);
 			return;
 		case DGPackage.PATTERN__TILE:
-			setTile((GraphicalElement) null);
+			setTile((GraphicalElement)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -255,7 +259,7 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.PATTERN__BOUNDS:
 			return bounds != null;
 		case DGPackage.PATTERN__TILE:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java
index 92570125878..ac953aedbcd 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java
@@ -14,12 +14,17 @@ package org.eclipse.papyrus.dd.dg.impl;
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+
 import org.eclipse.papyrus.dd.dc.Point;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Polygon;
 
@@ -72,7 +77,7 @@ public class PolygonImpl extends MarkedElementImpl implements Polygon {
 	 */
 	@Override
 	public EList<Point> getPoints() {
-		if (points == null) {
+		if(points == null) {
 			points = new EObjectContainmentEList<Point>(Point.class, this, DGPackage.POLYGON__POINT);
 		}
 		return points;
@@ -85,9 +90,9 @@ public class PolygonImpl extends MarkedElementImpl implements Polygon {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.POLYGON__POINT:
-			return ((InternalEList<?>) getPoints()).basicRemove(otherEnd, msgs);
+			return ((InternalEList<?>)getPoints()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -99,7 +104,7 @@ public class PolygonImpl extends MarkedElementImpl implements Polygon {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.POLYGON__POINT:
 			return getPoints();
 		}
@@ -114,10 +119,10 @@ public class PolygonImpl extends MarkedElementImpl implements Polygon {
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.POLYGON__POINT:
 			getPoints().clear();
-			getPoints().addAll((Collection<? extends Point>) newValue);
+			getPoints().addAll((Collection<? extends Point>)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -130,7 +135,7 @@ public class PolygonImpl extends MarkedElementImpl implements Polygon {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.POLYGON__POINT:
 			getPoints().clear();
 			return;
@@ -145,7 +150,7 @@ public class PolygonImpl extends MarkedElementImpl implements Polygon {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.POLYGON__POINT:
 			return points != null && !points.isEmpty();
 		}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java
index 9272dcdccc9..91ad19a81a2 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java
@@ -14,12 +14,17 @@ package org.eclipse.papyrus.dd.dg.impl;
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+
 import org.eclipse.papyrus.dd.dc.Point;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Polyline;
 
@@ -72,7 +77,7 @@ public class PolylineImpl extends MarkedElementImpl implements Polyline {
 	 */
 	@Override
 	public EList<Point> getPoints() {
-		if (points == null) {
+		if(points == null) {
 			points = new EObjectContainmentEList<Point>(Point.class, this, DGPackage.POLYLINE__POINT);
 		}
 		return points;
@@ -85,9 +90,9 @@ public class PolylineImpl extends MarkedElementImpl implements Polyline {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.POLYLINE__POINT:
-			return ((InternalEList<?>) getPoints()).basicRemove(otherEnd, msgs);
+			return ((InternalEList<?>)getPoints()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -99,7 +104,7 @@ public class PolylineImpl extends MarkedElementImpl implements Polyline {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.POLYLINE__POINT:
 			return getPoints();
 		}
@@ -114,10 +119,10 @@ public class PolylineImpl extends MarkedElementImpl implements Polyline {
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.POLYLINE__POINT:
 			getPoints().clear();
-			getPoints().addAll((Collection<? extends Point>) newValue);
+			getPoints().addAll((Collection<? extends Point>)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -130,7 +135,7 @@ public class PolylineImpl extends MarkedElementImpl implements Polyline {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.POLYLINE__POINT:
 			getPoints().clear();
 			return;
@@ -145,7 +150,7 @@ public class PolylineImpl extends MarkedElementImpl implements Polyline {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.POLYLINE__POINT:
 			return points != null && !points.isEmpty();
 		}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java
index 58ac73dacb9..9391369743d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java
@@ -13,10 +13,14 @@ package org.eclipse.papyrus.dd.dg.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dc.Point;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.QuadraticCurveTo;
 
@@ -91,9 +95,9 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements QuadraticCu
 	public NotificationChain basicSetPoint(Point newPoint, NotificationChain msgs) {
 		Point oldPoint = point;
 		point = newPoint;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.QUADRATIC_CURVE_TO__POINT, oldPoint, newPoint);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -109,19 +113,19 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements QuadraticCu
 	 */
 	@Override
 	public void setPoint(Point newPoint) {
-		if (newPoint != point) {
+		if(newPoint != point) {
 			NotificationChain msgs = null;
-			if (point != null) {
-				msgs = ((InternalEObject) point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.QUADRATIC_CURVE_TO__POINT, null, msgs);
+			if(point != null) {
+				msgs = ((InternalEObject)point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.QUADRATIC_CURVE_TO__POINT, null, msgs);
 			}
-			if (newPoint != null) {
-				msgs = ((InternalEObject) newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.QUADRATIC_CURVE_TO__POINT, null, msgs);
+			if(newPoint != null) {
+				msgs = ((InternalEObject)newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.QUADRATIC_CURVE_TO__POINT, null, msgs);
 			}
 			msgs = basicSetPoint(newPoint, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.QUADRATIC_CURVE_TO__POINT, newPoint, newPoint));
 		}
 	}
@@ -144,9 +148,9 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements QuadraticCu
 	public NotificationChain basicSetControl(Point newControl, NotificationChain msgs) {
 		Point oldControl = control;
 		control = newControl;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.QUADRATIC_CURVE_TO__CONTROL, oldControl, newControl);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -162,19 +166,19 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements QuadraticCu
 	 */
 	@Override
 	public void setControl(Point newControl) {
-		if (newControl != control) {
+		if(newControl != control) {
 			NotificationChain msgs = null;
-			if (control != null) {
-				msgs = ((InternalEObject) control).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.QUADRATIC_CURVE_TO__CONTROL, null, msgs);
+			if(control != null) {
+				msgs = ((InternalEObject)control).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.QUADRATIC_CURVE_TO__CONTROL, null, msgs);
 			}
-			if (newControl != null) {
-				msgs = ((InternalEObject) newControl).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.QUADRATIC_CURVE_TO__CONTROL, null, msgs);
+			if(newControl != null) {
+				msgs = ((InternalEObject)newControl).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.QUADRATIC_CURVE_TO__CONTROL, null, msgs);
 			}
 			msgs = basicSetControl(newControl, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.QUADRATIC_CURVE_TO__CONTROL, newControl, newControl));
 		}
 	}
@@ -186,7 +190,7 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements QuadraticCu
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
 			return basicSetControl(null, msgs);
 		case DGPackage.QUADRATIC_CURVE_TO__POINT:
@@ -202,7 +206,7 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements QuadraticCu
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
 			return getControl();
 		case DGPackage.QUADRATIC_CURVE_TO__POINT:
@@ -218,12 +222,12 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements QuadraticCu
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
-			setControl((Point) newValue);
+			setControl((Point)newValue);
 			return;
 		case DGPackage.QUADRATIC_CURVE_TO__POINT:
-			setPoint((Point) newValue);
+			setPoint((Point)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -236,12 +240,12 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements QuadraticCu
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
-			setControl((Point) null);
+			setControl((Point)null);
 			return;
 		case DGPackage.QUADRATIC_CURVE_TO__POINT:
-			setPoint((Point) null);
+			setPoint((Point)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -254,7 +258,7 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements QuadraticCu
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
 			return control != null;
 		case DGPackage.QUADRATIC_CURVE_TO__POINT:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java
index 24c69fa5b26..41664e13edc 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java
@@ -12,19 +12,25 @@
 package org.eclipse.papyrus.dd.dg.impl;
 
 import java.lang.reflect.InvocationTargetException;
+
 import java.util.Map;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dc.Point;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.RadialGradient;
+
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
@@ -119,9 +125,9 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	public NotificationChain basicSetCenter(Point newCenter, NotificationChain msgs) {
 		Point oldCenter = center;
 		center = newCenter;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__CENTER, oldCenter, newCenter);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -137,19 +143,19 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	 */
 	@Override
 	public void setCenter(Point newCenter) {
-		if (newCenter != center) {
+		if(newCenter != center) {
 			NotificationChain msgs = null;
-			if (center != null) {
-				msgs = ((InternalEObject) center).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__CENTER, null, msgs);
+			if(center != null) {
+				msgs = ((InternalEObject)center).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__CENTER, null, msgs);
 			}
-			if (newCenter != null) {
-				msgs = ((InternalEObject) newCenter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__CENTER, null, msgs);
+			if(newCenter != null) {
+				msgs = ((InternalEObject)newCenter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__CENTER, null, msgs);
 			}
 			msgs = basicSetCenter(newCenter, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__CENTER, newCenter, newCenter));
 		}
 	}
@@ -172,9 +178,9 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	public NotificationChain basicSetFocus(Point newFocus, NotificationChain msgs) {
 		Point oldFocus = focus;
 		focus = newFocus;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__FOCUS, oldFocus, newFocus);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -190,19 +196,19 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	 */
 	@Override
 	public void setFocus(Point newFocus) {
-		if (newFocus != focus) {
+		if(newFocus != focus) {
 			NotificationChain msgs = null;
-			if (focus != null) {
-				msgs = ((InternalEObject) focus).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__FOCUS, null, msgs);
+			if(focus != null) {
+				msgs = ((InternalEObject)focus).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__FOCUS, null, msgs);
 			}
-			if (newFocus != null) {
-				msgs = ((InternalEObject) newFocus).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__FOCUS, null, msgs);
+			if(newFocus != null) {
+				msgs = ((InternalEObject)newFocus).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__FOCUS, null, msgs);
 			}
 			msgs = basicSetFocus(newFocus, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__FOCUS, newFocus, newFocus));
 		}
 	}
@@ -226,7 +232,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	public void setRadius(double newRadius) {
 		double oldRadius = radius;
 		radius = newRadius;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__RADIUS, oldRadius, radius));
 		}
 	}
@@ -250,8 +256,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	 */
 	@Override
 	public boolean validCenterPoint(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.RADIAL_GRADIENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP,
-				VALID_CENTER_POINT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.RADIAL_GRADIENT__VALID_CENTER_POINT);
+		return DGValidator.validate(DGPackage.Literals.RADIAL_GRADIENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP, VALID_CENTER_POINT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.RADIAL_GRADIENT__VALID_CENTER_POINT);
 	}
 
 	/**
@@ -273,8 +278,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	 */
 	@Override
 	public boolean validFocusPoint(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.RADIAL_GRADIENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP,
-				VALID_FOCUS_POINT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.RADIAL_GRADIENT__VALID_FOCUS_POINT);
+		return DGValidator.validate(DGPackage.Literals.RADIAL_GRADIENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP, VALID_FOCUS_POINT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.RADIAL_GRADIENT__VALID_FOCUS_POINT);
 	}
 
 	/**
@@ -296,8 +300,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	 */
 	@Override
 	public boolean validRadius(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.RADIAL_GRADIENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP,
-				VALID_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.RADIAL_GRADIENT__VALID_RADIUS);
+		return DGValidator.validate(DGPackage.Literals.RADIAL_GRADIENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP, VALID_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.RADIAL_GRADIENT__VALID_RADIUS);
 	}
 
 	/**
@@ -307,7 +310,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.RADIAL_GRADIENT__CENTER:
 			return basicSetCenter(null, msgs);
 		case DGPackage.RADIAL_GRADIENT__FOCUS:
@@ -323,7 +326,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.RADIAL_GRADIENT__CENTER:
 			return getCenter();
 		case DGPackage.RADIAL_GRADIENT__FOCUS:
@@ -341,15 +344,15 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.RADIAL_GRADIENT__CENTER:
-			setCenter((Point) newValue);
+			setCenter((Point)newValue);
 			return;
 		case DGPackage.RADIAL_GRADIENT__FOCUS:
-			setFocus((Point) newValue);
+			setFocus((Point)newValue);
 			return;
 		case DGPackage.RADIAL_GRADIENT__RADIUS:
-			setRadius((Double) newValue);
+			setRadius((Double)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -362,12 +365,12 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.RADIAL_GRADIENT__CENTER:
-			setCenter((Point) null);
+			setCenter((Point)null);
 			return;
 		case DGPackage.RADIAL_GRADIENT__FOCUS:
-			setFocus((Point) null);
+			setFocus((Point)null);
 			return;
 		case DGPackage.RADIAL_GRADIENT__RADIUS:
 			setRadius(RADIUS_EDEFAULT);
@@ -383,7 +386,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.RADIAL_GRADIENT__CENTER:
 			return center != null;
 		case DGPackage.RADIAL_GRADIENT__FOCUS:
@@ -402,13 +405,13 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
+		switch(operationID) {
 		case DGPackage.RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP:
-			return validCenterPoint((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return validCenterPoint((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		case DGPackage.RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP:
-			return validFocusPoint((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return validFocusPoint((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		case DGPackage.RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP:
-			return validRadius((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return validRadius((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
@@ -420,7 +423,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java
index 47404ddd61f..3929f613f86 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java
@@ -13,16 +13,19 @@ package org.eclipse.papyrus.dd.dg.impl;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
-
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dc.Bounds;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Rectangle;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
@@ -119,9 +122,9 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 	public NotificationChain basicSetBounds(Bounds newBounds, NotificationChain msgs) {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.RECTANGLE__BOUNDS, oldBounds, newBounds);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -137,19 +140,19 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 	 */
 	@Override
 	public void setBounds(Bounds newBounds) {
-		if (newBounds != bounds) {
+		if(newBounds != bounds) {
 			NotificationChain msgs = null;
-			if (bounds != null) {
-				msgs = ((InternalEObject) bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.RECTANGLE__BOUNDS, null, msgs);
+			if(bounds != null) {
+				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.RECTANGLE__BOUNDS, null, msgs);
 			}
-			if (newBounds != null) {
-				msgs = ((InternalEObject) newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.RECTANGLE__BOUNDS, null, msgs);
+			if(newBounds != null) {
+				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.RECTANGLE__BOUNDS, null, msgs);
 			}
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.RECTANGLE__BOUNDS, newBounds, newBounds));
 		}
 	}
@@ -175,7 +178,7 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 		cornerRadius = newCornerRadius;
 		boolean oldCornerRadiusESet = cornerRadiusESet;
 		cornerRadiusESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.RECTANGLE__CORNER_RADIUS, oldCornerRadius, cornerRadius, !oldCornerRadiusESet));
 		}
 	}
@@ -191,7 +194,7 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 		boolean oldCornerRadiusESet = cornerRadiusESet;
 		cornerRadius = CORNER_RADIUS_EDEFAULT;
 		cornerRadiusESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.RECTANGLE__CORNER_RADIUS, oldCornerRadius, CORNER_RADIUS_EDEFAULT, oldCornerRadiusESet));
 		}
 	}
@@ -224,8 +227,7 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 	 */
 	@Override
 	public boolean nonNegativeCornerRadius(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.RECTANGLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP,
-				NON_NEGATIVE_CORNER_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.RECTANGLE__NON_NEGATIVE_CORNER_RADIUS);
+		return DGValidator.validate(DGPackage.Literals.RECTANGLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP, NON_NEGATIVE_CORNER_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.RECTANGLE__NON_NEGATIVE_CORNER_RADIUS);
 	}
 
 	/**
@@ -235,7 +237,7 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.RECTANGLE__BOUNDS:
 			return basicSetBounds(null, msgs);
 		}
@@ -249,7 +251,7 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.RECTANGLE__BOUNDS:
 			return getBounds();
 		case DGPackage.RECTANGLE__CORNER_RADIUS:
@@ -265,12 +267,12 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.RECTANGLE__BOUNDS:
-			setBounds((Bounds) newValue);
+			setBounds((Bounds)newValue);
 			return;
 		case DGPackage.RECTANGLE__CORNER_RADIUS:
-			setCornerRadius((Double) newValue);
+			setCornerRadius((Double)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -283,9 +285,9 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.RECTANGLE__BOUNDS:
-			setBounds((Bounds) null);
+			setBounds((Bounds)null);
 			return;
 		case DGPackage.RECTANGLE__CORNER_RADIUS:
 			unsetCornerRadius();
@@ -301,7 +303,7 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.RECTANGLE__BOUNDS:
 			return bounds != null;
 		case DGPackage.RECTANGLE__CORNER_RADIUS:
@@ -318,9 +320,9 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
+		switch(operationID) {
 		case DGPackage.RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP:
-			return nonNegativeCornerRadius((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return nonNegativeCornerRadius((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
@@ -332,12 +334,12 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (cornerRadius: ");
-		if (cornerRadiusESet) {
+		if(cornerRadiusESet) {
 			result.append(cornerRadius);
 		} else {
 			result.append("<unset>");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java
index 3b897fe731f..a4d04e461a4 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java
@@ -12,16 +12,22 @@
 package org.eclipse.papyrus.dd.dg.impl;
 
 import java.awt.Color;
+
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Definitions;
 import org.eclipse.papyrus.dd.dg.RootCanvas;
@@ -146,7 +152,7 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 		backgroundColor = newBackgroundColor;
 		boolean oldBackgroundColorESet = backgroundColorESet;
 		backgroundColorESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ROOT_CANVAS__BACKGROUND_COLOR, oldBackgroundColor, backgroundColor, !oldBackgroundColorESet));
 		}
 	}
@@ -162,7 +168,7 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 		boolean oldBackgroundColorESet = backgroundColorESet;
 		backgroundColor = BACKGROUND_COLOR_EDEFAULT;
 		backgroundColorESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.ROOT_CANVAS__BACKGROUND_COLOR, oldBackgroundColor, BACKGROUND_COLOR_EDEFAULT, oldBackgroundColorESet));
 		}
 	}
@@ -195,9 +201,9 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	public NotificationChain basicSetDefinitions(Definitions newDefinitions, NotificationChain msgs) {
 		Definitions oldDefinitions = definitions;
 		definitions = newDefinitions;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.ROOT_CANVAS__DEFINITIONS, oldDefinitions, newDefinitions);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -213,19 +219,19 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	 */
 	@Override
 	public void setDefinitions(Definitions newDefinitions) {
-		if (newDefinitions != definitions) {
+		if(newDefinitions != definitions) {
 			NotificationChain msgs = null;
-			if (definitions != null) {
-				msgs = ((InternalEObject) definitions).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ROOT_CANVAS__DEFINITIONS, null, msgs);
+			if(definitions != null) {
+				msgs = ((InternalEObject)definitions).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ROOT_CANVAS__DEFINITIONS, null, msgs);
 			}
-			if (newDefinitions != null) {
-				msgs = ((InternalEObject) newDefinitions).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ROOT_CANVAS__DEFINITIONS, null, msgs);
+			if(newDefinitions != null) {
+				msgs = ((InternalEObject)newDefinitions).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ROOT_CANVAS__DEFINITIONS, null, msgs);
 			}
 			msgs = basicSetDefinitions(newDefinitions, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ROOT_CANVAS__DEFINITIONS, newDefinitions, newDefinitions));
 		}
 	}
@@ -237,7 +243,7 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	 */
 	@Override
 	public EList<StyleSheet> getExternalStyleSheets() {
-		if (externalStyleSheets == null) {
+		if(externalStyleSheets == null) {
 			externalStyleSheets = new EObjectResolvingEList<StyleSheet>(StyleSheet.class, this, DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET);
 		}
 		return externalStyleSheets;
@@ -251,7 +257,7 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	 */
 	@Override
 	public EList<String> getScripts() {
-		if (scripts == null) {
+		if(scripts == null) {
 			scripts = new EDataTypeUniqueEList<String>(String.class, this, DGPackage.ROOT_CANVAS__SCRIPT);
 		}
 		return scripts;
@@ -264,7 +270,7 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ROOT_CANVAS__DEFINITIONS:
 			return basicSetDefinitions(null, msgs);
 		}
@@ -278,7 +284,7 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
 			return getBackgroundColor();
 		case DGPackage.ROOT_CANVAS__DEFINITIONS:
@@ -299,20 +305,20 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
-			setBackgroundColor((Color) newValue);
+			setBackgroundColor((Color)newValue);
 			return;
 		case DGPackage.ROOT_CANVAS__DEFINITIONS:
-			setDefinitions((Definitions) newValue);
+			setDefinitions((Definitions)newValue);
 			return;
 		case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET:
 			getExternalStyleSheets().clear();
-			getExternalStyleSheets().addAll((Collection<? extends StyleSheet>) newValue);
+			getExternalStyleSheets().addAll((Collection<? extends StyleSheet>)newValue);
 			return;
 		case DGPackage.ROOT_CANVAS__SCRIPT:
 			getScripts().clear();
-			getScripts().addAll((Collection<? extends String>) newValue);
+			getScripts().addAll((Collection<? extends String>)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -325,12 +331,12 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
 			unsetBackgroundColor();
 			return;
 		case DGPackage.ROOT_CANVAS__DEFINITIONS:
-			setDefinitions((Definitions) null);
+			setDefinitions((Definitions)null);
 			return;
 		case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET:
 			getExternalStyleSheets().clear();
@@ -349,7 +355,7 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
 			return isSetBackgroundColor();
 		case DGPackage.ROOT_CANVAS__DEFINITIONS:
@@ -369,12 +375,12 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (backgroundColor: ");
-		if (backgroundColorESet) {
+		if(backgroundColorESet) {
 			result.append(backgroundColor);
 		} else {
 			result.append("<unset>");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RotateImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RotateImpl.java
index 9641328099e..abdeba84431 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RotateImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RotateImpl.java
@@ -13,10 +13,14 @@ package org.eclipse.papyrus.dd.dg.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dc.Point;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Rotate;
 
@@ -102,7 +106,7 @@ public class RotateImpl extends TransformImpl implements Rotate {
 	public void setAngle(double newAngle) {
 		double oldAngle = angle;
 		angle = newAngle;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ROTATE__ANGLE, oldAngle, angle));
 		}
 	}
@@ -125,9 +129,9 @@ public class RotateImpl extends TransformImpl implements Rotate {
 	public NotificationChain basicSetCenter(Point newCenter, NotificationChain msgs) {
 		Point oldCenter = center;
 		center = newCenter;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.ROTATE__CENTER, oldCenter, newCenter);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -143,19 +147,19 @@ public class RotateImpl extends TransformImpl implements Rotate {
 	 */
 	@Override
 	public void setCenter(Point newCenter) {
-		if (newCenter != center) {
+		if(newCenter != center) {
 			NotificationChain msgs = null;
-			if (center != null) {
-				msgs = ((InternalEObject) center).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ROTATE__CENTER, null, msgs);
+			if(center != null) {
+				msgs = ((InternalEObject)center).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ROTATE__CENTER, null, msgs);
 			}
-			if (newCenter != null) {
-				msgs = ((InternalEObject) newCenter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ROTATE__CENTER, null, msgs);
+			if(newCenter != null) {
+				msgs = ((InternalEObject)newCenter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ROTATE__CENTER, null, msgs);
 			}
 			msgs = basicSetCenter(newCenter, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ROTATE__CENTER, newCenter, newCenter));
 		}
 	}
@@ -167,7 +171,7 @@ public class RotateImpl extends TransformImpl implements Rotate {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ROTATE__CENTER:
 			return basicSetCenter(null, msgs);
 		}
@@ -181,7 +185,7 @@ public class RotateImpl extends TransformImpl implements Rotate {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ROTATE__ANGLE:
 			return getAngle();
 		case DGPackage.ROTATE__CENTER:
@@ -197,12 +201,12 @@ public class RotateImpl extends TransformImpl implements Rotate {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ROTATE__ANGLE:
-			setAngle((Double) newValue);
+			setAngle((Double)newValue);
 			return;
 		case DGPackage.ROTATE__CENTER:
-			setCenter((Point) newValue);
+			setCenter((Point)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -215,12 +219,12 @@ public class RotateImpl extends TransformImpl implements Rotate {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ROTATE__ANGLE:
 			setAngle(ANGLE_EDEFAULT);
 			return;
 		case DGPackage.ROTATE__CENTER:
-			setCenter((Point) null);
+			setCenter((Point)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -233,7 +237,7 @@ public class RotateImpl extends TransformImpl implements Rotate {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.ROTATE__ANGLE:
 			return angle != ANGLE_EDEFAULT;
 		case DGPackage.ROTATE__CENTER:
@@ -249,7 +253,7 @@ public class RotateImpl extends TransformImpl implements Rotate {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java
index 301b598aba0..79fcdc5cab0 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java
@@ -12,16 +12,22 @@
 package org.eclipse.papyrus.dd.dg.impl;
 
 import java.lang.reflect.InvocationTargetException;
+
 import java.util.Map;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Scale;
+
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
@@ -116,7 +122,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	public void setFactorX(double newFactorX) {
 		double oldFactorX = factorX;
 		factorX = newFactorX;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.SCALE__FACTOR_X, oldFactorX, factorX));
 		}
 	}
@@ -140,7 +146,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	public void setFactorY(double newFactorY) {
 		double oldFactorY = factorY;
 		factorY = newFactorY;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.SCALE__FACTOR_Y, oldFactorY, factorY));
 		}
 	}
@@ -164,8 +170,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	 */
 	@Override
 	public boolean nonnegativescale(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.SCALE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP, NONNEGATIVESCALE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.SCALE__NONNEGATIVESCALE);
+		return DGValidator.validate(DGPackage.Literals.SCALE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP, NONNEGATIVESCALE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.SCALE__NONNEGATIVESCALE);
 	}
 
 	/**
@@ -175,7 +180,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.SCALE__FACTOR_X:
 			return getFactorX();
 		case DGPackage.SCALE__FACTOR_Y:
@@ -191,12 +196,12 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.SCALE__FACTOR_X:
-			setFactorX((Double) newValue);
+			setFactorX((Double)newValue);
 			return;
 		case DGPackage.SCALE__FACTOR_Y:
-			setFactorY((Double) newValue);
+			setFactorY((Double)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -209,7 +214,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.SCALE__FACTOR_X:
 			setFactorX(FACTOR_X_EDEFAULT);
 			return;
@@ -227,7 +232,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.SCALE__FACTOR_X:
 			return factorX != FACTOR_X_EDEFAULT;
 		case DGPackage.SCALE__FACTOR_Y:
@@ -244,9 +249,9 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
+		switch(operationID) {
 		case DGPackage.SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP:
-			return nonnegativescale((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return nonnegativescale((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
@@ -258,7 +263,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/SkewImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/SkewImpl.java
index be979fc90ac..27a7354b697 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/SkewImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/SkewImpl.java
@@ -12,8 +12,11 @@
 package org.eclipse.papyrus.dd.dg.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Skew;
 
@@ -109,7 +112,7 @@ public class SkewImpl extends TransformImpl implements Skew {
 	public void setAngleX(double newAngleX) {
 		double oldAngleX = angleX;
 		angleX = newAngleX;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.SKEW__ANGLE_X, oldAngleX, angleX));
 		}
 	}
@@ -133,7 +136,7 @@ public class SkewImpl extends TransformImpl implements Skew {
 	public void setAngleY(double newAngleY) {
 		double oldAngleY = angleY;
 		angleY = newAngleY;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.SKEW__ANGLE_Y, oldAngleY, angleY));
 		}
 	}
@@ -145,7 +148,7 @@ public class SkewImpl extends TransformImpl implements Skew {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.SKEW__ANGLE_X:
 			return getAngleX();
 		case DGPackage.SKEW__ANGLE_Y:
@@ -161,12 +164,12 @@ public class SkewImpl extends TransformImpl implements Skew {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.SKEW__ANGLE_X:
-			setAngleX((Double) newValue);
+			setAngleX((Double)newValue);
 			return;
 		case DGPackage.SKEW__ANGLE_Y:
-			setAngleY((Double) newValue);
+			setAngleY((Double)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -179,7 +182,7 @@ public class SkewImpl extends TransformImpl implements Skew {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.SKEW__ANGLE_X:
 			setAngleX(ANGLE_X_EDEFAULT);
 			return;
@@ -197,7 +200,7 @@ public class SkewImpl extends TransformImpl implements Skew {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.SKEW__ANGLE_X:
 			return angleX != ANGLE_X_EDEFAULT;
 		case DGPackage.SKEW__ANGLE_Y:
@@ -213,7 +216,7 @@ public class SkewImpl extends TransformImpl implements Skew {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java
index 5e57f58675a..89f937151b8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java
@@ -12,24 +12,31 @@
 package org.eclipse.papyrus.dd.dg.impl;
 
 import java.lang.reflect.InvocationTargetException;
+
 import java.util.Collection;
 import java.util.Map;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.emf.ecore.util.EDataTypeEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.FontDecoration;
 import org.eclipse.papyrus.dd.dg.Paint;
 import org.eclipse.papyrus.dd.dg.Style;
+
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
@@ -382,9 +389,9 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fill = newFill;
 		boolean oldFillESet = fillESet;
 		fillESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FILL, oldFill, newFill, !oldFillESet);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -400,22 +407,22 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 */
 	@Override
 	public void setFill(Paint newFill) {
-		if (newFill != fill) {
+		if(newFill != fill) {
 			NotificationChain msgs = null;
-			if (fill != null) {
-				msgs = ((InternalEObject) fill).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__FILL, null, msgs);
+			if(fill != null) {
+				msgs = ((InternalEObject)fill).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__FILL, null, msgs);
 			}
-			if (newFill != null) {
-				msgs = ((InternalEObject) newFill).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__FILL, null, msgs);
+			if(newFill != null) {
+				msgs = ((InternalEObject)newFill).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__FILL, null, msgs);
 			}
 			msgs = basicSetFill(newFill, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
 		} else {
 			boolean oldFillESet = fillESet;
 			fillESet = true;
-			if (eNotificationRequired()) {
+			if(eNotificationRequired()) {
 				eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FILL, newFill, newFill, !oldFillESet));
 			}
 		}
@@ -431,9 +438,9 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fill = null;
 		boolean oldFillESet = fillESet;
 		fillESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FILL, oldFill, null, oldFillESet);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -449,17 +456,17 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 */
 	@Override
 	public void unsetFill() {
-		if (fill != null) {
+		if(fill != null) {
 			NotificationChain msgs = null;
-			msgs = ((InternalEObject) fill).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__FILL, null, msgs);
+			msgs = ((InternalEObject)fill).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__FILL, null, msgs);
 			msgs = basicUnsetFill(msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
 		} else {
 			boolean oldFillESet = fillESet;
 			fillESet = false;
-			if (eNotificationRequired()) {
+			if(eNotificationRequired()) {
 				eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FILL, null, null, oldFillESet));
 			}
 		}
@@ -496,7 +503,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fillOpacity = newFillOpacity;
 		boolean oldFillOpacityESet = fillOpacityESet;
 		fillOpacityESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FILL_OPACITY, oldFillOpacity, fillOpacity, !oldFillOpacityESet));
 		}
 	}
@@ -512,7 +519,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldFillOpacityESet = fillOpacityESet;
 		fillOpacity = FILL_OPACITY_EDEFAULT;
 		fillOpacityESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FILL_OPACITY, oldFillOpacity, FILL_OPACITY_EDEFAULT, oldFillOpacityESet));
 		}
 	}
@@ -547,9 +554,9 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		stroke = newStroke;
 		boolean oldStrokeESet = strokeESet;
 		strokeESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__STROKE, oldStroke, newStroke, !oldStrokeESet);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -565,22 +572,22 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 */
 	@Override
 	public void setStroke(Paint newStroke) {
-		if (newStroke != stroke) {
+		if(newStroke != stroke) {
 			NotificationChain msgs = null;
-			if (stroke != null) {
-				msgs = ((InternalEObject) stroke).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__STROKE, null, msgs);
+			if(stroke != null) {
+				msgs = ((InternalEObject)stroke).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__STROKE, null, msgs);
 			}
-			if (newStroke != null) {
-				msgs = ((InternalEObject) newStroke).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__STROKE, null, msgs);
+			if(newStroke != null) {
+				msgs = ((InternalEObject)newStroke).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__STROKE, null, msgs);
 			}
 			msgs = basicSetStroke(newStroke, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
 		} else {
 			boolean oldStrokeESet = strokeESet;
 			strokeESet = true;
-			if (eNotificationRequired()) {
+			if(eNotificationRequired()) {
 				eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__STROKE, newStroke, newStroke, !oldStrokeESet));
 			}
 		}
@@ -596,9 +603,9 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		stroke = null;
 		boolean oldStrokeESet = strokeESet;
 		strokeESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__STROKE, oldStroke, null, oldStrokeESet);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -614,17 +621,17 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 */
 	@Override
 	public void unsetStroke() {
-		if (stroke != null) {
+		if(stroke != null) {
 			NotificationChain msgs = null;
-			msgs = ((InternalEObject) stroke).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__STROKE, null, msgs);
+			msgs = ((InternalEObject)stroke).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__STROKE, null, msgs);
 			msgs = basicUnsetStroke(msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
 		} else {
 			boolean oldStrokeESet = strokeESet;
 			strokeESet = false;
-			if (eNotificationRequired()) {
+			if(eNotificationRequired()) {
 				eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__STROKE, null, null, oldStrokeESet));
 			}
 		}
@@ -661,7 +668,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		strokeWidth = newStrokeWidth;
 		boolean oldStrokeWidthESet = strokeWidthESet;
 		strokeWidthESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__STROKE_WIDTH, oldStrokeWidth, strokeWidth, !oldStrokeWidthESet));
 		}
 	}
@@ -677,7 +684,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldStrokeWidthESet = strokeWidthESet;
 		strokeWidth = STROKE_WIDTH_EDEFAULT;
 		strokeWidthESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__STROKE_WIDTH, oldStrokeWidth, STROKE_WIDTH_EDEFAULT, oldStrokeWidthESet));
 		}
 	}
@@ -713,7 +720,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		strokeOpacity = newStrokeOpacity;
 		boolean oldStrokeOpacityESet = strokeOpacityESet;
 		strokeOpacityESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__STROKE_OPACITY, oldStrokeOpacity, strokeOpacity, !oldStrokeOpacityESet));
 		}
 	}
@@ -729,7 +736,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldStrokeOpacityESet = strokeOpacityESet;
 		strokeOpacity = STROKE_OPACITY_EDEFAULT;
 		strokeOpacityESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__STROKE_OPACITY, oldStrokeOpacity, STROKE_OPACITY_EDEFAULT, oldStrokeOpacityESet));
 		}
 	}
@@ -751,7 +758,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 */
 	@Override
 	public EList<Double> getStrokeDashLengths() {
-		if (strokeDashLengths == null) {
+		if(strokeDashLengths == null) {
 			strokeDashLengths = new EDataTypeEList.Unsettable<Double>(Double.class, this, DGPackage.STYLE__STROKE_DASH_LENGTH);
 		}
 		return strokeDashLengths;
@@ -764,8 +771,8 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 */
 	@Override
 	public void unsetStrokeDashLengths() {
-		if (strokeDashLengths != null) {
-			((InternalEList.Unsettable<?>) strokeDashLengths).unset();
+		if(strokeDashLengths != null) {
+			((InternalEList.Unsettable<?>)strokeDashLengths).unset();
 		}
 	}
 
@@ -776,7 +783,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 */
 	@Override
 	public boolean isSetStrokeDashLengths() {
-		return strokeDashLengths != null && ((InternalEList.Unsettable<?>) strokeDashLengths).isSet();
+		return strokeDashLengths != null && ((InternalEList.Unsettable<?>)strokeDashLengths).isSet();
 	}
 
 	/**
@@ -800,7 +807,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fontSize = newFontSize;
 		boolean oldFontSizeESet = fontSizeESet;
 		fontSizeESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FONT_SIZE, oldFontSize, fontSize, !oldFontSizeESet));
 		}
 	}
@@ -816,7 +823,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldFontSizeESet = fontSizeESet;
 		fontSize = FONT_SIZE_EDEFAULT;
 		fontSizeESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FONT_SIZE, oldFontSize, FONT_SIZE_EDEFAULT, oldFontSizeESet));
 		}
 	}
@@ -852,7 +859,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fontName = newFontName;
 		boolean oldFontNameESet = fontNameESet;
 		fontNameESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FONT_NAME, oldFontName, fontName, !oldFontNameESet));
 		}
 	}
@@ -868,7 +875,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldFontNameESet = fontNameESet;
 		fontName = FONT_NAME_EDEFAULT;
 		fontNameESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FONT_NAME, oldFontName, FONT_NAME_EDEFAULT, oldFontNameESet));
 		}
 	}
@@ -904,7 +911,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fontItalic = newFontItalic;
 		boolean oldFontItalicESet = fontItalicESet;
 		fontItalicESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FONT_ITALIC, oldFontItalic, fontItalic, !oldFontItalicESet));
 		}
 	}
@@ -920,7 +927,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldFontItalicESet = fontItalicESet;
 		fontItalic = FONT_ITALIC_EDEFAULT;
 		fontItalicESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FONT_ITALIC, oldFontItalic, FONT_ITALIC_EDEFAULT, oldFontItalicESet));
 		}
 	}
@@ -956,7 +963,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fontBold = newFontBold;
 		boolean oldFontBoldESet = fontBoldESet;
 		fontBoldESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FONT_BOLD, oldFontBold, fontBold, !oldFontBoldESet));
 		}
 	}
@@ -972,7 +979,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldFontBoldESet = fontBoldESet;
 		fontBold = FONT_BOLD_EDEFAULT;
 		fontBoldESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FONT_BOLD, oldFontBold, FONT_BOLD_EDEFAULT, oldFontBoldESet));
 		}
 	}
@@ -1008,7 +1015,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fontDecoration = newFontDecoration == null ? FONT_DECORATION_EDEFAULT : newFontDecoration;
 		boolean oldFontDecorationESet = fontDecorationESet;
 		fontDecorationESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FONT_DECORATION, oldFontDecoration, fontDecoration, !oldFontDecorationESet));
 		}
 	}
@@ -1024,7 +1031,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldFontDecorationESet = fontDecorationESet;
 		fontDecoration = FONT_DECORATION_EDEFAULT;
 		fontDecorationESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FONT_DECORATION, oldFontDecoration, FONT_DECORATION_EDEFAULT, oldFontDecorationESet));
 		}
 	}
@@ -1058,8 +1065,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 */
 	@Override
 	public boolean validFontSize(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.STYLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.STYLE___VALID_FONT_SIZE__DIAGNOSTICCHAIN_MAP, VALID_FONT_SIZE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.STYLE__VALID_FONT_SIZE);
+		return DGValidator.validate(DGPackage.Literals.STYLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.STYLE___VALID_FONT_SIZE__DIAGNOSTICCHAIN_MAP, VALID_FONT_SIZE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.STYLE__VALID_FONT_SIZE);
 	}
 
 	/**
@@ -1081,8 +1087,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 */
 	@Override
 	public boolean validFillOpacity(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.STYLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.STYLE___VALID_FILL_OPACITY__DIAGNOSTICCHAIN_MAP, VALID_FILL_OPACITY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.STYLE__VALID_FILL_OPACITY);
+		return DGValidator.validate(DGPackage.Literals.STYLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.STYLE___VALID_FILL_OPACITY__DIAGNOSTICCHAIN_MAP, VALID_FILL_OPACITY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.STYLE__VALID_FILL_OPACITY);
 	}
 
 	/**
@@ -1104,8 +1109,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 */
 	@Override
 	public boolean validStrokeWidth(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.STYLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.STYLE___VALID_STROKE_WIDTH__DIAGNOSTICCHAIN_MAP, VALID_STROKE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.STYLE__VALID_STROKE_WIDTH);
+		return DGValidator.validate(DGPackage.Literals.STYLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.STYLE___VALID_STROKE_WIDTH__DIAGNOSTICCHAIN_MAP, VALID_STROKE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.STYLE__VALID_STROKE_WIDTH);
 	}
 
 	/**
@@ -1126,8 +1130,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 */
 	@Override
 	public boolean validDashLengthSize(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.STYLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.STYLE___VALID_DASH_LENGTH_SIZE__DIAGNOSTICCHAIN_MAP,
-				VALID_DASH_LENGTH_SIZE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.STYLE__VALID_DASH_LENGTH_SIZE);
+		return DGValidator.validate(DGPackage.Literals.STYLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.STYLE___VALID_DASH_LENGTH_SIZE__DIAGNOSTICCHAIN_MAP, VALID_DASH_LENGTH_SIZE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.STYLE__VALID_DASH_LENGTH_SIZE);
 	}
 
 	/**
@@ -1149,8 +1152,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 */
 	@Override
 	public boolean validStrokeOpacity(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.STYLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.STYLE___VALID_STROKE_OPACITY__DIAGNOSTICCHAIN_MAP,
-				VALID_STROKE_OPACITY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.STYLE__VALID_STROKE_OPACITY);
+		return DGValidator.validate(DGPackage.Literals.STYLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.STYLE___VALID_STROKE_OPACITY__DIAGNOSTICCHAIN_MAP, VALID_STROKE_OPACITY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.STYLE__VALID_STROKE_OPACITY);
 	}
 
 	/**
@@ -1160,7 +1162,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.STYLE__FILL:
 			return basicUnsetFill(msgs);
 		case DGPackage.STYLE__STROKE:
@@ -1176,7 +1178,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.STYLE__FILL:
 			return getFill();
 		case DGPackage.STYLE__FILL_OPACITY:
@@ -1211,40 +1213,40 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.STYLE__FILL:
-			setFill((Paint) newValue);
+			setFill((Paint)newValue);
 			return;
 		case DGPackage.STYLE__FILL_OPACITY:
-			setFillOpacity((Double) newValue);
+			setFillOpacity((Double)newValue);
 			return;
 		case DGPackage.STYLE__STROKE:
-			setStroke((Paint) newValue);
+			setStroke((Paint)newValue);
 			return;
 		case DGPackage.STYLE__STROKE_WIDTH:
-			setStrokeWidth((Double) newValue);
+			setStrokeWidth((Double)newValue);
 			return;
 		case DGPackage.STYLE__STROKE_OPACITY:
-			setStrokeOpacity((Double) newValue);
+			setStrokeOpacity((Double)newValue);
 			return;
 		case DGPackage.STYLE__STROKE_DASH_LENGTH:
 			getStrokeDashLengths().clear();
-			getStrokeDashLengths().addAll((Collection<? extends Double>) newValue);
+			getStrokeDashLengths().addAll((Collection<? extends Double>)newValue);
 			return;
 		case DGPackage.STYLE__FONT_SIZE:
-			setFontSize((Double) newValue);
+			setFontSize((Double)newValue);
 			return;
 		case DGPackage.STYLE__FONT_NAME:
-			setFontName((String) newValue);
+			setFontName((String)newValue);
 			return;
 		case DGPackage.STYLE__FONT_ITALIC:
-			setFontItalic((Boolean) newValue);
+			setFontItalic((Boolean)newValue);
 			return;
 		case DGPackage.STYLE__FONT_BOLD:
-			setFontBold((Boolean) newValue);
+			setFontBold((Boolean)newValue);
 			return;
 		case DGPackage.STYLE__FONT_DECORATION:
-			setFontDecoration((FontDecoration) newValue);
+			setFontDecoration((FontDecoration)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -1257,7 +1259,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.STYLE__FILL:
 			unsetFill();
 			return;
@@ -1302,7 +1304,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.STYLE__FILL:
 			return isSetFill();
 		case DGPackage.STYLE__FILL_OPACITY:
@@ -1337,17 +1339,17 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
+		switch(operationID) {
 		case DGPackage.STYLE___VALID_FONT_SIZE__DIAGNOSTICCHAIN_MAP:
-			return validFontSize((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return validFontSize((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		case DGPackage.STYLE___VALID_FILL_OPACITY__DIAGNOSTICCHAIN_MAP:
-			return validFillOpacity((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return validFillOpacity((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		case DGPackage.STYLE___VALID_STROKE_WIDTH__DIAGNOSTICCHAIN_MAP:
-			return validStrokeWidth((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return validStrokeWidth((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		case DGPackage.STYLE___VALID_DASH_LENGTH_SIZE__DIAGNOSTICCHAIN_MAP:
-			return validDashLengthSize((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return validDashLengthSize((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		case DGPackage.STYLE___VALID_STROKE_OPACITY__DIAGNOSTICCHAIN_MAP:
-			return validStrokeOpacity((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return validStrokeOpacity((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
@@ -1359,24 +1361,24 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (fillOpacity: ");
-		if (fillOpacityESet) {
+		if(fillOpacityESet) {
 			result.append(fillOpacity);
 		} else {
 			result.append("<unset>");
 		}
 		result.append(", strokeWidth: ");
-		if (strokeWidthESet) {
+		if(strokeWidthESet) {
 			result.append(strokeWidth);
 		} else {
 			result.append("<unset>");
 		}
 		result.append(", strokeOpacity: ");
-		if (strokeOpacityESet) {
+		if(strokeOpacityESet) {
 			result.append(strokeOpacity);
 		} else {
 			result.append("<unset>");
@@ -1384,31 +1386,31 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		result.append(", strokeDashLength: ");
 		result.append(strokeDashLengths);
 		result.append(", fontSize: ");
-		if (fontSizeESet) {
+		if(fontSizeESet) {
 			result.append(fontSize);
 		} else {
 			result.append("<unset>");
 		}
 		result.append(", fontName: ");
-		if (fontNameESet) {
+		if(fontNameESet) {
 			result.append(fontName);
 		} else {
 			result.append("<unset>");
 		}
 		result.append(", fontItalic: ");
-		if (fontItalicESet) {
+		if(fontItalicESet) {
 			result.append(fontItalic);
 		} else {
 			result.append("<unset>");
 		}
 		result.append(", fontBold: ");
-		if (fontBoldESet) {
+		if(fontBoldESet) {
 			result.append(fontBold);
 		} else {
 			result.append("<unset>");
 		}
 		result.append(", fontDecoration: ");
-		if (fontDecorationESet) {
+		if(fontDecorationESet) {
 			result.append(fontDecoration);
 		} else {
 			result.append("<unset>");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java
index 75b7c67a550..fad4b0bcfe6 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java
@@ -15,13 +15,18 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Style;
 import org.eclipse.papyrus.dd.dg.StyleRule;
@@ -87,7 +92,7 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements Style
 	 */
 	@Override
 	public EList<StyleSelector> getSelectors() {
-		if (selectors == null) {
+		if(selectors == null) {
 			selectors = new EObjectContainmentEList<StyleSelector>(StyleSelector.class, this, DGPackage.STYLE_RULE__SELECTOR);
 		}
 		return selectors;
@@ -111,9 +116,9 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements Style
 	public NotificationChain basicSetStyle(Style newStyle, NotificationChain msgs) {
 		Style oldStyle = style;
 		style = newStyle;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.STYLE_RULE__STYLE, oldStyle, newStyle);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -129,19 +134,19 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements Style
 	 */
 	@Override
 	public void setStyle(Style newStyle) {
-		if (newStyle != style) {
+		if(newStyle != style) {
 			NotificationChain msgs = null;
-			if (style != null) {
-				msgs = ((InternalEObject) style).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE_RULE__STYLE, null, msgs);
+			if(style != null) {
+				msgs = ((InternalEObject)style).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE_RULE__STYLE, null, msgs);
 			}
-			if (newStyle != null) {
-				msgs = ((InternalEObject) newStyle).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE_RULE__STYLE, null, msgs);
+			if(newStyle != null) {
+				msgs = ((InternalEObject)newStyle).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE_RULE__STYLE, null, msgs);
 			}
 			msgs = basicSetStyle(newStyle, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE_RULE__STYLE, newStyle, newStyle));
 		}
 	}
@@ -153,9 +158,9 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements Style
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.STYLE_RULE__SELECTOR:
-			return ((InternalEList<?>) getSelectors()).basicRemove(otherEnd, msgs);
+			return ((InternalEList<?>)getSelectors()).basicRemove(otherEnd, msgs);
 		case DGPackage.STYLE_RULE__STYLE:
 			return basicSetStyle(null, msgs);
 		}
@@ -169,7 +174,7 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements Style
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.STYLE_RULE__SELECTOR:
 			return getSelectors();
 		case DGPackage.STYLE_RULE__STYLE:
@@ -186,13 +191,13 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements Style
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.STYLE_RULE__SELECTOR:
 			getSelectors().clear();
-			getSelectors().addAll((Collection<? extends StyleSelector>) newValue);
+			getSelectors().addAll((Collection<? extends StyleSelector>)newValue);
 			return;
 		case DGPackage.STYLE_RULE__STYLE:
-			setStyle((Style) newValue);
+			setStyle((Style)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -205,12 +210,12 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements Style
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.STYLE_RULE__SELECTOR:
 			getSelectors().clear();
 			return;
 		case DGPackage.STYLE_RULE__STYLE:
-			setStyle((Style) null);
+			setStyle((Style)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -223,7 +228,7 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements Style
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.STYLE_RULE__SELECTOR:
 			return selectors != null && !selectors.isEmpty();
 		case DGPackage.STYLE_RULE__STYLE:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java
index 2fd2c138ef3..600808fbaee 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java
@@ -12,7 +12,6 @@
 package org.eclipse.papyrus.dd.dg.impl;
 
 import java.util.Collection;
-
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -117,7 +116,7 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements S
 		kind = newKind == null ? KIND_EDEFAULT : newKind;
 		boolean oldKindESet = kindESet;
 		kindESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE_SELECTOR__KIND, oldKind, kind, !oldKindESet));
 		}
 	}
@@ -133,7 +132,7 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements S
 		boolean oldKindESet = kindESet;
 		kind = KIND_EDEFAULT;
 		kindESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE_SELECTOR__KIND, oldKind, KIND_EDEFAULT, oldKindESet));
 		}
 	}
@@ -155,7 +154,7 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements S
 	 */
 	@Override
 	public EList<String> getClasses() {
-		if (classes == null) {
+		if(classes == null) {
 			classes = new EDataTypeUniqueEList<String>(String.class, this, DGPackage.STYLE_SELECTOR__CLASS);
 		}
 		return classes;
@@ -168,7 +167,7 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements S
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.STYLE_SELECTOR__KIND:
 			return getKind();
 		case DGPackage.STYLE_SELECTOR__CLASS:
@@ -185,13 +184,13 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements S
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.STYLE_SELECTOR__KIND:
-			setKind((ElementKind) newValue);
+			setKind((ElementKind)newValue);
 			return;
 		case DGPackage.STYLE_SELECTOR__CLASS:
 			getClasses().clear();
-			getClasses().addAll((Collection<? extends String>) newValue);
+			getClasses().addAll((Collection<? extends String>)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -204,7 +203,7 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements S
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.STYLE_SELECTOR__KIND:
 			unsetKind();
 			return;
@@ -222,7 +221,7 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements S
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.STYLE_SELECTOR__KIND:
 			return isSetKind();
 		case DGPackage.STYLE_SELECTOR__CLASS:
@@ -238,12 +237,12 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements S
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (kind: ");
-		if (kindESet) {
+		if(kindESet) {
 			result.append(kind);
 		} else {
 			result.append("<unset>");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java
index fdea6a1be16..c5a6c150d42 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java
@@ -14,12 +14,17 @@ package org.eclipse.papyrus.dd.dg.impl;
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.StyleRule;
 import org.eclipse.papyrus.dd.dg.StyleSheet;
@@ -73,7 +78,7 @@ public class StyleSheetImpl extends MinimalEObjectImpl.Container implements Styl
 	 */
 	@Override
 	public EList<StyleRule> getRules() {
-		if (rules == null) {
+		if(rules == null) {
 			rules = new EObjectContainmentEList<StyleRule>(StyleRule.class, this, DGPackage.STYLE_SHEET__RULE);
 		}
 		return rules;
@@ -86,9 +91,9 @@ public class StyleSheetImpl extends MinimalEObjectImpl.Container implements Styl
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.STYLE_SHEET__RULE:
-			return ((InternalEList<?>) getRules()).basicRemove(otherEnd, msgs);
+			return ((InternalEList<?>)getRules()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -100,7 +105,7 @@ public class StyleSheetImpl extends MinimalEObjectImpl.Container implements Styl
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.STYLE_SHEET__RULE:
 			return getRules();
 		}
@@ -115,10 +120,10 @@ public class StyleSheetImpl extends MinimalEObjectImpl.Container implements Styl
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.STYLE_SHEET__RULE:
 			getRules().clear();
-			getRules().addAll((Collection<? extends StyleRule>) newValue);
+			getRules().addAll((Collection<? extends StyleRule>)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -131,7 +136,7 @@ public class StyleSheetImpl extends MinimalEObjectImpl.Container implements Styl
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.STYLE_SHEET__RULE:
 			getRules().clear();
 			return;
@@ -146,7 +151,7 @@ public class StyleSheetImpl extends MinimalEObjectImpl.Container implements Styl
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.STYLE_SHEET__RULE:
 			return rules != null && !rules.isEmpty();
 		}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java
index 510e627a61a..b11f78a6d7a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java
@@ -13,7 +13,6 @@ package org.eclipse.papyrus.dd.dg.impl;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
-
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.Diagnostic;
@@ -22,7 +21,7 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.dd.dc.Point;
+import org.eclipse.papyrus.dd.dc.Bounds;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Text;
 import org.eclipse.papyrus.dd.dg.TextAnchor;
@@ -34,7 +33,7 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
  * The following features are implemented:
  * <ul>
  * <li>{@link org.eclipse.papyrus.dd.dg.impl.TextImpl#getData <em>Data</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.TextImpl#getPosition <em>Position</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.TextImpl#getBounds <em>Bounds</em>}</li>
  * <li>{@link org.eclipse.papyrus.dd.dg.impl.TextImpl#getAnchor <em>Anchor</em>}</li>
  * </ul>
  * </p>
@@ -64,14 +63,15 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	protected String data = DATA_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getPosition() <em>Position</em>}' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 *
-	 * @see #getPosition()
+	 * @see #getBounds()
 	 * @generated
 	 * @ordered
 	 */
-	protected Point position;
+	protected Bounds bounds;
 
 	/**
 	 * The default value of the '{@link #getAnchor() <em>Anchor</em>}' attribute.
@@ -133,32 +133,34 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	public void setData(String newData) {
 		String oldData = data;
 		data = newData;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.TEXT__DATA, oldData, data));
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 */
 	@Override
-	public Point getPosition() {
-		return position;
+	public Bounds getBounds() {
+		return bounds;
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 */
-	public NotificationChain basicSetPosition(Point newPosition, NotificationChain msgs) {
-		Point oldPosition = position;
-		position = newPosition;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.TEXT__POSITION, oldPosition, newPosition);
-			if (msgs == null) {
+	public NotificationChain basicSetBounds(Bounds newBounds, NotificationChain msgs) {
+		Bounds oldBounds = bounds;
+		bounds = newBounds;
+		if(eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.TEXT__BOUNDS, oldBounds, newBounds);
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -168,26 +170,27 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 */
 	@Override
-	public void setPosition(Point newPosition) {
-		if (newPosition != position) {
+	public void setBounds(Bounds newBounds) {
+		if(newBounds != bounds) {
 			NotificationChain msgs = null;
-			if (position != null) {
-				msgs = ((InternalEObject) position).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.TEXT__POSITION, null, msgs);
+			if(bounds != null) {
+				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.TEXT__BOUNDS, null, msgs);
 			}
-			if (newPosition != null) {
-				msgs = ((InternalEObject) newPosition).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.TEXT__POSITION, null, msgs);
+			if(newBounds != null) {
+				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.TEXT__BOUNDS, null, msgs);
 			}
-			msgs = basicSetPosition(newPosition, msgs);
-			if (msgs != null) {
+			msgs = basicSetBounds(newBounds, msgs);
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.TEXT__POSITION, newPosition, newPosition));
+		} else if(eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.TEXT__BOUNDS, newBounds, newBounds));
 		}
 	}
 
@@ -212,7 +215,7 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	public void setAnchor(TextAnchor newAnchor) {
 		TextAnchor oldAnchor = anchor;
 		anchor = newAnchor == null ? ANCHOR_EDEFAULT : newAnchor;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.TEXT__ANCHOR, oldAnchor, anchor));
 		}
 	}
@@ -236,8 +239,7 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	 */
 	@Override
 	public boolean dataCannotBeEmpty(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.TEXT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP, DATA_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.TEXT__DATA_CANNOT_BE_EMPTY);
+		return DGValidator.validate(DGPackage.Literals.TEXT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP, DATA_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.TEXT__DATA_CANNOT_BE_EMPTY);
 	}
 
 	/**
@@ -247,9 +249,9 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case DGPackage.TEXT__POSITION:
-			return basicSetPosition(null, msgs);
+		switch(featureID) {
+		case DGPackage.TEXT__BOUNDS:
+			return basicSetBounds(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -261,11 +263,11 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.TEXT__DATA:
 			return getData();
-		case DGPackage.TEXT__POSITION:
-			return getPosition();
+		case DGPackage.TEXT__BOUNDS:
+			return getBounds();
 		case DGPackage.TEXT__ANCHOR:
 			return getAnchor();
 		}
@@ -279,15 +281,15 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.TEXT__DATA:
-			setData((String) newValue);
+			setData((String)newValue);
 			return;
-		case DGPackage.TEXT__POSITION:
-			setPosition((Point) newValue);
+		case DGPackage.TEXT__BOUNDS:
+			setBounds((Bounds)newValue);
 			return;
 		case DGPackage.TEXT__ANCHOR:
-			setAnchor((TextAnchor) newValue);
+			setAnchor((TextAnchor)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -300,12 +302,12 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.TEXT__DATA:
 			setData(DATA_EDEFAULT);
 			return;
-		case DGPackage.TEXT__POSITION:
-			setPosition((Point) null);
+		case DGPackage.TEXT__BOUNDS:
+			setBounds((Bounds)null);
 			return;
 		case DGPackage.TEXT__ANCHOR:
 			setAnchor(ANCHOR_EDEFAULT);
@@ -321,11 +323,11 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.TEXT__DATA:
 			return DATA_EDEFAULT == null ? data != null : !DATA_EDEFAULT.equals(data);
-		case DGPackage.TEXT__POSITION:
-			return position != null;
+		case DGPackage.TEXT__BOUNDS:
+			return bounds != null;
 		case DGPackage.TEXT__ANCHOR:
 			return anchor != ANCHOR_EDEFAULT;
 		}
@@ -340,9 +342,9 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
+		switch(operationID) {
 		case DGPackage.TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP:
-			return dataCannotBeEmpty((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return dataCannotBeEmpty((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
@@ -354,7 +356,7 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TransformImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TransformImpl.java
index 9e33ae5f390..07896a9e069 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TransformImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TransformImpl.java
@@ -12,7 +12,9 @@
 package org.eclipse.papyrus.dd.dg.impl;
 
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Transform;
 
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TranslateImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TranslateImpl.java
index 69639290ba8..4a943b3379f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TranslateImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TranslateImpl.java
@@ -12,8 +12,11 @@
 package org.eclipse.papyrus.dd.dg.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Translate;
 
@@ -109,7 +112,7 @@ public class TranslateImpl extends TransformImpl implements Translate {
 	public void setDeltaX(double newDeltaX) {
 		double oldDeltaX = deltaX;
 		deltaX = newDeltaX;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.TRANSLATE__DELTA_X, oldDeltaX, deltaX));
 		}
 	}
@@ -133,7 +136,7 @@ public class TranslateImpl extends TransformImpl implements Translate {
 	public void setDeltaY(double newDeltaY) {
 		double oldDeltaY = deltaY;
 		deltaY = newDeltaY;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.TRANSLATE__DELTA_Y, oldDeltaY, deltaY));
 		}
 	}
@@ -145,7 +148,7 @@ public class TranslateImpl extends TransformImpl implements Translate {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.TRANSLATE__DELTA_X:
 			return getDeltaX();
 		case DGPackage.TRANSLATE__DELTA_Y:
@@ -161,12 +164,12 @@ public class TranslateImpl extends TransformImpl implements Translate {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.TRANSLATE__DELTA_X:
-			setDeltaX((Double) newValue);
+			setDeltaX((Double)newValue);
 			return;
 		case DGPackage.TRANSLATE__DELTA_Y:
-			setDeltaY((Double) newValue);
+			setDeltaY((Double)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -179,7 +182,7 @@ public class TranslateImpl extends TransformImpl implements Translate {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.TRANSLATE__DELTA_X:
 			setDeltaX(DELTA_X_EDEFAULT);
 			return;
@@ -197,7 +200,7 @@ public class TranslateImpl extends TransformImpl implements Translate {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.TRANSLATE__DELTA_X:
 			return deltaX != DELTA_X_EDEFAULT;
 		case DGPackage.TRANSLATE__DELTA_Y:
@@ -213,7 +216,7 @@ public class TranslateImpl extends TransformImpl implements Translate {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java
index 73a1a4ae4bb..389bcdff955 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java
@@ -13,16 +13,19 @@ package org.eclipse.papyrus.dd.dg.impl;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
-
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dc.Bounds;
+
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.GraphicalElement;
 import org.eclipse.papyrus.dd.dg.Use;
@@ -100,9 +103,9 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 	public NotificationChain basicSetBounds(Bounds newBounds, NotificationChain msgs) {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.USE__BOUNDS, oldBounds, newBounds);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -118,19 +121,19 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 	 */
 	@Override
 	public void setBounds(Bounds newBounds) {
-		if (newBounds != bounds) {
+		if(newBounds != bounds) {
 			NotificationChain msgs = null;
-			if (bounds != null) {
-				msgs = ((InternalEObject) bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.USE__BOUNDS, null, msgs);
+			if(bounds != null) {
+				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.USE__BOUNDS, null, msgs);
 			}
-			if (newBounds != null) {
-				msgs = ((InternalEObject) newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.USE__BOUNDS, null, msgs);
+			if(newBounds != null) {
+				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.USE__BOUNDS, null, msgs);
 			}
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.USE__BOUNDS, newBounds, newBounds));
 		}
 	}
@@ -142,11 +145,11 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 	 */
 	@Override
 	public GraphicalElement getReferencedElement() {
-		if (referencedElement != null && referencedElement.eIsProxy()) {
-			InternalEObject oldReferencedElement = (InternalEObject) referencedElement;
-			referencedElement = (GraphicalElement) eResolveProxy(oldReferencedElement);
-			if (referencedElement != oldReferencedElement) {
-				if (eNotificationRequired()) {
+		if(referencedElement != null && referencedElement.eIsProxy()) {
+			InternalEObject oldReferencedElement = (InternalEObject)referencedElement;
+			referencedElement = (GraphicalElement)eResolveProxy(oldReferencedElement);
+			if(referencedElement != oldReferencedElement) {
+				if(eNotificationRequired()) {
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DGPackage.USE__REFERENCED_ELEMENT, oldReferencedElement, referencedElement));
 				}
 			}
@@ -172,7 +175,7 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 	public void setReferencedElement(GraphicalElement newReferencedElement) {
 		GraphicalElement oldReferencedElement = referencedElement;
 		referencedElement = newReferencedElement;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.USE__REFERENCED_ELEMENT, oldReferencedElement, referencedElement));
 		}
 	}
@@ -195,8 +198,7 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 	 */
 	@Override
 	public boolean referencedElementHasId(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return DGValidator.validate(DGPackage.Literals.USE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP,
-				REFERENCED_ELEMENT_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.USE__REFERENCED_ELEMENT_HAS_ID);
+		return DGValidator.validate(DGPackage.Literals.USE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP, REFERENCED_ELEMENT_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.USE__REFERENCED_ELEMENT_HAS_ID);
 	}
 
 	/**
@@ -206,7 +208,7 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.USE__BOUNDS:
 			return basicSetBounds(null, msgs);
 		}
@@ -220,11 +222,11 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.USE__BOUNDS:
 			return getBounds();
 		case DGPackage.USE__REFERENCED_ELEMENT:
-			if (resolve) {
+			if(resolve) {
 				return getReferencedElement();
 			}
 			return basicGetReferencedElement();
@@ -239,12 +241,12 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.USE__BOUNDS:
-			setBounds((Bounds) newValue);
+			setBounds((Bounds)newValue);
 			return;
 		case DGPackage.USE__REFERENCED_ELEMENT:
-			setReferencedElement((GraphicalElement) newValue);
+			setReferencedElement((GraphicalElement)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -257,12 +259,12 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.USE__BOUNDS:
-			setBounds((Bounds) null);
+			setBounds((Bounds)null);
 			return;
 		case DGPackage.USE__REFERENCED_ELEMENT:
-			setReferencedElement((GraphicalElement) null);
+			setReferencedElement((GraphicalElement)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -275,7 +277,7 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DGPackage.USE__BOUNDS:
 			return bounds != null;
 		case DGPackage.USE__REFERENCED_ELEMENT:
@@ -292,9 +294,9 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
+		switch(operationID) {
 		case DGPackage.USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP:
-			return referencedElementHasId((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return referencedElementHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java
index 05b9eb5076a..57a1cc0ab08 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java
@@ -13,52 +13,12 @@ package org.eclipse.papyrus.dd.dg.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
+
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.dd.dg.Canvas;
-import org.eclipse.papyrus.dd.dg.Circle;
-import org.eclipse.papyrus.dd.dg.ClipPath;
-import org.eclipse.papyrus.dd.dg.ClosePath;
-import org.eclipse.papyrus.dd.dg.CubicCurveTo;
-import org.eclipse.papyrus.dd.dg.DGPackage;
-import org.eclipse.papyrus.dd.dg.Definition;
-import org.eclipse.papyrus.dd.dg.Definitions;
-import org.eclipse.papyrus.dd.dg.Ellipse;
-import org.eclipse.papyrus.dd.dg.EllipticalArcTo;
-import org.eclipse.papyrus.dd.dg.Gradient;
-import org.eclipse.papyrus.dd.dg.GradientStop;
-import org.eclipse.papyrus.dd.dg.GraphicalElement;
-import org.eclipse.papyrus.dd.dg.Group;
-import org.eclipse.papyrus.dd.dg.Image;
-import org.eclipse.papyrus.dd.dg.Line;
-import org.eclipse.papyrus.dd.dg.LineTo;
-import org.eclipse.papyrus.dd.dg.LinearGradient;
-import org.eclipse.papyrus.dd.dg.MarkedElement;
-import org.eclipse.papyrus.dd.dg.Marker;
-import org.eclipse.papyrus.dd.dg.Matrix;
-import org.eclipse.papyrus.dd.dg.MoveTo;
-import org.eclipse.papyrus.dd.dg.Paint;
-import org.eclipse.papyrus.dd.dg.PaintServer;
-import org.eclipse.papyrus.dd.dg.Path;
-import org.eclipse.papyrus.dd.dg.PathCommand;
-import org.eclipse.papyrus.dd.dg.Pattern;
-import org.eclipse.papyrus.dd.dg.Polygon;
-import org.eclipse.papyrus.dd.dg.Polyline;
-import org.eclipse.papyrus.dd.dg.QuadraticCurveTo;
-import org.eclipse.papyrus.dd.dg.RadialGradient;
-import org.eclipse.papyrus.dd.dg.Rectangle;
-import org.eclipse.papyrus.dd.dg.RootCanvas;
-import org.eclipse.papyrus.dd.dg.Rotate;
-import org.eclipse.papyrus.dd.dg.Scale;
-import org.eclipse.papyrus.dd.dg.Skew;
-import org.eclipse.papyrus.dd.dg.Style;
-import org.eclipse.papyrus.dd.dg.StyleRule;
-import org.eclipse.papyrus.dd.dg.StyleSelector;
-import org.eclipse.papyrus.dd.dg.StyleSheet;
-import org.eclipse.papyrus.dd.dg.Text;
-import org.eclipse.papyrus.dd.dg.Transform;
-import org.eclipse.papyrus.dd.dg.Translate;
-import org.eclipse.papyrus.dd.dg.Use;
+
+import org.eclipse.papyrus.dd.dg.*;
 
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
@@ -86,7 +46,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * @generated
 	 */
 	public DGAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = DGPackage.eINSTANCE;
 		}
 	}
@@ -102,11 +62,11 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
+		if(object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
 	}
@@ -346,13 +306,13 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param target
-	 *            the object to adapt.
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
 	@Override
 	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject) target);
+		return modelSwitch.doSwitch((EObject)target);
 	}
 
 	/**
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java
index 0d6e197b810..44124f1c98e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java
@@ -13,51 +13,10 @@ package org.eclipse.papyrus.dd.dg.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.dd.dg.Canvas;
-import org.eclipse.papyrus.dd.dg.Circle;
-import org.eclipse.papyrus.dd.dg.ClipPath;
-import org.eclipse.papyrus.dd.dg.ClosePath;
-import org.eclipse.papyrus.dd.dg.CubicCurveTo;
-import org.eclipse.papyrus.dd.dg.DGPackage;
-import org.eclipse.papyrus.dd.dg.Definition;
-import org.eclipse.papyrus.dd.dg.Definitions;
-import org.eclipse.papyrus.dd.dg.Ellipse;
-import org.eclipse.papyrus.dd.dg.EllipticalArcTo;
-import org.eclipse.papyrus.dd.dg.Gradient;
-import org.eclipse.papyrus.dd.dg.GradientStop;
-import org.eclipse.papyrus.dd.dg.GraphicalElement;
-import org.eclipse.papyrus.dd.dg.Group;
-import org.eclipse.papyrus.dd.dg.Image;
-import org.eclipse.papyrus.dd.dg.Line;
-import org.eclipse.papyrus.dd.dg.LineTo;
-import org.eclipse.papyrus.dd.dg.LinearGradient;
-import org.eclipse.papyrus.dd.dg.MarkedElement;
-import org.eclipse.papyrus.dd.dg.Marker;
-import org.eclipse.papyrus.dd.dg.Matrix;
-import org.eclipse.papyrus.dd.dg.MoveTo;
-import org.eclipse.papyrus.dd.dg.Paint;
-import org.eclipse.papyrus.dd.dg.PaintServer;
-import org.eclipse.papyrus.dd.dg.Path;
-import org.eclipse.papyrus.dd.dg.PathCommand;
-import org.eclipse.papyrus.dd.dg.Pattern;
-import org.eclipse.papyrus.dd.dg.Polygon;
-import org.eclipse.papyrus.dd.dg.Polyline;
-import org.eclipse.papyrus.dd.dg.QuadraticCurveTo;
-import org.eclipse.papyrus.dd.dg.RadialGradient;
-import org.eclipse.papyrus.dd.dg.Rectangle;
-import org.eclipse.papyrus.dd.dg.RootCanvas;
-import org.eclipse.papyrus.dd.dg.Rotate;
-import org.eclipse.papyrus.dd.dg.Scale;
-import org.eclipse.papyrus.dd.dg.Skew;
-import org.eclipse.papyrus.dd.dg.Style;
-import org.eclipse.papyrus.dd.dg.StyleRule;
-import org.eclipse.papyrus.dd.dg.StyleSelector;
-import org.eclipse.papyrus.dd.dg.StyleSheet;
-import org.eclipse.papyrus.dd.dg.Text;
-import org.eclipse.papyrus.dd.dg.Transform;
-import org.eclipse.papyrus.dd.dg.Translate;
-import org.eclipse.papyrus.dd.dg.Use;
+
+import org.eclipse.papyrus.dd.dg.*;
 
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
@@ -87,7 +46,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * @generated
 	 */
 	public DGSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = DGPackage.eINSTANCE;
 		}
 	}
@@ -115,539 +74,582 @@ public class DGSwitch<T> extends Switch<T> {
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-		case DGPackage.CANVAS: {
-			Canvas canvas = (Canvas) theEObject;
+		switch(classifierID) {
+		case DGPackage.CANVAS:
+		{
+			Canvas canvas = (Canvas)theEObject;
 			T result = caseCanvas(canvas);
-			if (result == null) {
+			if(result == null) {
 				result = caseGroup(canvas);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseGraphicalElement(canvas);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(canvas);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.GROUP: {
-			Group group = (Group) theEObject;
+		case DGPackage.GROUP:
+		{
+			Group group = (Group)theEObject;
 			T result = caseGroup(group);
-			if (result == null) {
+			if(result == null) {
 				result = caseGraphicalElement(group);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(group);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.GRAPHICAL_ELEMENT: {
-			GraphicalElement graphicalElement = (GraphicalElement) theEObject;
+		case DGPackage.GRAPHICAL_ELEMENT:
+		{
+			GraphicalElement graphicalElement = (GraphicalElement)theEObject;
 			T result = caseGraphicalElement(graphicalElement);
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(graphicalElement);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.DEFINITION: {
-			Definition definition = (Definition) theEObject;
+		case DGPackage.DEFINITION:
+		{
+			Definition definition = (Definition)theEObject;
 			T result = caseDefinition(definition);
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.MOVE_TO: {
-			MoveTo moveTo = (MoveTo) theEObject;
+		case DGPackage.MOVE_TO:
+		{
+			MoveTo moveTo = (MoveTo)theEObject;
 			T result = caseMoveTo(moveTo);
-			if (result == null) {
+			if(result == null) {
 				result = casePathCommand(moveTo);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.PATH_COMMAND: {
-			PathCommand pathCommand = (PathCommand) theEObject;
+		case DGPackage.PATH_COMMAND:
+		{
+			PathCommand pathCommand = (PathCommand)theEObject;
 			T result = casePathCommand(pathCommand);
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.CLIP_PATH: {
-			ClipPath clipPath = (ClipPath) theEObject;
+		case DGPackage.CLIP_PATH:
+		{
+			ClipPath clipPath = (ClipPath)theEObject;
 			T result = caseClipPath(clipPath);
-			if (result == null) {
+			if(result == null) {
 				result = caseGroup(clipPath);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseGraphicalElement(clipPath);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(clipPath);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.STYLE: {
-			Style style = (Style) theEObject;
+		case DGPackage.STYLE:
+		{
+			Style style = (Style)theEObject;
 			T result = caseStyle(style);
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.PAINT: {
-			Paint paint = (Paint) theEObject;
+		case DGPackage.PAINT:
+		{
+			Paint paint = (Paint)theEObject;
 			T result = casePaint(paint);
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.PAINT_SERVER: {
-			PaintServer paintServer = (PaintServer) theEObject;
+		case DGPackage.PAINT_SERVER:
+		{
+			PaintServer paintServer = (PaintServer)theEObject;
 			T result = casePaintServer(paintServer);
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(paintServer);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.TRANSFORM: {
-			Transform transform = (Transform) theEObject;
+		case DGPackage.TRANSFORM:
+		{
+			Transform transform = (Transform)theEObject;
 			T result = caseTransform(transform);
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.CIRCLE: {
-			Circle circle = (Circle) theEObject;
+		case DGPackage.CIRCLE:
+		{
+			Circle circle = (Circle)theEObject;
 			T result = caseCircle(circle);
-			if (result == null) {
+			if(result == null) {
 				result = caseGraphicalElement(circle);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(circle);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.CLOSE_PATH: {
-			ClosePath closePath = (ClosePath) theEObject;
+		case DGPackage.CLOSE_PATH:
+		{
+			ClosePath closePath = (ClosePath)theEObject;
 			T result = caseClosePath(closePath);
-			if (result == null) {
+			if(result == null) {
 				result = casePathCommand(closePath);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.CUBIC_CURVE_TO: {
-			CubicCurveTo cubicCurveTo = (CubicCurveTo) theEObject;
+		case DGPackage.CUBIC_CURVE_TO:
+		{
+			CubicCurveTo cubicCurveTo = (CubicCurveTo)theEObject;
 			T result = caseCubicCurveTo(cubicCurveTo);
-			if (result == null) {
+			if(result == null) {
 				result = casePathCommand(cubicCurveTo);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.DEFINITIONS: {
-			Definitions definitions = (Definitions) theEObject;
+		case DGPackage.DEFINITIONS:
+		{
+			Definitions definitions = (Definitions)theEObject;
 			T result = caseDefinitions(definitions);
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.STYLE_SHEET: {
-			StyleSheet styleSheet = (StyleSheet) theEObject;
+		case DGPackage.STYLE_SHEET:
+		{
+			StyleSheet styleSheet = (StyleSheet)theEObject;
 			T result = caseStyleSheet(styleSheet);
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.STYLE_RULE: {
-			StyleRule styleRule = (StyleRule) theEObject;
+		case DGPackage.STYLE_RULE:
+		{
+			StyleRule styleRule = (StyleRule)theEObject;
 			T result = caseStyleRule(styleRule);
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.STYLE_SELECTOR: {
-			StyleSelector styleSelector = (StyleSelector) theEObject;
+		case DGPackage.STYLE_SELECTOR:
+		{
+			StyleSelector styleSelector = (StyleSelector)theEObject;
 			T result = caseStyleSelector(styleSelector);
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.ELLIPSE: {
-			Ellipse ellipse = (Ellipse) theEObject;
+		case DGPackage.ELLIPSE:
+		{
+			Ellipse ellipse = (Ellipse)theEObject;
 			T result = caseEllipse(ellipse);
-			if (result == null) {
+			if(result == null) {
 				result = caseGraphicalElement(ellipse);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(ellipse);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.ELLIPTICAL_ARC_TO: {
-			EllipticalArcTo ellipticalArcTo = (EllipticalArcTo) theEObject;
+		case DGPackage.ELLIPTICAL_ARC_TO:
+		{
+			EllipticalArcTo ellipticalArcTo = (EllipticalArcTo)theEObject;
 			T result = caseEllipticalArcTo(ellipticalArcTo);
-			if (result == null) {
+			if(result == null) {
 				result = casePathCommand(ellipticalArcTo);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.QUADRATIC_CURVE_TO: {
-			QuadraticCurveTo quadraticCurveTo = (QuadraticCurveTo) theEObject;
+		case DGPackage.QUADRATIC_CURVE_TO:
+		{
+			QuadraticCurveTo quadraticCurveTo = (QuadraticCurveTo)theEObject;
 			T result = caseQuadraticCurveTo(quadraticCurveTo);
-			if (result == null) {
+			if(result == null) {
 				result = casePathCommand(quadraticCurveTo);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.GRADIENT: {
-			Gradient gradient = (Gradient) theEObject;
+		case DGPackage.GRADIENT:
+		{
+			Gradient gradient = (Gradient)theEObject;
 			T result = caseGradient(gradient);
-			if (result == null) {
+			if(result == null) {
 				result = casePaintServer(gradient);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(gradient);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.GRADIENT_STOP: {
-			GradientStop gradientStop = (GradientStop) theEObject;
+		case DGPackage.GRADIENT_STOP:
+		{
+			GradientStop gradientStop = (GradientStop)theEObject;
 			T result = caseGradientStop(gradientStop);
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.IMAGE: {
-			Image image = (Image) theEObject;
+		case DGPackage.IMAGE:
+		{
+			Image image = (Image)theEObject;
 			T result = caseImage(image);
-			if (result == null) {
+			if(result == null) {
 				result = caseGraphicalElement(image);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(image);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.LINE: {
-			Line line = (Line) theEObject;
+		case DGPackage.LINE:
+		{
+			Line line = (Line)theEObject;
 			T result = caseLine(line);
-			if (result == null) {
+			if(result == null) {
 				result = caseMarkedElement(line);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseGraphicalElement(line);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(line);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.MARKED_ELEMENT: {
-			MarkedElement markedElement = (MarkedElement) theEObject;
+		case DGPackage.MARKED_ELEMENT:
+		{
+			MarkedElement markedElement = (MarkedElement)theEObject;
 			T result = caseMarkedElement(markedElement);
-			if (result == null) {
+			if(result == null) {
 				result = caseGraphicalElement(markedElement);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(markedElement);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.MARKER: {
-			Marker marker = (Marker) theEObject;
+		case DGPackage.MARKER:
+		{
+			Marker marker = (Marker)theEObject;
 			T result = caseMarker(marker);
-			if (result == null) {
+			if(result == null) {
 				result = caseGroup(marker);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseGraphicalElement(marker);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(marker);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.LINEAR_GRADIENT: {
-			LinearGradient linearGradient = (LinearGradient) theEObject;
+		case DGPackage.LINEAR_GRADIENT:
+		{
+			LinearGradient linearGradient = (LinearGradient)theEObject;
 			T result = caseLinearGradient(linearGradient);
-			if (result == null) {
+			if(result == null) {
 				result = caseGradient(linearGradient);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = casePaintServer(linearGradient);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(linearGradient);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.LINE_TO: {
-			LineTo lineTo = (LineTo) theEObject;
+		case DGPackage.LINE_TO:
+		{
+			LineTo lineTo = (LineTo)theEObject;
 			T result = caseLineTo(lineTo);
-			if (result == null) {
+			if(result == null) {
 				result = casePathCommand(lineTo);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.MATRIX: {
-			Matrix matrix = (Matrix) theEObject;
+		case DGPackage.MATRIX:
+		{
+			Matrix matrix = (Matrix)theEObject;
 			T result = caseMatrix(matrix);
-			if (result == null) {
+			if(result == null) {
 				result = caseTransform(matrix);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.PATH: {
-			Path path = (Path) theEObject;
+		case DGPackage.PATH:
+		{
+			Path path = (Path)theEObject;
 			T result = casePath(path);
-			if (result == null) {
+			if(result == null) {
 				result = caseMarkedElement(path);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseGraphicalElement(path);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(path);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.PATTERN: {
-			Pattern pattern = (Pattern) theEObject;
+		case DGPackage.PATTERN:
+		{
+			Pattern pattern = (Pattern)theEObject;
 			T result = casePattern(pattern);
-			if (result == null) {
+			if(result == null) {
 				result = casePaintServer(pattern);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(pattern);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.POLYGON: {
-			Polygon polygon = (Polygon) theEObject;
+		case DGPackage.POLYGON:
+		{
+			Polygon polygon = (Polygon)theEObject;
 			T result = casePolygon(polygon);
-			if (result == null) {
+			if(result == null) {
 				result = caseMarkedElement(polygon);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseGraphicalElement(polygon);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(polygon);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.POLYLINE: {
-			Polyline polyline = (Polyline) theEObject;
+		case DGPackage.POLYLINE:
+		{
+			Polyline polyline = (Polyline)theEObject;
 			T result = casePolyline(polyline);
-			if (result == null) {
+			if(result == null) {
 				result = caseMarkedElement(polyline);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseGraphicalElement(polyline);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(polyline);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.RADIAL_GRADIENT: {
-			RadialGradient radialGradient = (RadialGradient) theEObject;
+		case DGPackage.RADIAL_GRADIENT:
+		{
+			RadialGradient radialGradient = (RadialGradient)theEObject;
 			T result = caseRadialGradient(radialGradient);
-			if (result == null) {
+			if(result == null) {
 				result = caseGradient(radialGradient);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = casePaintServer(radialGradient);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(radialGradient);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.RECTANGLE: {
-			Rectangle rectangle = (Rectangle) theEObject;
+		case DGPackage.RECTANGLE:
+		{
+			Rectangle rectangle = (Rectangle)theEObject;
 			T result = caseRectangle(rectangle);
-			if (result == null) {
+			if(result == null) {
 				result = caseGraphicalElement(rectangle);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(rectangle);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.ROOT_CANVAS: {
-			RootCanvas rootCanvas = (RootCanvas) theEObject;
+		case DGPackage.ROOT_CANVAS:
+		{
+			RootCanvas rootCanvas = (RootCanvas)theEObject;
 			T result = caseRootCanvas(rootCanvas);
-			if (result == null) {
+			if(result == null) {
 				result = caseCanvas(rootCanvas);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseGroup(rootCanvas);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseGraphicalElement(rootCanvas);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(rootCanvas);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.ROTATE: {
-			Rotate rotate = (Rotate) theEObject;
+		case DGPackage.ROTATE:
+		{
+			Rotate rotate = (Rotate)theEObject;
 			T result = caseRotate(rotate);
-			if (result == null) {
+			if(result == null) {
 				result = caseTransform(rotate);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.SCALE: {
-			Scale scale = (Scale) theEObject;
+		case DGPackage.SCALE:
+		{
+			Scale scale = (Scale)theEObject;
 			T result = caseScale(scale);
-			if (result == null) {
+			if(result == null) {
 				result = caseTransform(scale);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.SKEW: {
-			Skew skew = (Skew) theEObject;
+		case DGPackage.SKEW:
+		{
+			Skew skew = (Skew)theEObject;
 			T result = caseSkew(skew);
-			if (result == null) {
+			if(result == null) {
 				result = caseTransform(skew);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.TEXT: {
-			Text text = (Text) theEObject;
+		case DGPackage.TEXT:
+		{
+			Text text = (Text)theEObject;
 			T result = caseText(text);
-			if (result == null) {
+			if(result == null) {
 				result = caseGraphicalElement(text);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(text);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.TRANSLATE: {
-			Translate translate = (Translate) theEObject;
+		case DGPackage.TRANSLATE:
+		{
+			Translate translate = (Translate)theEObject;
 			T result = caseTranslate(translate);
-			if (result == null) {
+			if(result == null) {
 				result = caseTransform(translate);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DGPackage.USE: {
-			Use use = (Use) theEObject;
+		case DGPackage.USE:
+		{
+			Use use = (Use)theEObject;
 			T result = caseUse(use);
-			if (result == null) {
+			if(result == null) {
 				result = caseGraphicalElement(use);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDefinition(use);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
@@ -664,7 +666,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Canvas</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -680,7 +682,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Group</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -696,7 +698,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Graphical Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -712,7 +714,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Definition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -728,7 +730,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Clip Path</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -744,7 +746,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -760,7 +762,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Paint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -776,7 +778,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Paint Server</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -792,7 +794,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Transform</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -808,7 +810,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Definitions</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -824,7 +826,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Cubic Curve To</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -840,7 +842,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Path Command</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -856,7 +858,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Marker</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -872,7 +874,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Style Sheet</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -888,7 +890,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Style Rule</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -904,7 +906,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Style Selector</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -920,7 +922,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Circle</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -936,7 +938,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Close Path</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -952,7 +954,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Ellipse</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -968,7 +970,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Elliptical Arc To</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -984,7 +986,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Quadratic Curve To</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1000,7 +1002,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Gradient</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1016,7 +1018,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Gradient Stop</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1032,7 +1034,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Image</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1047,7 +1049,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of ' <em>Line</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1063,7 +1065,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Marked Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1079,7 +1081,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Linear Gradient</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1095,7 +1097,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Line To</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1111,7 +1113,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Matrix</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1127,7 +1129,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Move To</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1142,7 +1144,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of ' <em>Path</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1158,7 +1160,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Pattern</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1174,7 +1176,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Polygon</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1190,7 +1192,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Polyline</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1206,7 +1208,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Radial Gradient</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1222,7 +1224,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Rectangle</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1238,7 +1240,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Root Canvas</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1254,7 +1256,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Rotate</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1270,7 +1272,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Scale</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1285,7 +1287,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of ' <em>Skew</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1300,7 +1302,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of ' <em>Text</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1316,7 +1318,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Translate</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1331,7 +1333,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of ' <em>Use</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1347,7 +1349,7 @@ public class DGSwitch<T> extends Switch<T> {
 	 * the last case anyway. <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java
index 49fd4a8b5f2..bd16d9db593 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java
@@ -15,58 +15,15 @@ import java.util.Map;
 
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.emf.ecore.util.EObjectValidator;
-import org.eclipse.papyrus.dd.dg.Canvas;
-import org.eclipse.papyrus.dd.dg.Circle;
-import org.eclipse.papyrus.dd.dg.ClipPath;
-import org.eclipse.papyrus.dd.dg.ClosePath;
-import org.eclipse.papyrus.dd.dg.CubicCurveTo;
-import org.eclipse.papyrus.dd.dg.DGPackage;
-import org.eclipse.papyrus.dd.dg.Definition;
-import org.eclipse.papyrus.dd.dg.Definitions;
-import org.eclipse.papyrus.dd.dg.ElementKind;
-import org.eclipse.papyrus.dd.dg.Ellipse;
-import org.eclipse.papyrus.dd.dg.EllipticalArcTo;
-import org.eclipse.papyrus.dd.dg.FontDecoration;
-import org.eclipse.papyrus.dd.dg.Gradient;
-import org.eclipse.papyrus.dd.dg.GradientStop;
-import org.eclipse.papyrus.dd.dg.GraphicalElement;
-import org.eclipse.papyrus.dd.dg.Group;
-import org.eclipse.papyrus.dd.dg.Image;
-import org.eclipse.papyrus.dd.dg.Line;
-import org.eclipse.papyrus.dd.dg.LineTo;
-import org.eclipse.papyrus.dd.dg.LinearGradient;
-import org.eclipse.papyrus.dd.dg.MarkedElement;
-import org.eclipse.papyrus.dd.dg.Marker;
-import org.eclipse.papyrus.dd.dg.Matrix;
-import org.eclipse.papyrus.dd.dg.MoveTo;
-import org.eclipse.papyrus.dd.dg.Paint;
-import org.eclipse.papyrus.dd.dg.PaintServer;
-import org.eclipse.papyrus.dd.dg.Path;
-import org.eclipse.papyrus.dd.dg.PathCommand;
-import org.eclipse.papyrus.dd.dg.Pattern;
-import org.eclipse.papyrus.dd.dg.Polygon;
-import org.eclipse.papyrus.dd.dg.Polyline;
-import org.eclipse.papyrus.dd.dg.QuadraticCurveTo;
-import org.eclipse.papyrus.dd.dg.RadialGradient;
-import org.eclipse.papyrus.dd.dg.Rectangle;
-import org.eclipse.papyrus.dd.dg.RootCanvas;
-import org.eclipse.papyrus.dd.dg.Rotate;
-import org.eclipse.papyrus.dd.dg.Scale;
-import org.eclipse.papyrus.dd.dg.Skew;
-import org.eclipse.papyrus.dd.dg.Style;
-import org.eclipse.papyrus.dd.dg.StyleRule;
-import org.eclipse.papyrus.dd.dg.StyleSelector;
-import org.eclipse.papyrus.dd.dg.StyleSheet;
-import org.eclipse.papyrus.dd.dg.Text;
-import org.eclipse.papyrus.dd.dg.TextAnchor;
-import org.eclipse.papyrus.dd.dg.Transform;
-import org.eclipse.papyrus.dd.dg.Translate;
-import org.eclipse.papyrus.dd.dg.Use;
+
+import org.eclipse.papyrus.dd.dg.*;
 
 /**
  * <!-- begin-user-doc --> The <b>Validator</b> for the model. <!-- end-user-doc
@@ -86,7 +43,8 @@ public class DGValidator extends EObjectValidator {
 	public static final DGValidator INSTANCE = new DGValidator();
 
 	/**
-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic
+	 * {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
@@ -379,99 +337,99 @@ public class DGValidator extends EObjectValidator {
 	 */
 	@Override
 	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		switch (classifierID) {
+		switch(classifierID) {
 		case DGPackage.CANVAS:
-			return validateCanvas((Canvas) value, diagnostics, context);
+			return validateCanvas((Canvas)value, diagnostics, context);
 		case DGPackage.GROUP:
-			return validateGroup((Group) value, diagnostics, context);
+			return validateGroup((Group)value, diagnostics, context);
 		case DGPackage.GRAPHICAL_ELEMENT:
-			return validateGraphicalElement((GraphicalElement) value, diagnostics, context);
+			return validateGraphicalElement((GraphicalElement)value, diagnostics, context);
 		case DGPackage.DEFINITION:
-			return validateDefinition((Definition) value, diagnostics, context);
+			return validateDefinition((Definition)value, diagnostics, context);
 		case DGPackage.MOVE_TO:
-			return validateMoveTo((MoveTo) value, diagnostics, context);
+			return validateMoveTo((MoveTo)value, diagnostics, context);
 		case DGPackage.PATH_COMMAND:
-			return validatePathCommand((PathCommand) value, diagnostics, context);
+			return validatePathCommand((PathCommand)value, diagnostics, context);
 		case DGPackage.CLIP_PATH:
-			return validateClipPath((ClipPath) value, diagnostics, context);
+			return validateClipPath((ClipPath)value, diagnostics, context);
 		case DGPackage.STYLE:
-			return validateStyle((Style) value, diagnostics, context);
+			return validateStyle((Style)value, diagnostics, context);
 		case DGPackage.PAINT:
-			return validatePaint((Paint) value, diagnostics, context);
+			return validatePaint((Paint)value, diagnostics, context);
 		case DGPackage.PAINT_SERVER:
-			return validatePaintServer((PaintServer) value, diagnostics, context);
+			return validatePaintServer((PaintServer)value, diagnostics, context);
 		case DGPackage.TRANSFORM:
-			return validateTransform((Transform) value, diagnostics, context);
+			return validateTransform((Transform)value, diagnostics, context);
 		case DGPackage.CIRCLE:
-			return validateCircle((Circle) value, diagnostics, context);
+			return validateCircle((Circle)value, diagnostics, context);
 		case DGPackage.CLOSE_PATH:
-			return validateClosePath((ClosePath) value, diagnostics, context);
+			return validateClosePath((ClosePath)value, diagnostics, context);
 		case DGPackage.CUBIC_CURVE_TO:
-			return validateCubicCurveTo((CubicCurveTo) value, diagnostics, context);
+			return validateCubicCurveTo((CubicCurveTo)value, diagnostics, context);
 		case DGPackage.DEFINITIONS:
-			return validateDefinitions((Definitions) value, diagnostics, context);
+			return validateDefinitions((Definitions)value, diagnostics, context);
 		case DGPackage.STYLE_SHEET:
-			return validateStyleSheet((StyleSheet) value, diagnostics, context);
+			return validateStyleSheet((StyleSheet)value, diagnostics, context);
 		case DGPackage.STYLE_RULE:
-			return validateStyleRule((StyleRule) value, diagnostics, context);
+			return validateStyleRule((StyleRule)value, diagnostics, context);
 		case DGPackage.STYLE_SELECTOR:
-			return validateStyleSelector((StyleSelector) value, diagnostics, context);
+			return validateStyleSelector((StyleSelector)value, diagnostics, context);
 		case DGPackage.ELLIPSE:
-			return validateEllipse((Ellipse) value, diagnostics, context);
+			return validateEllipse((Ellipse)value, diagnostics, context);
 		case DGPackage.ELLIPTICAL_ARC_TO:
-			return validateEllipticalArcTo((EllipticalArcTo) value, diagnostics, context);
+			return validateEllipticalArcTo((EllipticalArcTo)value, diagnostics, context);
 		case DGPackage.QUADRATIC_CURVE_TO:
-			return validateQuadraticCurveTo((QuadraticCurveTo) value, diagnostics, context);
+			return validateQuadraticCurveTo((QuadraticCurveTo)value, diagnostics, context);
 		case DGPackage.GRADIENT:
-			return validateGradient((Gradient) value, diagnostics, context);
+			return validateGradient((Gradient)value, diagnostics, context);
 		case DGPackage.GRADIENT_STOP:
-			return validateGradientStop((GradientStop) value, diagnostics, context);
+			return validateGradientStop((GradientStop)value, diagnostics, context);
 		case DGPackage.IMAGE:
-			return validateImage((Image) value, diagnostics, context);
+			return validateImage((Image)value, diagnostics, context);
 		case DGPackage.LINE:
-			return validateLine((Line) value, diagnostics, context);
+			return validateLine((Line)value, diagnostics, context);
 		case DGPackage.MARKED_ELEMENT:
-			return validateMarkedElement((MarkedElement) value, diagnostics, context);
+			return validateMarkedElement((MarkedElement)value, diagnostics, context);
 		case DGPackage.MARKER:
-			return validateMarker((Marker) value, diagnostics, context);
+			return validateMarker((Marker)value, diagnostics, context);
 		case DGPackage.LINEAR_GRADIENT:
-			return validateLinearGradient((LinearGradient) value, diagnostics, context);
+			return validateLinearGradient((LinearGradient)value, diagnostics, context);
 		case DGPackage.LINE_TO:
-			return validateLineTo((LineTo) value, diagnostics, context);
+			return validateLineTo((LineTo)value, diagnostics, context);
 		case DGPackage.MATRIX:
-			return validateMatrix((Matrix) value, diagnostics, context);
+			return validateMatrix((Matrix)value, diagnostics, context);
 		case DGPackage.PATH:
-			return validatePath((Path) value, diagnostics, context);
+			return validatePath((Path)value, diagnostics, context);
 		case DGPackage.PATTERN:
-			return validatePattern((Pattern) value, diagnostics, context);
+			return validatePattern((Pattern)value, diagnostics, context);
 		case DGPackage.POLYGON:
-			return validatePolygon((Polygon) value, diagnostics, context);
+			return validatePolygon((Polygon)value, diagnostics, context);
 		case DGPackage.POLYLINE:
-			return validatePolyline((Polyline) value, diagnostics, context);
+			return validatePolyline((Polyline)value, diagnostics, context);
 		case DGPackage.RADIAL_GRADIENT:
-			return validateRadialGradient((RadialGradient) value, diagnostics, context);
+			return validateRadialGradient((RadialGradient)value, diagnostics, context);
 		case DGPackage.RECTANGLE:
-			return validateRectangle((Rectangle) value, diagnostics, context);
+			return validateRectangle((Rectangle)value, diagnostics, context);
 		case DGPackage.ROOT_CANVAS:
-			return validateRootCanvas((RootCanvas) value, diagnostics, context);
+			return validateRootCanvas((RootCanvas)value, diagnostics, context);
 		case DGPackage.ROTATE:
-			return validateRotate((Rotate) value, diagnostics, context);
+			return validateRotate((Rotate)value, diagnostics, context);
 		case DGPackage.SCALE:
-			return validateScale((Scale) value, diagnostics, context);
+			return validateScale((Scale)value, diagnostics, context);
 		case DGPackage.SKEW:
-			return validateSkew((Skew) value, diagnostics, context);
+			return validateSkew((Skew)value, diagnostics, context);
 		case DGPackage.TEXT:
-			return validateText((Text) value, diagnostics, context);
+			return validateText((Text)value, diagnostics, context);
 		case DGPackage.TRANSLATE:
-			return validateTranslate((Translate) value, diagnostics, context);
+			return validateTranslate((Translate)value, diagnostics, context);
 		case DGPackage.USE:
-			return validateUse((Use) value, diagnostics, context);
+			return validateUse((Use)value, diagnostics, context);
 		case DGPackage.FONT_DECORATION:
-			return validateFontDecoration((FontDecoration) value, diagnostics, context);
+			return validateFontDecoration((FontDecoration)value, diagnostics, context);
 		case DGPackage.ELEMENT_KIND:
-			return validateElementKind((ElementKind) value, diagnostics, context);
+			return validateElementKind((ElementKind)value, diagnostics, context);
 		case DGPackage.TEXT_ANCHOR:
-			return validateTextAnchor((TextAnchor) value, diagnostics, context);
+			return validateTextAnchor((TextAnchor)value, diagnostics, context);
 		default:
 			return true;
 		}
@@ -483,38 +441,38 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateCanvas(Canvas canvas, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(canvas, diagnostics, context)) {
+		if(!validate_NoCircularContainment(canvas, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(canvas, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(canvas, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(canvas, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(canvas, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(canvas, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(canvas, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(canvas, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(canvas, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(canvas, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateGraphicalElement_referencedClippathHasId(canvas, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateCanvas_canvasCannotHaveTransforms(canvas, diagnostics, context);
 		}
 		return result;
@@ -536,35 +494,35 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateGroup(Group group, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(group, diagnostics, context)) {
+		if(!validate_NoCircularContainment(group, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(group, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(group, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(group, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(group, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(group, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(group, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(group, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(group, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(group, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateGraphicalElement_referencedClippathHasId(group, diagnostics, context);
 		}
 		return result;
@@ -576,35 +534,35 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateGraphicalElement(GraphicalElement graphicalElement, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(graphicalElement, diagnostics, context)) {
+		if(!validate_NoCircularContainment(graphicalElement, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(graphicalElement, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(graphicalElement, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(graphicalElement, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(graphicalElement, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(graphicalElement, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(graphicalElement, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(graphicalElement, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(graphicalElement, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(graphicalElement, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateGraphicalElement_referencedClippathHasId(graphicalElement, diagnostics, context);
 		}
 		return result;
@@ -626,32 +584,32 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateDefinition(Definition definition, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(definition, diagnostics, context)) {
+		if(!validate_NoCircularContainment(definition, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(definition, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(definition, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(definition, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(definition, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(definition, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(definition, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(definition, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(definition, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(definition, diagnostics, context);
 		}
 		return result;
@@ -673,35 +631,35 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateClipPath(ClipPath clipPath, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(clipPath, diagnostics, context)) {
+		if(!validate_NoCircularContainment(clipPath, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(clipPath, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(clipPath, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(clipPath, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(clipPath, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(clipPath, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(clipPath, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(clipPath, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(clipPath, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(clipPath, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateGraphicalElement_referencedClippathHasId(clipPath, diagnostics, context);
 		}
 		return result;
@@ -713,44 +671,44 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateStyle(Style style, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(style, diagnostics, context)) {
+		if(!validate_NoCircularContainment(style, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(style, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(style, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(style, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(style, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(style, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(style, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(style, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(style, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateStyle_validFontSize(style, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateStyle_validFillOpacity(style, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateStyle_validStrokeWidth(style, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateStyle_validDashLengthSize(style, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateStyle_validStrokeOpacity(style, diagnostics, context);
 		}
 		return result;
@@ -812,32 +770,32 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validatePaint(Paint paint, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(paint, diagnostics, context)) {
+		if(!validate_NoCircularContainment(paint, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(paint, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(paint, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(paint, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(paint, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(paint, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(paint, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(paint, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(paint, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validatePaint_referencedPaintServerHasId(paint, diagnostics, context);
 		}
 		return result;
@@ -859,32 +817,32 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validatePaintServer(PaintServer paintServer, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(paintServer, diagnostics, context)) {
+		if(!validate_NoCircularContainment(paintServer, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(paintServer, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(paintServer, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(paintServer, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(paintServer, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(paintServer, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(paintServer, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(paintServer, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(paintServer, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(paintServer, diagnostics, context);
 		}
 		return result;
@@ -932,35 +890,35 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateMarker(Marker marker, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(marker, diagnostics, context)) {
+		if(!validate_NoCircularContainment(marker, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(marker, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(marker, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(marker, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(marker, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(marker, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(marker, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(marker, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(marker, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(marker, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateGraphicalElement_referencedClippathHasId(marker, diagnostics, context);
 		}
 		return result;
@@ -999,38 +957,38 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateCircle(Circle circle, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(circle, diagnostics, context)) {
+		if(!validate_NoCircularContainment(circle, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(circle, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(circle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(circle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(circle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(circle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(circle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(circle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(circle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(circle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateGraphicalElement_referencedClippathHasId(circle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateCircle_nonNegativeRadius(circle, diagnostics, context);
 		}
 		return result;
@@ -1061,35 +1019,35 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateEllipse(Ellipse ellipse, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(ellipse, diagnostics, context)) {
+		if(!validate_NoCircularContainment(ellipse, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(ellipse, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(ellipse, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(ellipse, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(ellipse, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(ellipse, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(ellipse, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(ellipse, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(ellipse, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(ellipse, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateGraphicalElement_referencedClippathHasId(ellipse, diagnostics, context);
 		}
 		return result;
@@ -1119,32 +1077,32 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateGradient(Gradient gradient, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(gradient, diagnostics, context)) {
+		if(!validate_NoCircularContainment(gradient, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(gradient, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(gradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(gradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(gradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(gradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(gradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(gradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(gradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(gradient, diagnostics, context);
 		}
 		return result;
@@ -1156,35 +1114,35 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateGradientStop(GradientStop gradientStop, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(gradientStop, diagnostics, context)) {
+		if(!validate_NoCircularContainment(gradientStop, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(gradientStop, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(gradientStop, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(gradientStop, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(gradientStop, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(gradientStop, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(gradientStop, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(gradientStop, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(gradientStop, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateGradientStop_validOffset(gradientStop, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateGradientStop_validOpacity(gradientStop, diagnostics, context);
 		}
 		return result;
@@ -1216,38 +1174,38 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateImage(Image image, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(image, diagnostics, context)) {
+		if(!validate_NoCircularContainment(image, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(image, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(image, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(image, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(image, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(image, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(image, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(image, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(image, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(image, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateGraphicalElement_referencedClippathHasId(image, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateImage_sourceCannotBeEmpty(image, diagnostics, context);
 		}
 		return result;
@@ -1269,44 +1227,44 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateLine(Line line, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(line, diagnostics, context)) {
+		if(!validate_NoCircularContainment(line, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(line, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(line, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(line, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(line, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(line, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(line, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(line, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(line, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(line, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateGraphicalElement_referencedClippathHasId(line, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateMarkedElement_referencedStartMarkerHasId(line, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateMarkedElement_referencedMidMarkerHasId(line, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateMarkedElement_referencedEndMarkerHasId(line, diagnostics, context);
 		}
 		return result;
@@ -1318,44 +1276,44 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateMarkedElement(MarkedElement markedElement, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(markedElement, diagnostics, context)) {
+		if(!validate_NoCircularContainment(markedElement, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(markedElement, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(markedElement, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(markedElement, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(markedElement, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(markedElement, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(markedElement, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(markedElement, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(markedElement, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(markedElement, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateGraphicalElement_referencedClippathHasId(markedElement, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateMarkedElement_referencedStartMarkerHasId(markedElement, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateMarkedElement_referencedMidMarkerHasId(markedElement, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateMarkedElement_referencedEndMarkerHasId(markedElement, diagnostics, context);
 		}
 		return result;
@@ -1397,35 +1355,35 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateLinearGradient(LinearGradient linearGradient, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(linearGradient, diagnostics, context)) {
+		if(!validate_NoCircularContainment(linearGradient, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(linearGradient, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(linearGradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(linearGradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(linearGradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(linearGradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(linearGradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(linearGradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(linearGradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(linearGradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateLinearGradient_validGradientVector(linearGradient, diagnostics, context);
 		}
 		return result;
@@ -1474,47 +1432,47 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validatePath(Path path, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(path, diagnostics, context)) {
+		if(!validate_NoCircularContainment(path, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(path, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(path, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(path, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(path, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(path, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(path, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(path, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(path, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(path, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateGraphicalElement_referencedClippathHasId(path, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateMarkedElement_referencedStartMarkerHasId(path, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateMarkedElement_referencedMidMarkerHasId(path, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateMarkedElement_referencedEndMarkerHasId(path, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validatePath_firstCommandMustBeMove(path, diagnostics, context);
 		}
 		return result;
@@ -1536,32 +1494,32 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validatePattern(Pattern pattern, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(pattern, diagnostics, context)) {
+		if(!validate_NoCircularContainment(pattern, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(pattern, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(pattern, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(pattern, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(pattern, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(pattern, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(pattern, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(pattern, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(pattern, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(pattern, diagnostics, context);
 		}
 		return result;
@@ -1573,44 +1531,44 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validatePolygon(Polygon polygon, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(polygon, diagnostics, context)) {
+		if(!validate_NoCircularContainment(polygon, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(polygon, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(polygon, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(polygon, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(polygon, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(polygon, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(polygon, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(polygon, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(polygon, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(polygon, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateGraphicalElement_referencedClippathHasId(polygon, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateMarkedElement_referencedStartMarkerHasId(polygon, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateMarkedElement_referencedMidMarkerHasId(polygon, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateMarkedElement_referencedEndMarkerHasId(polygon, diagnostics, context);
 		}
 		return result;
@@ -1622,44 +1580,44 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validatePolyline(Polyline polyline, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(polyline, diagnostics, context)) {
+		if(!validate_NoCircularContainment(polyline, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(polyline, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(polyline, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(polyline, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(polyline, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(polyline, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(polyline, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(polyline, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(polyline, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(polyline, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateGraphicalElement_referencedClippathHasId(polyline, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateMarkedElement_referencedStartMarkerHasId(polyline, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateMarkedElement_referencedMidMarkerHasId(polyline, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateMarkedElement_referencedEndMarkerHasId(polyline, diagnostics, context);
 		}
 		return result;
@@ -1671,41 +1629,41 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateRadialGradient(RadialGradient radialGradient, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(radialGradient, diagnostics, context)) {
+		if(!validate_NoCircularContainment(radialGradient, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(radialGradient, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(radialGradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(radialGradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(radialGradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(radialGradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(radialGradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(radialGradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(radialGradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(radialGradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateRadialGradient_validCenterPoint(radialGradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateRadialGradient_validFocusPoint(radialGradient, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateRadialGradient_validRadius(radialGradient, diagnostics, context);
 		}
 		return result;
@@ -1747,38 +1705,38 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateRectangle(Rectangle rectangle, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(rectangle, diagnostics, context)) {
+		if(!validate_NoCircularContainment(rectangle, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(rectangle, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(rectangle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(rectangle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(rectangle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(rectangle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(rectangle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(rectangle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(rectangle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(rectangle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateGraphicalElement_referencedClippathHasId(rectangle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateRectangle_nonNegativeCornerRadius(rectangle, diagnostics, context);
 		}
 		return result;
@@ -1800,38 +1758,38 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateRootCanvas(RootCanvas rootCanvas, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(rootCanvas, diagnostics, context)) {
+		if(!validate_NoCircularContainment(rootCanvas, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(rootCanvas, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(rootCanvas, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(rootCanvas, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(rootCanvas, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(rootCanvas, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(rootCanvas, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(rootCanvas, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(rootCanvas, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(rootCanvas, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateGraphicalElement_referencedClippathHasId(rootCanvas, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateCanvas_canvasCannotHaveTransforms(rootCanvas, diagnostics, context);
 		}
 		return result;
@@ -1852,32 +1810,32 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateScale(Scale scale, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(scale, diagnostics, context)) {
+		if(!validate_NoCircularContainment(scale, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(scale, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(scale, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(scale, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(scale, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(scale, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(scale, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(scale, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(scale, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateScale_nonnegativescale(scale, diagnostics, context);
 		}
 		return result;
@@ -1908,38 +1866,38 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateText(Text text, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(text, diagnostics, context)) {
+		if(!validate_NoCircularContainment(text, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(text, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(text, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(text, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(text, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(text, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(text, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(text, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(text, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(text, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateGraphicalElement_referencedClippathHasId(text, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateText_dataCannotBeEmpty(text, diagnostics, context);
 		}
 		return result;
@@ -1970,38 +1928,38 @@ public class DGValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateUse(Use use, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(use, diagnostics, context)) {
+		if(!validate_NoCircularContainment(use, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(use, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(use, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(use, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(use, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(use, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(use, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(use, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(use, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateDefinition_idCannotBeEmpty(use, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateGraphicalElement_referencedClippathHasId(use, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateUse_referencedElementHasId(use, diagnostics, context);
 		}
 		return result;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Diagram.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Diagram.java
index 24fcc1bcc99..bc44120a405 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Diagram.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Diagram.java
@@ -55,7 +55,7 @@ public interface Diagram extends Shape {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Name</em>' attribute.
+	 *        the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
 	 */
@@ -82,7 +82,7 @@ public interface Diagram extends Shape {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Documentation</em>' attribute.
+	 *        the new value of the '<em>Documentation</em>' attribute.
 	 * @see #getDocumentation()
 	 * @generated
 	 */
@@ -109,7 +109,7 @@ public interface Diagram extends Shape {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Resolution</em>' attribute.
+	 *        the new value of the '<em>Resolution</em>' attribute.
 	 * @see #getResolution()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DiagramElement.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DiagramElement.java
index e0bb4a0cebd..55c49149ba5 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DiagramElement.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DiagramElement.java
@@ -12,6 +12,7 @@
 package org.eclipse.papyrus.dd.di;
 
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -59,7 +60,8 @@ public interface DiagramElement extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Owning Diagram Element</b></em>' reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwnedDiagramElement <em>Owned Diagram Element</em>} '.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwnedDiagramElement <em>Owned Diagram Element</em>}
+	 * '.
 	 * This feature is a derived union.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Edge.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Edge.java
index e4fdefecca5..b29c8188f6f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Edge.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Edge.java
@@ -12,6 +12,7 @@
 package org.eclipse.papyrus.dd.di;
 
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Shape.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Shape.java
index eabd79dafc2..d86c1c4f7fd 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Shape.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Shape.java
@@ -53,7 +53,7 @@ public interface Shape extends DiagramElement {
 	 * end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Bounds</em>' containment reference.
+	 *        the new value of the '<em>Bounds</em>' containment reference.
 	 * @see #getBounds()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIFactoryImpl.java
index 9dd9068e12a..2c5c2ee18b1 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIFactoryImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIFactoryImpl.java
@@ -14,10 +14,12 @@ package org.eclipse.papyrus.dd.di.impl;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.dd.di.DIFactory;
-import org.eclipse.papyrus.dd.di.DIPackage;
+
+import org.eclipse.papyrus.dd.di.*;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
@@ -36,8 +38,8 @@ public class DIFactoryImpl extends EFactoryImpl implements DIFactory {
 	 */
 	public static DIFactory init() {
 		try {
-			DIFactory theDIFactory = (DIFactory) EPackage.Registry.INSTANCE.getEFactory(DIPackage.eNS_URI);
-			if (theDIFactory != null) {
+			DIFactory theDIFactory = (DIFactory)EPackage.Registry.INSTANCE.getEFactory(DIPackage.eNS_URI);
+			if(theDIFactory != null) {
 				return theDIFactory;
 			}
 		} catch (Exception exception) {
@@ -64,7 +66,7 @@ public class DIFactoryImpl extends EFactoryImpl implements DIFactory {
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
+		switch(eClass.getClassifierID()) {
 		default:
 			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -77,7 +79,7 @@ public class DIFactoryImpl extends EFactoryImpl implements DIFactory {
 	 */
 	@Override
 	public DIPackage getDIPackage() {
-		return (DIPackage) getEPackage();
+		return (DIPackage)getEPackage();
 	}
 
 	/**
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIPackageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIPackageImpl.java
index 7413a42d4ca..c08b7750861 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIPackageImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIPackageImpl.java
@@ -16,8 +16,11 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
+
 import org.eclipse.emf.ecore.impl.EPackageImpl;
+
 import org.eclipse.papyrus.dd.dc.DCPackage;
+
 import org.eclipse.papyrus.dd.di.DIFactory;
 import org.eclipse.papyrus.dd.di.DIPackage;
 import org.eclipse.papyrus.dd.di.Diagram;
@@ -73,7 +76,8 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
 	 * package package URI value.
 	 * <p>
-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.dd.di.DIPackage#eNS_URI
@@ -96,7 +100,8 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 * and for any others upon which it depends.
 	 *
 	 * <p>
-	 * This method is used to initialize {@link DIPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * This method is used to initialize {@link DIPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they
+	 * should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
@@ -104,11 +109,11 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 * @generated
 	 */
 	public static DIPackage init() {
-		if (isInited) {
-			return (DIPackage) EPackage.Registry.INSTANCE.getEPackage(DIPackage.eNS_URI);
+		if(isInited) {
+			return (DIPackage)EPackage.Registry.INSTANCE.getEPackage(DIPackage.eNS_URI);
 		}
 		// Obtain or create and register package
-		DIPackageImpl theDIPackage = (DIPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DIPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DIPackageImpl());
+		DIPackageImpl theDIPackage = (DIPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DIPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DIPackageImpl());
 		isInited = true;
 		// Initialize simple dependencies
 		DCPackage.eINSTANCE.eClass();
@@ -141,7 +146,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 */
 	@Override
 	public EReference getDiagramElement_ModelElement() {
-		return (EReference) diagramElementEClass.getEStructuralFeatures().get(0);
+		return (EReference)diagramElementEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -152,7 +157,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 */
 	@Override
 	public EReference getDiagramElement_OwningDiagramElement() {
-		return (EReference) diagramElementEClass.getEStructuralFeatures().get(1);
+		return (EReference)diagramElementEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -163,7 +168,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 */
 	@Override
 	public EReference getDiagramElement_OwnedDiagramElement() {
-		return (EReference) diagramElementEClass.getEStructuralFeatures().get(2);
+		return (EReference)diagramElementEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -173,7 +178,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 */
 	@Override
 	public EReference getDiagramElement_LocalStyle() {
-		return (EReference) diagramElementEClass.getEStructuralFeatures().get(3);
+		return (EReference)diagramElementEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -183,7 +188,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 */
 	@Override
 	public EReference getDiagramElement_SharedStyle() {
-		return (EReference) diagramElementEClass.getEStructuralFeatures().get(4);
+		return (EReference)diagramElementEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -194,7 +199,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 */
 	@Override
 	public EReference getDiagramElement_TargetEdge() {
-		return (EReference) diagramElementEClass.getEStructuralFeatures().get(5);
+		return (EReference)diagramElementEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -205,7 +210,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 */
 	@Override
 	public EReference getDiagramElement_SourceEdge() {
-		return (EReference) diagramElementEClass.getEStructuralFeatures().get(6);
+		return (EReference)diagramElementEClass.getEStructuralFeatures().get(6);
 	}
 
 	/**
@@ -236,7 +241,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 */
 	@Override
 	public EReference getEdge_SourceDiagramElement() {
-		return (EReference) edgeEClass.getEStructuralFeatures().get(0);
+		return (EReference)edgeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -246,7 +251,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 */
 	@Override
 	public EReference getEdge_Waypoint() {
-		return (EReference) edgeEClass.getEStructuralFeatures().get(1);
+		return (EReference)edgeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -257,7 +262,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 */
 	@Override
 	public EReference getEdge_TargetDiagramElement() {
-		return (EReference) edgeEClass.getEStructuralFeatures().get(2);
+		return (EReference)edgeEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -277,7 +282,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 */
 	@Override
 	public EAttribute getDiagram_Name() {
-		return (EAttribute) diagramEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)diagramEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -287,7 +292,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 */
 	@Override
 	public EAttribute getDiagram_Documentation() {
-		return (EAttribute) diagramEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)diagramEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -297,7 +302,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 */
 	@Override
 	public EAttribute getDiagram_Resolution() {
-		return (EAttribute) diagramEClass.getEStructuralFeatures().get(2);
+		return (EAttribute)diagramEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -317,7 +322,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 */
 	@Override
 	public EReference getShape_Bounds() {
-		return (EReference) shapeEClass.getEStructuralFeatures().get(0);
+		return (EReference)shapeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -327,7 +332,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 */
 	@Override
 	public DIFactory getDIFactory() {
-		return (DIFactory) getEFactoryInstance();
+		return (DIFactory)getEFactoryInstance();
 	}
 
 	/**
@@ -346,7 +351,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) {
+		if(isCreated) {
 			return;
 		}
 		isCreated = true;
@@ -387,7 +392,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) {
+		if(isInitialized) {
 			return;
 		}
 		isInitialized = true;
@@ -396,8 +401,8 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 		setNsPrefix(eNS_PREFIX);
 		setNsURI(eNS_URI);
 		// Obtain other dependent packages
-		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-		DCPackage theDCPackage = (DCPackage) EPackage.Registry.INSTANCE.getEPackage(DCPackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+		DCPackage theDCPackage = (DCPackage)EPackage.Registry.INSTANCE.getEPackage(DCPackage.eNS_URI);
 		// Create type parameters
 		// Set bounds for type parameters
 		// Add supertypes to classes
@@ -406,25 +411,18 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 		shapeEClass.getESuperTypes().add(this.getDiagramElement());
 		// Initialize classes, features, and operations; add parameters
 		initEClass(diagramElementEClass, DiagramElement.class, "DiagramElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDiagramElement_ModelElement(), theEcorePackage.getEObject(), null, "modelElement", null, 0, -1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-				IS_DERIVED, IS_ORDERED);
-		initEReference(getDiagramElement_OwningDiagramElement(), this.getDiagramElement(), this.getDiagramElement_OwnedDiagramElement(), "owningDiagramElement", null, 0, 1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE,
-				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
-		initEReference(getDiagramElement_OwnedDiagramElement(), this.getDiagramElement(), this.getDiagramElement_OwningDiagramElement(), "ownedDiagramElement", null, 0, -1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE,
-				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+		initEReference(getDiagramElement_ModelElement(), theEcorePackage.getEObject(), null, "modelElement", null, 0, -1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+		initEReference(getDiagramElement_OwningDiagramElement(), this.getDiagramElement(), this.getDiagramElement_OwnedDiagramElement(), "owningDiagramElement", null, 0, 1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
+		initEReference(getDiagramElement_OwnedDiagramElement(), this.getDiagramElement(), this.getDiagramElement_OwningDiagramElement(), "ownedDiagramElement", null, 0, -1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 		initEReference(getDiagramElement_LocalStyle(), this.getStyle(), null, "localStyle", null, 0, 1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
 		initEReference(getDiagramElement_SharedStyle(), this.getStyle(), null, "sharedStyle", null, 0, 1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
-		initEReference(getDiagramElement_TargetEdge(), this.getEdge(), this.getEdge_TargetDiagramElement(), "targetEdge", null, 0, -1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-				IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getDiagramElement_SourceEdge(), this.getEdge(), this.getEdge_SourceDiagramElement(), "sourceEdge", null, 0, -1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-				IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+		initEReference(getDiagramElement_TargetEdge(), this.getEdge(), this.getEdge_TargetDiagramElement(), "targetEdge", null, 0, -1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+		initEReference(getDiagramElement_SourceEdge(), this.getEdge(), this.getEdge_SourceDiagramElement(), "sourceEdge", null, 0, -1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 		initEClass(styleEClass, Style.class, "Style", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(edgeEClass, Edge.class, "Edge", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getEdge_SourceDiagramElement(), this.getDiagramElement(), this.getDiagramElement_SourceEdge(), "sourceDiagramElement", null, 1, 1, Edge.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-				IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
+		initEReference(getEdge_SourceDiagramElement(), this.getDiagramElement(), this.getDiagramElement_SourceEdge(), "sourceDiagramElement", null, 1, 1, Edge.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
 		initEReference(getEdge_Waypoint(), theDCPackage.getPoint(), null, "waypoint", null, 0, -1, Edge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEdge_TargetDiagramElement(), this.getDiagramElement(), this.getDiagramElement_TargetEdge(), "targetDiagramElement", null, 1, 1, Edge.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-				IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
+		initEReference(getEdge_TargetDiagramElement(), this.getDiagramElement(), this.getDiagramElement_TargetEdge(), "targetDiagramElement", null, 1, 1, Edge.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
 		initEClass(diagramEClass, Diagram.class, "Diagram", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getDiagram_Name(), theDCPackage.getString(), "name", "", 1, 1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getDiagram_Documentation(), theDCPackage.getString(), "documentation", "", 1, 1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
@@ -447,14 +445,14 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 */
 	protected void createUnionAnnotations() {
 		String source = "union";
-		addAnnotation(getDiagramElement_ModelElement(), source, new String[] {});
-		addAnnotation(getDiagramElement_OwningDiagramElement(), source, new String[] {});
-		addAnnotation(getDiagramElement_OwnedDiagramElement(), source, new String[] {});
-		addAnnotation(getDiagramElement_LocalStyle(), source, new String[] {});
-		addAnnotation(getDiagramElement_SharedStyle(), source, new String[] {});
-		addAnnotation(getDiagramElement_TargetEdge(), source, new String[] {});
-		addAnnotation(getDiagramElement_SourceEdge(), source, new String[] {});
-		addAnnotation(getEdge_SourceDiagramElement(), source, new String[] {});
-		addAnnotation(getEdge_TargetDiagramElement(), source, new String[] {});
+		addAnnotation(getDiagramElement_ModelElement(), source, new String[]{});
+		addAnnotation(getDiagramElement_OwningDiagramElement(), source, new String[]{});
+		addAnnotation(getDiagramElement_OwnedDiagramElement(), source, new String[]{});
+		addAnnotation(getDiagramElement_LocalStyle(), source, new String[]{});
+		addAnnotation(getDiagramElement_SharedStyle(), source, new String[]{});
+		addAnnotation(getDiagramElement_TargetEdge(), source, new String[]{});
+		addAnnotation(getDiagramElement_SourceEdge(), source, new String[]{});
+		addAnnotation(getEdge_SourceDiagramElement(), source, new String[]{});
+		addAnnotation(getEdge_TargetDiagramElement(), source, new String[]{});
 	}
 } // DIPackageImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramElementImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramElementImpl.java
index 1e903f643d1..ad7897bb955 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramElementImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramElementImpl.java
@@ -79,7 +79,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container im
 	@Override
 	public DiagramElement getOwningDiagramElement() {
 		DiagramElement owningDiagramElement = basicGetOwningDiagramElement();
-		return owningDiagramElement != null && owningDiagramElement.eIsProxy() ? (DiagramElement) eResolveProxy((InternalEObject) owningDiagramElement) : owningDiagramElement;
+		return owningDiagramElement != null && owningDiagramElement.eIsProxy() ? (DiagramElement)eResolveProxy((InternalEObject)owningDiagramElement) : owningDiagramElement;
 	}
 
 	/**
@@ -133,7 +133,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container im
 	@Override
 	public Style getLocalStyle() {
 		Style localStyle = basicGetLocalStyle();
-		return localStyle != null && localStyle.eIsProxy() ? (Style) eResolveProxy((InternalEObject) localStyle) : localStyle;
+		return localStyle != null && localStyle.eIsProxy() ? (Style)eResolveProxy((InternalEObject)localStyle) : localStyle;
 	}
 
 	/**
@@ -154,7 +154,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container im
 	@Override
 	public Style getSharedStyle() {
 		Style sharedStyle = basicGetSharedStyle();
-		return sharedStyle != null && sharedStyle.eIsProxy() ? (Style) eResolveProxy((InternalEObject) sharedStyle) : sharedStyle;
+		return sharedStyle != null && sharedStyle.eIsProxy() ? (Style)eResolveProxy((InternalEObject)sharedStyle) : sharedStyle;
 	}
 
 	/**
@@ -173,23 +173,23 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container im
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DIPackage.DIAGRAM_ELEMENT__MODEL_ELEMENT:
 			return getModelElement();
 		case DIPackage.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT:
-			if (resolve) {
+			if(resolve) {
 				return getOwningDiagramElement();
 			}
 			return basicGetOwningDiagramElement();
 		case DIPackage.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT:
 			return getOwnedDiagramElement();
 		case DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE:
-			if (resolve) {
+			if(resolve) {
 				return getLocalStyle();
 			}
 			return basicGetLocalStyle();
 		case DIPackage.DIAGRAM_ELEMENT__SHARED_STYLE:
-			if (resolve) {
+			if(resolve) {
 				return getSharedStyle();
 			}
 			return basicGetSharedStyle();
@@ -208,7 +208,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container im
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DIPackage.DIAGRAM_ELEMENT__MODEL_ELEMENT:
 			return isSetModelElement();
 		case DIPackage.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramImpl.java
index e75d6823f26..db2a9cb98f8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramImpl.java
@@ -12,8 +12,11 @@
 package org.eclipse.papyrus.dd.di.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.di.DIPackage;
 import org.eclipse.papyrus.dd.di.Diagram;
 
@@ -132,7 +135,7 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DIPackage.DIAGRAM__NAME, oldName, name));
 		}
 	}
@@ -156,7 +159,7 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	public void setDocumentation(String newDocumentation) {
 		String oldDocumentation = documentation;
 		documentation = newDocumentation;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DIPackage.DIAGRAM__DOCUMENTATION, oldDocumentation, documentation));
 		}
 	}
@@ -180,7 +183,7 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	public void setResolution(double newResolution) {
 		double oldResolution = resolution;
 		resolution = newResolution;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DIPackage.DIAGRAM__RESOLUTION, oldResolution, resolution));
 		}
 	}
@@ -192,7 +195,7 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DIPackage.DIAGRAM__NAME:
 			return getName();
 		case DIPackage.DIAGRAM__DOCUMENTATION:
@@ -210,15 +213,15 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DIPackage.DIAGRAM__NAME:
-			setName((String) newValue);
+			setName((String)newValue);
 			return;
 		case DIPackage.DIAGRAM__DOCUMENTATION:
-			setDocumentation((String) newValue);
+			setDocumentation((String)newValue);
 			return;
 		case DIPackage.DIAGRAM__RESOLUTION:
-			setResolution((Double) newValue);
+			setResolution((Double)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -231,7 +234,7 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DIPackage.DIAGRAM__NAME:
 			setName(NAME_EDEFAULT);
 			return;
@@ -252,7 +255,7 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DIPackage.DIAGRAM__NAME:
 			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 		case DIPackage.DIAGRAM__DOCUMENTATION:
@@ -270,7 +273,7 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/EdgeImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/EdgeImpl.java
index 7cbbdd85dbd..d61b2400518 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/EdgeImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/EdgeImpl.java
@@ -12,7 +12,6 @@
 package org.eclipse.papyrus.dd.di.impl;
 
 import java.util.Collection;
-
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -77,7 +76,7 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 	@Override
 	public DiagramElement getSourceDiagramElement() {
 		DiagramElement sourceDiagramElement = basicGetSourceDiagramElement();
-		return sourceDiagramElement != null && sourceDiagramElement.eIsProxy() ? (DiagramElement) eResolveProxy((InternalEObject) sourceDiagramElement) : sourceDiagramElement;
+		return sourceDiagramElement != null && sourceDiagramElement.eIsProxy() ? (DiagramElement)eResolveProxy((InternalEObject)sourceDiagramElement) : sourceDiagramElement;
 	}
 
 	/**
@@ -99,7 +98,7 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 	@Override
 	public DiagramElement getTargetDiagramElement() {
 		DiagramElement targetDiagramElement = basicGetTargetDiagramElement();
-		return targetDiagramElement != null && targetDiagramElement.eIsProxy() ? (DiagramElement) eResolveProxy((InternalEObject) targetDiagramElement) : targetDiagramElement;
+		return targetDiagramElement != null && targetDiagramElement.eIsProxy() ? (DiagramElement)eResolveProxy((InternalEObject)targetDiagramElement) : targetDiagramElement;
 	}
 
 	/**
@@ -119,7 +118,7 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 	 */
 	@Override
 	public EList<Point> getWaypoint() {
-		if (waypoint == null) {
+		if(waypoint == null) {
 			waypoint = new EObjectContainmentEList<Point>(Point.class, this, DIPackage.EDGE__WAYPOINT);
 		}
 		return waypoint;
@@ -132,9 +131,9 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DIPackage.EDGE__WAYPOINT:
-			return ((InternalEList<?>) getWaypoint()).basicRemove(otherEnd, msgs);
+			return ((InternalEList<?>)getWaypoint()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -146,14 +145,14 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DIPackage.EDGE__SOURCE_DIAGRAM_ELEMENT:
-			if (resolve) {
+			if(resolve) {
 				return getSourceDiagramElement();
 			}
 			return basicGetSourceDiagramElement();
 		case DIPackage.EDGE__TARGET_DIAGRAM_ELEMENT:
-			if (resolve) {
+			if(resolve) {
 				return getTargetDiagramElement();
 			}
 			return basicGetTargetDiagramElement();
@@ -171,10 +170,10 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DIPackage.EDGE__WAYPOINT:
 			getWaypoint().clear();
-			getWaypoint().addAll((Collection<? extends Point>) newValue);
+			getWaypoint().addAll((Collection<? extends Point>)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -187,7 +186,7 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DIPackage.EDGE__WAYPOINT:
 			getWaypoint().clear();
 			return;
@@ -202,7 +201,7 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DIPackage.EDGE__SOURCE_DIAGRAM_ELEMENT:
 			return isSetSourceDiagramElement();
 		case DIPackage.EDGE__TARGET_DIAGRAM_ELEMENT:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/ShapeImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/ShapeImpl.java
index 9e6488f009c..4519a77f30f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/ShapeImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/ShapeImpl.java
@@ -13,10 +13,14 @@ package org.eclipse.papyrus.dd.di.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.dc.Bounds;
+
 import org.eclipse.papyrus.dd.di.DIPackage;
 import org.eclipse.papyrus.dd.di.Shape;
 
@@ -80,9 +84,9 @@ public abstract class ShapeImpl extends DiagramElementImpl implements Shape {
 	public NotificationChain basicSetBounds(Bounds newBounds, NotificationChain msgs) {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DIPackage.SHAPE__BOUNDS, oldBounds, newBounds);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -98,19 +102,19 @@ public abstract class ShapeImpl extends DiagramElementImpl implements Shape {
 	 */
 	@Override
 	public void setBounds(Bounds newBounds) {
-		if (newBounds != bounds) {
+		if(newBounds != bounds) {
 			NotificationChain msgs = null;
-			if (bounds != null) {
-				msgs = ((InternalEObject) bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DIPackage.SHAPE__BOUNDS, null, msgs);
+			if(bounds != null) {
+				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DIPackage.SHAPE__BOUNDS, null, msgs);
 			}
-			if (newBounds != null) {
-				msgs = ((InternalEObject) newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DIPackage.SHAPE__BOUNDS, null, msgs);
+			if(newBounds != null) {
+				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DIPackage.SHAPE__BOUNDS, null, msgs);
 			}
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, DIPackage.SHAPE__BOUNDS, newBounds, newBounds));
 		}
 	}
@@ -122,7 +126,7 @@ public abstract class ShapeImpl extends DiagramElementImpl implements Shape {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case DIPackage.SHAPE__BOUNDS:
 			return basicSetBounds(null, msgs);
 		}
@@ -136,7 +140,7 @@ public abstract class ShapeImpl extends DiagramElementImpl implements Shape {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case DIPackage.SHAPE__BOUNDS:
 			return getBounds();
 		}
@@ -150,9 +154,9 @@ public abstract class ShapeImpl extends DiagramElementImpl implements Shape {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case DIPackage.SHAPE__BOUNDS:
-			setBounds((Bounds) newValue);
+			setBounds((Bounds)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -165,9 +169,9 @@ public abstract class ShapeImpl extends DiagramElementImpl implements Shape {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DIPackage.SHAPE__BOUNDS:
-			setBounds((Bounds) null);
+			setBounds((Bounds)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -180,7 +184,7 @@ public abstract class ShapeImpl extends DiagramElementImpl implements Shape {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case DIPackage.SHAPE__BOUNDS:
 			return bounds != null;
 		}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/StyleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/StyleImpl.java
index dbfcafa602a..803a29ef2a8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/StyleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/StyleImpl.java
@@ -12,7 +12,9 @@
 package org.eclipse.papyrus.dd.di.impl;
 
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.papyrus.dd.di.DIPackage;
 import org.eclipse.papyrus.dd.di.Style;
 
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIAdapterFactory.java
index 04e000b8081..662e1a368ca 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIAdapterFactory.java
@@ -13,14 +13,12 @@ package org.eclipse.papyrus.dd.di.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
+
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.dd.di.DIPackage;
-import org.eclipse.papyrus.dd.di.Diagram;
-import org.eclipse.papyrus.dd.di.DiagramElement;
-import org.eclipse.papyrus.dd.di.Edge;
-import org.eclipse.papyrus.dd.di.Shape;
-import org.eclipse.papyrus.dd.di.Style;
+
+import org.eclipse.papyrus.dd.di.*;
 
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
@@ -48,7 +46,7 @@ public class DIAdapterFactory extends AdapterFactoryImpl {
 	 * @generated
 	 */
 	public DIAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = DIPackage.eINSTANCE;
 		}
 	}
@@ -64,11 +62,11 @@ public class DIAdapterFactory extends AdapterFactoryImpl {
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
+		if(object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
 	}
@@ -118,13 +116,13 @@ public class DIAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param target
-	 *            the object to adapt.
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
 	@Override
 	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject) target);
+		return modelSwitch.doSwitch((EObject)target);
 	}
 
 	/**
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIDerivedUnionAdapter.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIDerivedUnionAdapter.java
index 52ff162a923..3079eeae982 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIDerivedUnionAdapter.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIDerivedUnionAdapter.java
@@ -12,10 +12,13 @@
 package org.eclipse.papyrus.dd.di.util;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.notify.impl.AdapterImpl;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.papyrus.dd.di.DIPackage;
 import org.eclipse.papyrus.dd.di.Diagram;
 import org.eclipse.papyrus.dd.di.Edge;
@@ -48,7 +51,7 @@ public class DIDerivedUnionAdapter extends AdapterImpl {
 	 * @generated
 	 */
 	public DIDerivedUnionAdapter() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = DIPackage.eINSTANCE;
 		}
 	}
@@ -59,15 +62,15 @@ public class DIDerivedUnionAdapter extends AdapterImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param notification
-	 *            a description of the change.
+	 *        a description of the change.
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		Object notifier = notification.getNotifier();
-		if (notifier instanceof EObject) {
-			EClass eClass = ((EObject) notifier).eClass();
-			if (eClass.eContainer() == modelPackage) {
+		if(notifier instanceof EObject) {
+			EClass eClass = ((EObject)notifier).eClass();
+			if(eClass.eContainer() == modelPackage) {
 				notifyChanged(notification, eClass);
 			}
 		}
@@ -79,13 +82,13 @@ public class DIDerivedUnionAdapter extends AdapterImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param notification
-	 *            a description of the change.
+	 *        a description of the change.
 	 * @param eClass
-	 *            the Ecore class of the notifier.
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyChanged(Notification notification, EClass eClass) {
-		switch (eClass.getClassifierID()) {
+		switch(eClass.getClassifierID()) {
 		case DIPackage.EDGE:
 			notifyEdgeChanged(notification, eClass);
 			break;
@@ -104,11 +107,11 @@ public class DIDerivedUnionAdapter extends AdapterImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param notification
-	 *            a description of the change.
+	 *        a description of the change.
 	 * @param eClass
-	 *            the Ecore class of the notifier.
+	 *        the Ecore class of the notifier.
 	 * @param derivedUnion
-	 *            the derived union affected by the change.
+	 *        the derived union affected by the change.
 	 * @generated
 	 */
 	public void notifyChanged(Notification notification, EClass eClass, EStructuralFeature derivedUnion) {
@@ -121,13 +124,13 @@ public class DIDerivedUnionAdapter extends AdapterImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param notification
-	 *            a description of the change.
+	 *        a description of the change.
 	 * @param eClass
-	 *            the Ecore class of the notifier.
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyEdgeChanged(Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(Edge.class)) {
+		switch(notification.getFeatureID(Edge.class)) {
 		}
 	}
 
@@ -137,13 +140,13 @@ public class DIDerivedUnionAdapter extends AdapterImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param notification
-	 *            a description of the change.
+	 *        a description of the change.
 	 * @param eClass
-	 *            the Ecore class of the notifier.
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyDiagramChanged(Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(Diagram.class)) {
+		switch(notification.getFeatureID(Diagram.class)) {
 		}
 	}
 
@@ -153,13 +156,13 @@ public class DIDerivedUnionAdapter extends AdapterImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param notification
-	 *            a description of the change.
+	 *        a description of the change.
 	 * @param eClass
-	 *            the Ecore class of the notifier.
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyShapeChanged(Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(Shape.class)) {
+		switch(notification.getFeatureID(Shape.class)) {
 		}
 	}
-} // DIDerivedUnionAdapter
+} //DIDerivedUnionAdapter
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DISwitch.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DISwitch.java
index 027fbe0a4d6..cf938641c79 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DISwitch.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DISwitch.java
@@ -13,13 +13,10 @@ package org.eclipse.papyrus.dd.di.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.dd.di.DIPackage;
-import org.eclipse.papyrus.dd.di.Diagram;
-import org.eclipse.papyrus.dd.di.DiagramElement;
-import org.eclipse.papyrus.dd.di.Edge;
-import org.eclipse.papyrus.dd.di.Shape;
-import org.eclipse.papyrus.dd.di.Style;
+
+import org.eclipse.papyrus.dd.di.*;
 
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
@@ -49,7 +46,7 @@ public class DISwitch<T> extends Switch<T> {
 	 * @generated
 	 */
 	public DISwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = DIPackage.eINSTANCE;
 		}
 	}
@@ -77,55 +74,60 @@ public class DISwitch<T> extends Switch<T> {
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-		case DIPackage.DIAGRAM_ELEMENT: {
-			DiagramElement diagramElement = (DiagramElement) theEObject;
+		switch(classifierID) {
+		case DIPackage.DIAGRAM_ELEMENT:
+		{
+			DiagramElement diagramElement = (DiagramElement)theEObject;
 			T result = caseDiagramElement(diagramElement);
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DIPackage.STYLE: {
-			Style style = (Style) theEObject;
+		case DIPackage.STYLE:
+		{
+			Style style = (Style)theEObject;
 			T result = caseStyle(style);
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DIPackage.EDGE: {
-			Edge edge = (Edge) theEObject;
+		case DIPackage.EDGE:
+		{
+			Edge edge = (Edge)theEObject;
 			T result = caseEdge(edge);
-			if (result == null) {
+			if(result == null) {
 				result = caseDiagramElement(edge);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DIPackage.DIAGRAM: {
-			Diagram diagram = (Diagram) theEObject;
+		case DIPackage.DIAGRAM:
+		{
+			Diagram diagram = (Diagram)theEObject;
 			T result = caseDiagram(diagram);
-			if (result == null) {
+			if(result == null) {
 				result = caseShape(diagram);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDiagramElement(diagram);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case DIPackage.SHAPE: {
-			Shape shape = (Shape) theEObject;
+		case DIPackage.SHAPE:
+		{
+			Shape shape = (Shape)theEObject;
 			T result = caseShape(shape);
-			if (result == null) {
+			if(result == null) {
 				result = caseDiagramElement(shape);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
@@ -142,7 +144,7 @@ public class DISwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Diagram Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -158,7 +160,7 @@ public class DISwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -173,7 +175,7 @@ public class DISwitch<T> extends Switch<T> {
 	 * -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of ' <em>Edge</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -189,7 +191,7 @@ public class DISwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Diagram</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -205,7 +207,7 @@ public class DISwitch<T> extends Switch<T> {
 	 * end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Shape</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -221,7 +223,7 @@ public class DISwitch<T> extends Switch<T> {
 	 * the last case anyway. <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.settings/org.eclipse.jdt.core.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..e5766923962
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,281 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0
+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=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0
+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=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+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=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=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=false
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
+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=150
+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=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+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_at_end_of_file_if_missing=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=do not 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_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_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=do not 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=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not 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=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not 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=do not 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=true
+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=200
+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=0
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
+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/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..b5f980cae55
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+formatter_profile=_Zero blank Papyrus Formatter Profile CDM
+formatter_settings_version=12
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/META-INF/MANIFEST.MF b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/META-INF/MANIFEST.MF
index 0ce043ff8f7..a944f0f686e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/META-INF/MANIFEST.MF
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/META-INF/MANIFEST.MF
@@ -1,25 +1,23 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.umldi.provider

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

- org.eclipse.papyrus.umldi;bundle-version="1.0.1";visibility:=reexport,

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

- org.eclipse.papyrus.dd;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.papyrus.dd.edit;bundle-version="1.0.1";visibility:=reexport,

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

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

- org.eclipse.uml2.types;visibility:=reexport,

- org.eclipse.uml2.uml;visibility:=reexport,

- org.eclipse.uml2.uml.edit;visibility:=reexport,

- org.eclipse.uml2.common.edit;visibility:=reexport

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.umldi.provider.UMLDIEditPlugin$I

- mplementation

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

-

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.umldi.edit;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.umldi.provider.UMLDIEditPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: org.eclipse.papyrus.umldi.provider
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.umldi;visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.eclipse.papyrus.dd;visibility:=reexport,
+ org.eclipse.papyrus.dd.edit;visibility:=reexport,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.uml2.types;visibility:=reexport,
+ org.eclipse.uml2.uml;visibility:=reexport,
+ org.eclipse.uml2.uml.edit;visibility:=reexport,
+ org.eclipse.uml2.common.edit;visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/plugin.properties b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/plugin.properties
index 902999c8b1c..1bf81732984 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/plugin.properties
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/plugin.properties
@@ -49,3 +49,9 @@ _UI_UmlLabel_kind_feature = Kind
 _UI_UmlCompartmentKind_attributes_literal = attributes
 _UI_UmlCompartmentKind_operations_literal = operations
 _UI_UmlLabelKind_name_literal = name
+<<<<<<< HEAD
+_UI_UmlDiagram_kind_feature = Kind
+_UI_UmlDiagramKind_class_literal = class
+_UI_UmlLabelKind_multiplicity_literal = multiplicity
+=======
+>>>>>>> branch 'master' of ssh://melaasar6nr@git.eclipse.org:29418/papyrus/org.eclipse.papyrus
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java
index 90db262bd2c..25c42430892 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java
@@ -12,9 +12,13 @@
 package org.eclipse.papyrus.umldi.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
+
 import org.eclipse.papyrus.dd.edit.DDEditPlugin;
+
 import org.eclipse.uml2.uml.edit.UMLEditPlugin;
 
 /**
@@ -52,7 +56,7 @@ public final class UMLDIEditPlugin extends EMFPlugin {
 	 * @generated
 	 */
 	public UMLDIEditPlugin() {
-		super(new ResourceLocator[] { DDEditPlugin.INSTANCE, EcoreEditPlugin.INSTANCE, UMLEditPlugin.INSTANCE, });
+		super(new ResourceLocator[]{ DDEditPlugin.INSTANCE, EcoreEditPlugin.INSTANCE, UMLEditPlugin.INSTANCE, });
 	}
 
 	/**
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java
index 9e5aa771bb9..eb6ba7791b0 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java
@@ -17,6 +17,7 @@ import java.util.Collection;
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.Notifier;
+
 import org.eclipse.emf.edit.provider.ChangeNotifier;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -30,6 +31,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
 import org.eclipse.papyrus.umldi.util.UMLDIAdapterFactory;
 
 /**
@@ -106,7 +108,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 */
 	@Override
 	public Adapter createUmlDiagramAdapter() {
-		if (umlDiagramItemProvider == null) {
+		if(umlDiagramItemProvider == null) {
 			umlDiagramItemProvider = new UmlDiagramItemProvider(this);
 		}
 		return umlDiagramItemProvider;
@@ -130,7 +132,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 */
 	@Override
 	public Adapter createUmlShapeAdapter() {
-		if (umlShapeItemProvider == null) {
+		if(umlShapeItemProvider == null) {
 			umlShapeItemProvider = new UmlShapeItemProvider(this);
 		}
 		return umlShapeItemProvider;
@@ -154,7 +156,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 */
 	@Override
 	public Adapter createUmlStyleAdapter() {
-		if (umlStyleItemProvider == null) {
+		if(umlStyleItemProvider == null) {
 			umlStyleItemProvider = new UmlStyleItemProvider(this);
 		}
 		return umlStyleItemProvider;
@@ -178,7 +180,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 */
 	@Override
 	public Adapter createUmlEdgeAdapter() {
-		if (umlEdgeItemProvider == null) {
+		if(umlEdgeItemProvider == null) {
 			umlEdgeItemProvider = new UmlEdgeItemProvider(this);
 		}
 		return umlEdgeItemProvider;
@@ -202,7 +204,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 */
 	@Override
 	public Adapter createUmlCompartmentAdapter() {
-		if (umlCompartmentItemProvider == null) {
+		if(umlCompartmentItemProvider == null) {
 			umlCompartmentItemProvider = new UmlCompartmentItemProvider(this);
 		}
 		return umlCompartmentItemProvider;
@@ -226,7 +228,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 */
 	@Override
 	public Adapter createUmlLabelAdapter() {
-		if (umlLabelItemProvider == null) {
+		if(umlLabelItemProvider == null) {
 			umlLabelItemProvider = new UmlLabelItemProvider(this);
 		}
 		return umlLabelItemProvider;
@@ -287,9 +289,9 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 */
 	@Override
 	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
+		if(isFactoryForType(type)) {
 			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
+			if(!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
@@ -330,7 +332,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	@Override
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
-		if (parentAdapterFactory != null) {
+		if(parentAdapterFactory != null) {
 			parentAdapterFactory.fireNotifyChanged(notification);
 		}
 	}
@@ -344,22 +346,22 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 */
 	@Override
 	public void dispose() {
-		if (umlDiagramItemProvider != null) {
+		if(umlDiagramItemProvider != null) {
 			umlDiagramItemProvider.dispose();
 		}
-		if (umlShapeItemProvider != null) {
-			umlShapeItemProvider.dispose();
-		}
-		if (umlStyleItemProvider != null) {
+		if(umlStyleItemProvider != null) {
 			umlStyleItemProvider.dispose();
 		}
-		if (umlEdgeItemProvider != null) {
+		if(umlEdgeItemProvider != null) {
 			umlEdgeItemProvider.dispose();
 		}
-		if (umlCompartmentItemProvider != null) {
+		if(umlShapeItemProvider != null) {
+			umlShapeItemProvider.dispose();
+		}
+		if(umlCompartmentItemProvider != null) {
 			umlCompartmentItemProvider.dispose();
 		}
-		if (umlLabelItemProvider != null) {
+		if(umlLabelItemProvider != null) {
 			umlLabelItemProvider.dispose();
 		}
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java
index 95736568985..bf93b4bc9c4 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java
@@ -13,9 +13,9 @@ package org.eclipse.papyrus.umldi.provider;
 
 import java.util.Collection;
 import java.util.List;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -27,6 +27,8 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.dd.dc.DCFactory;
+import org.eclipse.papyrus.dd.di.DIPackage;
 import org.eclipse.papyrus.umldi.UMLDIPackage;
 import org.eclipse.papyrus.umldi.UmlCompartment;
 import org.eclipse.papyrus.umldi.UmlCompartmentKind;
@@ -38,7 +40,7 @@ import org.eclipse.papyrus.umldi.UmlCompartmentKind;
  *
  * @generated
  */
-public class UmlCompartmentItemProvider extends UmlShapeItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+public class UmlCompartmentItemProvider extends UmlDiagramElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
 
 	/**
 	 * This constructs an instance from a factory and a notifier.
@@ -60,7 +62,7 @@ public class UmlCompartmentItemProvider extends UmlShapeItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addKindPropertyDescriptor(object);
 		}
@@ -75,8 +77,38 @@ public class UmlCompartmentItemProvider extends UmlShapeItemProvider implements
 	 * @generated
 	 */
 	protected void addKindPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlCompartment_kind_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_UmlCompartment_kind_feature", "_UI_UmlCompartment_type"), UMLDIPackage.Literals.UML_COMPARTMENT__KIND, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlCompartment_kind_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlCompartment_kind_feature", "_UI_UmlCompartment_type"), UMLDIPackage.Literals.UML_COMPARTMENT__KIND, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(DIPackage.Literals.SHAPE__BOUNDS);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+		return super.getChildFeature(object, child);
 	}
 
 	/**
@@ -100,7 +132,7 @@ public class UmlCompartmentItemProvider extends UmlShapeItemProvider implements
 	 */
 	@Override
 	public String getText(Object object) {
-		UmlCompartmentKind labelValue = ((UmlCompartment) object).getKind();
+		UmlCompartmentKind labelValue = ((UmlCompartment)object).getKind();
 		String label = labelValue == null ? null : labelValue.toString();
 		return label == null || label.length() == 0 ? getString("_UI_UmlCompartment_type") : getString("_UI_UmlCompartment_type") + " " + label;
 	}
@@ -116,10 +148,13 @@ public class UmlCompartmentItemProvider extends UmlShapeItemProvider implements
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(UmlCompartment.class)) {
+		switch(notification.getFeatureID(UmlCompartment.class)) {
 		case UMLDIPackage.UML_COMPARTMENT__KIND:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
+		case UMLDIPackage.UML_COMPARTMENT__BOUNDS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -135,5 +170,6 @@ public class UmlCompartmentItemProvider extends UmlShapeItemProvider implements
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
+		newChildDescriptors.add(createChildParameter(DIPackage.Literals.SHAPE__BOUNDS, DCFactory.eINSTANCE.createBounds()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java
index fdf31cf39aa..a9270c8a784 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java
@@ -16,8 +16,11 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -28,7 +31,9 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.di.provider.DiagramElementItemProvider;
+
 import org.eclipse.papyrus.umldi.UMLDIFactory;
 import org.eclipse.papyrus.umldi.UMLDIPackage;
 import org.eclipse.papyrus.umldi.UmlDiagramElement;
@@ -62,7 +67,7 @@ public class UmlDiagramElementItemProvider extends DiagramElementItemProvider im
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addUmlModelElementPropertyDescriptor(object);
 			addSharedUmlStylePropertyDescriptor(object);
@@ -80,8 +85,7 @@ public class UmlDiagramElementItemProvider extends DiagramElementItemProvider im
 	 * @generated
 	 */
 	protected void addUmlModelElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlDiagramElement_umlModelElement_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_umlModelElement_feature", "_UI_UmlDiagramElement_type"), UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT, true, false, true, null, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlDiagramElement_umlModelElement_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_umlModelElement_feature", "_UI_UmlDiagramElement_type"), UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT, true, false, true, null, null, null));
 	}
 
 	/**
@@ -92,8 +96,7 @@ public class UmlDiagramElementItemProvider extends DiagramElementItemProvider im
 	 * @generated
 	 */
 	protected void addSharedUmlStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlDiagramElement_sharedUmlStyle_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_sharedUmlStyle_feature", "_UI_UmlDiagramElement_type"), UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE, true, false, true, null, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlDiagramElement_sharedUmlStyle_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_sharedUmlStyle_feature", "_UI_UmlDiagramElement_type"), UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE, true, false, true, null, null, null));
 	}
 
 	/**
@@ -104,8 +107,7 @@ public class UmlDiagramElementItemProvider extends DiagramElementItemProvider im
 	 * @generated
 	 */
 	protected void addTargetUmlEdgePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlDiagramElement_targetUmlEdge_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_targetUmlEdge_feature", "_UI_UmlDiagramElement_type"), UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, true, false, true, null, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlDiagramElement_targetUmlEdge_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_targetUmlEdge_feature", "_UI_UmlDiagramElement_type"), UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, true, false, true, null, null, null));
 	}
 
 	/**
@@ -116,12 +118,12 @@ public class UmlDiagramElementItemProvider extends DiagramElementItemProvider im
 	 * @generated
 	 */
 	protected void addSourceUmlEdgePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlDiagramElement_sourceUmlEdge_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_sourceUmlEdge_feature", "_UI_UmlDiagramElement_type"), UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, true, false, true, null, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlDiagramElement_sourceUmlEdge_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_sourceUmlEdge_feature", "_UI_UmlDiagramElement_type"), UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, true, false, true, null, null, null));
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -130,7 +132,7 @@ public class UmlDiagramElementItemProvider extends DiagramElementItemProvider im
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE);
 			childrenFeatures.add(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT);
@@ -174,7 +176,7 @@ public class UmlDiagramElementItemProvider extends DiagramElementItemProvider im
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(UmlDiagramElement.class)) {
+		switch(notification.getFeatureID(UmlDiagramElement.class)) {
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
@@ -195,9 +197,9 @@ public class UmlDiagramElementItemProvider extends DiagramElementItemProvider im
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 		newChildDescriptors.add(createChildParameter(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE, UMLDIFactory.eINSTANCE.createUmlStyle()));
-		newChildDescriptors.add(createChildParameter(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UMLDIFactory.eINSTANCE.createUmlShape()));
 		newChildDescriptors.add(createChildParameter(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UMLDIFactory.eINSTANCE.createUmlDiagram()));
 		newChildDescriptors.add(createChildParameter(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UMLDIFactory.eINSTANCE.createUmlEdge()));
+		newChildDescriptors.add(createChildParameter(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UMLDIFactory.eINSTANCE.createUmlShape()));
 		newChildDescriptors.add(createChildParameter(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UMLDIFactory.eINSTANCE.createUmlCompartment()));
 		newChildDescriptors.add(createChildParameter(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UMLDIFactory.eINSTANCE.createUmlLabel()));
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java
index 15a217666ad..5d78a253c81 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java
@@ -16,6 +16,8 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -27,7 +29,10 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.papyrus.dd.dc.DCFactory;
 import org.eclipse.papyrus.dd.di.DIPackage;
+
 import org.eclipse.papyrus.umldi.UMLDIPackage;
 import org.eclipse.papyrus.umldi.UmlDiagram;
 
@@ -38,7 +43,7 @@ import org.eclipse.papyrus.umldi.UmlDiagram;
  *
  * @generated
  */
-public class UmlDiagramItemProvider extends UmlShapeItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+public class UmlDiagramItemProvider extends UmlDiagramElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
 
 	/**
 	 * This constructs an instance from a factory and a notifier.
@@ -60,11 +65,12 @@ public class UmlDiagramItemProvider extends UmlShapeItemProvider implements IEdi
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addNamePropertyDescriptor(object);
 			addDocumentationPropertyDescriptor(object);
 			addResolutionPropertyDescriptor(object);
+			addKindPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -77,8 +83,7 @@ public class UmlDiagramItemProvider extends UmlShapeItemProvider implements IEdi
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_name_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Diagram_name_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Diagram_name_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -89,8 +94,7 @@ public class UmlDiagramItemProvider extends UmlShapeItemProvider implements IEdi
 	 * @generated
 	 */
 	protected void addDocumentationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_documentation_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Diagram_documentation_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__DOCUMENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_documentation_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Diagram_documentation_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__DOCUMENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -101,8 +105,49 @@ public class UmlDiagramItemProvider extends UmlShapeItemProvider implements IEdi
 	 * @generated
 	 */
 	protected void addResolutionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_resolution_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Diagram_resolution_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__RESOLUTION, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_resolution_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Diagram_resolution_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__RESOLUTION, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Kind feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addKindPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlDiagram_kind_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagram_kind_feature", "_UI_UmlDiagram_type"), UMLDIPackage.Literals.UML_DIAGRAM__KIND, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(DIPackage.Literals.SHAPE__BOUNDS);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+		return super.getChildFeature(object, child);
 	}
 
 	/**
@@ -126,7 +171,7 @@ public class UmlDiagramItemProvider extends UmlShapeItemProvider implements IEdi
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((UmlDiagram) object).getName();
+		String label = ((UmlDiagram)object).getName();
 		return label == null || label.length() == 0 ? getString("_UI_UmlDiagram_type") : getString("_UI_UmlDiagram_type") + " " + label;
 	}
 
@@ -141,12 +186,16 @@ public class UmlDiagramItemProvider extends UmlShapeItemProvider implements IEdi
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(UmlDiagram.class)) {
+		switch(notification.getFeatureID(UmlDiagram.class)) {
 		case UMLDIPackage.UML_DIAGRAM__NAME:
 		case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
 		case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
+		case UMLDIPackage.UML_DIAGRAM__KIND:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
+		case UMLDIPackage.UML_DIAGRAM__BOUNDS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -162,5 +211,6 @@ public class UmlDiagramItemProvider extends UmlShapeItemProvider implements IEdi
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
+		newChildDescriptors.add(createChildParameter(DIPackage.Literals.SHAPE__BOUNDS, DCFactory.eINSTANCE.createBounds()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java
index 6f2c6293a4d..5e2a80abf36 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -27,8 +29,11 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.dc.DCFactory;
+
 import org.eclipse.papyrus.dd.di.DIPackage;
+
 import org.eclipse.papyrus.umldi.UMLDIPackage;
 import org.eclipse.papyrus.umldi.UmlEdge;
 
@@ -61,7 +66,7 @@ public class UmlEdgeItemProvider extends UmlDiagramElementItemProvider implement
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addSourceUmlDiagramElementPropertyDescriptor(object);
 			addTargetUmlDiagramElementPropertyDescriptor(object);
@@ -77,8 +82,7 @@ public class UmlEdgeItemProvider extends UmlDiagramElementItemProvider implement
 	 * @generated
 	 */
 	protected void addSourceUmlDiagramElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlEdge_sourceUmlDiagramElement_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_UmlEdge_sourceUmlDiagramElement_feature", "_UI_UmlEdge_type"), UMLDIPackage.Literals.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT, true, false, true, null, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlEdge_sourceUmlDiagramElement_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlEdge_sourceUmlDiagramElement_feature", "_UI_UmlEdge_type"), UMLDIPackage.Literals.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT, true, false, true, null, null, null));
 	}
 
 	/**
@@ -89,12 +93,12 @@ public class UmlEdgeItemProvider extends UmlDiagramElementItemProvider implement
 	 * @generated
 	 */
 	protected void addTargetUmlDiagramElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlEdge_targetUmlDiagramElement_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_UmlEdge_targetUmlDiagramElement_feature", "_UI_UmlEdge_type"), UMLDIPackage.Literals.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT, true, false, true, null, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlEdge_targetUmlDiagramElement_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlEdge_targetUmlDiagramElement_feature", "_UI_UmlEdge_type"), UMLDIPackage.Literals.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT, true, false, true, null, null, null));
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -103,7 +107,7 @@ public class UmlEdgeItemProvider extends UmlDiagramElementItemProvider implement
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DIPackage.Literals.EDGE__WAYPOINT);
 		}
@@ -158,7 +162,7 @@ public class UmlEdgeItemProvider extends UmlDiagramElementItemProvider implement
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(UmlEdge.class)) {
+		switch(notification.getFeatureID(UmlEdge.class)) {
 		case UMLDIPackage.UML_EDGE__WAYPOINT:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java
index 283c35657ec..28df63c4561 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java
@@ -16,6 +16,8 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -27,6 +29,9 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.papyrus.dd.dc.DCFactory;
+import org.eclipse.papyrus.dd.di.DIPackage;
 import org.eclipse.papyrus.umldi.UMLDIPackage;
 import org.eclipse.papyrus.umldi.UmlLabel;
 import org.eclipse.papyrus.umldi.UmlLabelKind;
@@ -38,7 +43,7 @@ import org.eclipse.papyrus.umldi.UmlLabelKind;
  *
  * @generated
  */
-public class UmlLabelItemProvider extends UmlShapeItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+public class UmlLabelItemProvider extends UmlDiagramElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
 
 	/**
 	 * This constructs an instance from a factory and a notifier.
@@ -60,7 +65,7 @@ public class UmlLabelItemProvider extends UmlShapeItemProvider implements IEditi
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addKindPropertyDescriptor(object);
 		}
@@ -75,8 +80,38 @@ public class UmlLabelItemProvider extends UmlShapeItemProvider implements IEditi
 	 * @generated
 	 */
 	protected void addKindPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlLabel_kind_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_UmlLabel_kind_feature", "_UI_UmlLabel_type"), UMLDIPackage.Literals.UML_LABEL__KIND, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlLabel_kind_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlLabel_kind_feature", "_UI_UmlLabel_type"), UMLDIPackage.Literals.UML_LABEL__KIND, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(DIPackage.Literals.SHAPE__BOUNDS);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+		return super.getChildFeature(object, child);
 	}
 
 	/**
@@ -100,7 +135,7 @@ public class UmlLabelItemProvider extends UmlShapeItemProvider implements IEditi
 	 */
 	@Override
 	public String getText(Object object) {
-		UmlLabelKind labelValue = ((UmlLabel) object).getKind();
+		UmlLabelKind labelValue = ((UmlLabel)object).getKind();
 		String label = labelValue == null ? null : labelValue.toString();
 		return label == null || label.length() == 0 ? getString("_UI_UmlLabel_type") : getString("_UI_UmlLabel_type") + " " + label;
 	}
@@ -116,10 +151,13 @@ public class UmlLabelItemProvider extends UmlShapeItemProvider implements IEditi
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(UmlLabel.class)) {
+		switch(notification.getFeatureID(UmlLabel.class)) {
 		case UMLDIPackage.UML_LABEL__KIND:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
+		case UMLDIPackage.UML_LABEL__BOUNDS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -135,5 +173,6 @@ public class UmlLabelItemProvider extends UmlShapeItemProvider implements IEditi
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
+		newChildDescriptors.add(createChildParameter(DIPackage.Literals.SHAPE__BOUNDS, DCFactory.eINSTANCE.createBounds()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java
index a4316885bfd..b31021dbd45 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java
@@ -13,7 +13,6 @@ package org.eclipse.papyrus.umldi.provider;
 
 import java.util.Collection;
 import java.util.List;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -60,14 +59,15 @@ public class UmlShapeItemProvider extends UmlDiagramElementItemProvider implemen
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -76,7 +76,7 @@ public class UmlShapeItemProvider extends UmlDiagramElementItemProvider implemen
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DIPackage.Literals.SHAPE__BOUNDS);
 		}
@@ -131,7 +131,7 @@ public class UmlShapeItemProvider extends UmlDiagramElementItemProvider implemen
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(UmlShape.class)) {
+		switch(notification.getFeatureID(UmlShape.class)) {
 		case UMLDIPackage.UML_SHAPE__BOUNDS:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java
index 6c88ff89f6a..e5a5fec41cc 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java
@@ -16,7 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -28,7 +30,9 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.papyrus.dd.di.provider.StyleItemProvider;
+
 import org.eclipse.papyrus.umldi.UMLDIPackage;
 import org.eclipse.papyrus.umldi.UmlStyle;
 
@@ -61,7 +65,7 @@ public class UmlStyleItemProvider extends StyleItemProvider implements IEditingD
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 			addFontNamePropertyDescriptor(object);
 			addFontSizePropertyDescriptor(object);
@@ -77,8 +81,7 @@ public class UmlStyleItemProvider extends StyleItemProvider implements IEditingD
 	 * @generated
 	 */
 	protected void addFontNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlStyle_fontName_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_UmlStyle_fontName_feature", "_UI_UmlStyle_type"), UMLDIPackage.Literals.UML_STYLE__FONT_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlStyle_fontName_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlStyle_fontName_feature", "_UI_UmlStyle_type"), UMLDIPackage.Literals.UML_STYLE__FONT_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -89,8 +92,7 @@ public class UmlStyleItemProvider extends StyleItemProvider implements IEditingD
 	 * @generated
 	 */
 	protected void addFontSizePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlStyle_fontSize_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_UmlStyle_fontSize_feature", "_UI_UmlStyle_type"), UMLDIPackage.Literals.UML_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlStyle_fontSize_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlStyle_fontSize_feature", "_UI_UmlStyle_type"), UMLDIPackage.Literals.UML_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -114,7 +116,7 @@ public class UmlStyleItemProvider extends StyleItemProvider implements IEditingD
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((UmlStyle) object).getFontName();
+		String label = ((UmlStyle)object).getFontName();
 		return label == null || label.length() == 0 ? getString("_UI_UmlStyle_type") : getString("_UI_UmlStyle_type") + " " + label;
 	}
 
@@ -129,7 +131,7 @@ public class UmlStyleItemProvider extends StyleItemProvider implements IEditingD
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(UmlStyle.class)) {
+		switch(notification.getFeatureID(UmlStyle.class)) {
 		case UMLDIPackage.UML_STYLE__FONT_NAME:
 		case UMLDIPackage.UML_STYLE__FONT_SIZE:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/META-INF/MANIFEST.MF b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/META-INF/MANIFEST.MF
index 1b09a241713..b39f5a26141 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/META-INF/MANIFEST.MF
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/META-INF/MANIFEST.MF
@@ -1,25 +1,23 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.umldi.editor

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

- org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.umldi.edit;bundle-version="1.0.1";visibility:=reexport,

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

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

- org.eclipse.ui.ide;visibility:=reexport,

- org.eclipse.papyrus.dd.edit;bundle-version="1.0.1";visibility:=reexport,

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

- org.eclipse.uml2.uml.edit;visibility:=reexport,

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

- org.eclipse.m2m.qvt.oml;bundle-version="3.3.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.umldi.editor.UMLDIEditorPlugin$I

- mplementation

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

-

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.umldi.editor;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.umldi.editor.UMLDIEditorPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: org.eclipse.papyrus.umldi.editor
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources;visibility:=reexport,
+ org.eclipse.papyrus.umldi.edit;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.emf.edit.ui;visibility:=reexport,
+ org.eclipse.ui.ide;visibility:=reexport,
+ org.eclipse.papyrus.dd.edit;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.uml2.uml.edit;visibility:=reexport,
+ org.eclipse.papyrus.dd.editor;bundle-version="1.0.0",
+ org.eclipse.m2m.qvt.oml;bundle-version="3.3.0"
+Bundle-ActivationPolicy: lazy
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIActionBarContributor.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIActionBarContributor.java
index abb5990e630..562a91868ea 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIActionBarContributor.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIActionBarContributor.java
@@ -19,14 +19,17 @@ import java.util.Map;
 import java.util.StringTokenizer;
 
 import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+
 import org.eclipse.emf.edit.ui.action.ControlAction;
 import org.eclipse.emf.edit.ui.action.CreateChildAction;
 import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
 import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
 import org.eclipse.emf.edit.ui.action.LoadResourceAction;
 import org.eclipse.emf.edit.ui.action.ValidateAction;
+
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ActionContributionItem;
 import org.eclipse.jface.action.IAction;
@@ -38,12 +41,14 @@ import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.action.SubContributionItem;
+
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.Viewer;
+
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.PartInitException;
 
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelPage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelPage.java
index a917d04b3c4..88109f11261 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelPage.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelPage.java
@@ -66,7 +66,7 @@ public class UMLDIModelPage extends DDModelPage {
 				context.setConfigProperty("keepModeling", true);
 
 				URI transformationURI = URI
-						.createURI("platform:/plugin/org.eclipse.papyrus.umldi2dg/transforms/umldi2dg.qvto");
+						.createURI("platform:/plugin/org.eclipse.papyrus.umldi2dg/transforms/UMLDIToDG.qvto");
 				TransformationExecutor executor = new TransformationExecutor(
 						transformationURI);
 				ExecutionDiagnostic result = executor.execute(context, input,
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelWizard.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelWizard.java
index bf5fe08760f..62d9d2debd7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelWizard.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelWizard.java
@@ -21,52 +21,76 @@ import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.StringTokenizer;
 
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.common.CommonPlugin;
+
 import org.eclipse.emf.common.util.URI;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
+
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
+
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
 import org.eclipse.emf.ecore.xmi.XMLResource;
+
 import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
+
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
+
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.papyrus.umldi.UMLDIFactory;
-import org.eclipse.papyrus.umldi.UMLDIPackage;
-import org.eclipse.papyrus.umldi.provider.UMLDIEditPlugin;
+
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
+
 import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.ModifyEvent;
+
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
+
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
+
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
 import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+
 import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.part.ISetSelectionTarget;
 
+import org.eclipse.papyrus.umldi.UMLDIFactory;
+import org.eclipse.papyrus.umldi.UMLDIPackage;
+import org.eclipse.papyrus.umldi.provider.UMLDIEditPlugin;
+
+import org.eclipse.core.runtime.Path;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+
 /**
  * This is a simple wizard for creating a new model file. <!-- begin-user-doc
  * --> <!-- end-user-doc -->
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/.project b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/.project
new file mode 100644
index 00000000000..c209750ea3a
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.umldi.examples</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/ClassDiagram1.dg b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/ClassDiagram1.dg
new file mode 100644
index 00000000000..38658cead69
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/ClassDiagram1.dg
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="ASCII"?>

+<dg:RootCanvas xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dg="http://www.omg.org/spec/DD/20110901/DG">

+  <member xsi:type="dg:Canvas">

+    <member xsi:type="dg:Rectangle">

+      <bounds x="0.0" y="0.0" width="140.0" height="100.0"/>

+    </member>

+    <member xsi:type="dg:Text" data="Class1" anchor="middle">

+      <bounds x="0.0" y="0.0" width="130.0" height="20.0"/>

+    </member>

+    <member xsi:type="dg:Canvas">

+      <member xsi:type="dg:Line">

+        <start x="0.0" y="0.0"/>

+        <end x="140.0" y="0.0"/>

+      </member>

+      <member xsi:type="dg:Text" data="+ property1 : String [1..2]">

+        <bounds width="100.0" height="20.0"/>

+      </member>

+      <member xsi:type="dg:Text" data="+ property2 : Integer">

+        <bounds y="20.0" width="100.0" height="20.0"/>

+      </member>

+      <bounds x="0.0" y="20.0"/>

+    </member>

+    <member xsi:type="dg:Canvas">

+      <member xsi:type="dg:Line">

+        <start x="0.0" y="0.0"/>

+        <end x="140.0" y="0.0"/>

+      </member>

+      <member xsi:type="dg:Text" data="operation1">

+        <bounds width="100.0" height="20.0"/>

+      </member>

+      <bounds x="0.0" y="60.0"/>

+    </member>

+    <bounds x="30.0" y="20.0"/>

+  </member>

+  <member xsi:type="dg:Canvas">

+    <member xsi:type="dg:Rectangle">

+      <bounds x="0.0" y="0.0" width="100.0" height="100.0"/>

+    </member>

+    <member xsi:type="dg:Text" data="Class2" anchor="middle">

+      <bounds width="100.0" height="20.0"/>

+    </member>

+    <bounds x="20.0" y="200.0"/>

+  </member>

+  <member xsi:type="dg:Canvas">

+    <member xsi:type="dg:Rectangle">

+      <bounds x="0.0" y="0.0" width="150.0" height="100.0"/>

+    </member>

+    <member xsi:type="dg:Text" data="&#xab;Interface&#xbb;\nInterface1" anchor="middle">

+      <bounds width="150.0" height="40.0"/>

+    </member>

+    <bounds x="220.0" y="20.0"/>

+  </member>

+  <member xsi:type="dg:Canvas">

+    <member xsi:type="dg:Rectangle">

+      <bounds x="0.0" y="0.0" width="100.0" height="100.0"/>

+    </member>

+    <member xsi:type="dg:Text" data="Class3" anchor="middle">

+      <bounds width="100.0" height="20.0"/>

+    </member>

+    <bounds x="320.0" y="200.0"/>

+  </member>

+  <member xsi:type="dg:Group">

+    <member xsi:type="dg:Path" endMarker="endHollowClosedArrow">

+      <command xsi:type="dg:MoveTo">

+        <point x="70.0" y="200.0"/>

+      </command>

+      <command xsi:type="dg:LineTo">

+        <point x="70.0" y="120.0"/>

+      </command>

+    </member>

+  </member>

+  <member xsi:type="dg:Group">

+    <member xsi:type="dg:Path" endMarker="endHollowClosedArrow">

+      <class>interfaceRealization</class>

+      <command xsi:type="dg:MoveTo">

+        <point x="120.0" y="210.0"/>

+      </command>

+      <command xsi:type="dg:LineTo">

+        <point x="220.0" y="120.0"/>

+      </command>

+    </member>

+  </member>

+  <member xsi:type="dg:Group">

+    <member xsi:type="dg:Path" endMarker="endSolidCircleOpenArrow" startMarker="startSolidDiamond">

+      <command xsi:type="dg:MoveTo">

+        <point x="120.0" y="250.0"/>

+      </command>

+      <command xsi:type="dg:LineTo">

+        <point x="320.0" y="225.0"/>

+      </command>

+    </member>

+    <member xsi:type="dg:Text" data="hasOneOf" anchor="middle">

+      <bounds x="200.0" y="250.0" width="40.0" height="20.0"/>

+    </member>

+    <member xsi:type="dg:Text" data="+ class2" anchor="middle">

+      <bounds x="130.0" y="260.0" width="40.0" height="20.0"/>

+    </member>

+    <member xsi:type="dg:Text" data="+ class3" anchor="middle">

+      <bounds x="250.0" y="210.0" width="40.0" height="20.0"/>

+    </member>

+  </member>

+  <definitions>

+    <definition xsi:type="dg:Marker" id="endHollowClosedArrow">

+      <member xsi:type="dg:Polygon">

+        <style>

+          <fill color="#FFFFFF"/>

+        </style>

+        <point x="1.0" y="1.0"/>

+        <point x="12.0" y="6.0"/>

+        <point x="1.0" y="11.0"/>

+      </member>

+      <size width="12.0" height="12.0"/>

+      <reference x="12.0" y="6.0"/>

+    </definition>

+    <definition xsi:type="dg:Marker" id="endSolidClosedArrow">

+      <member xsi:type="dg:Polygon">

+        <style>

+          <fill color="#000000"/>

+        </style>

+        <point x="1.0" y="1.0"/>

+        <point x="12.0" y="6.0"/>

+        <point x="1.0" y="11.0"/>

+      </member>

+      <size width="12.0" height="12.0"/>

+      <reference x="12.0" y="6.0"/>

+    </definition>

+    <definition xsi:type="dg:Marker" id="endOpenArrow">

+      <member xsi:type="dg:Polyline">

+        <point x="1.0" y="1.0"/>

+        <point x="12.0" y="6.0"/>

+        <point x="1.0" y="11.0"/>

+      </member>

+      <size width="12.0" height="12.0"/>

+      <reference x="12.0" y="6.0"/>

+    </definition>

+    <definition xsi:type="dg:Marker" id="endSolidCircleOpenArrow">

+      <member xsi:type="dg:Circle" radius="3.0">

+        <style>

+          <fill color="#000000"/>

+        </style>

+        <center x="16.0" y="6.0"/>

+      </member>

+      <member xsi:type="dg:Polyline">

+        <point x="1.0" y="1.0"/>

+        <point x="12.0" y="6.0"/>

+        <point x="1.0" y="11.0"/>

+      </member>

+      <size width="20.0" height="12.0"/>

+      <reference x="20.0" y="6.0"/>

+    </definition>

+    <definition xsi:type="dg:Marker" id="endSolidDiamond">

+      <member xsi:type="dg:Polygon">

+        <style>

+          <fill color="#000000"/>

+        </style>

+        <point x="0.0" y="6.0"/>

+        <point x="8.0" y="1.0"/>

+        <point x="16.0" y="6.0"/>

+        <point x="8.0" y="11.0"/>

+      </member>

+      <size width="16.0" height="12.0"/>

+      <reference x="16.0" y="6.0"/>

+    </definition>

+    <definition xsi:type="dg:Marker" id="endHollowDiamond">

+      <member xsi:type="dg:Polygon">

+        <style>

+          <fill color="#FFFFFF"/>

+        </style>

+        <point x="0.0" y="6.0"/>

+        <point x="8.0" y="1.0"/>

+        <point x="16.0" y="6.0"/>

+        <point x="8.0" y="11.0"/>

+      </member>

+      <size width="16.0" height="12.0"/>

+      <reference x="16.0" y="6.0"/>

+    </definition>

+    <definition xsi:type="dg:Marker" id="endSolidDiamondOpenArrow">

+      <member xsi:type="dg:Polygon">

+        <style>

+          <fill color="#000000"/>

+        </style>

+        <point x="12.0" y="6.0"/>

+        <point x="20.0" y="1.0"/>

+        <point x="28.0" y="6.0"/>

+        <point x="20.0" y="11.0"/>

+      </member>

+      <member xsi:type="dg:Polyline">

+        <point x="1.0" y="1.0"/>

+        <point x="12.0" y="6.0"/>

+        <point x="1.0" y="11.0"/>

+      </member>

+      <size width="28.0" height="12.0"/>

+      <reference x="28.0" y="6.0"/>

+    </definition>

+    <definition xsi:type="dg:Marker" id="endHollowDiamondOpenArrow">

+      <member xsi:type="dg:Polygon">

+        <style>

+          <fill color="#FFFFFF"/>

+        </style>

+        <point x="12.0" y="6.0"/>

+        <point x="20.0" y="1.0"/>

+        <point x="28.0" y="6.0"/>

+        <point x="20.0" y="11.0"/>

+      </member>

+      <member xsi:type="dg:Polyline">

+        <point x="1.0" y="1.0"/>

+        <point x="12.0" y="6.0"/>

+        <point x="1.0" y="11.0"/>

+      </member>

+      <size width="28.0" height="12.0"/>

+      <reference x="28.0" y="6.0"/>

+    </definition>

+    <definition xsi:type="dg:Marker" id="endSolidCircleSolidDiamondOpenArrow">

+      <member xsi:type="dg:Circle" radius="3.0">

+        <style>

+          <fill color="#000000"/>

+        </style>

+        <center x="32.0" y="6.0"/>

+      </member>

+      <member xsi:type="dg:Polygon">

+        <style>

+          <fill color="#000000"/>

+        </style>

+        <point x="12.0" y="6.0"/>

+        <point x="20.0" y="1.0"/>

+        <point x="28.0" y="6.0"/>

+        <point x="20.0" y="11.0"/>

+      </member>

+      <member xsi:type="dg:Polyline">

+        <point x="1.0" y="1.0"/>

+        <point x="12.0" y="6.0"/>

+        <point x="1.0" y="11.0"/>

+      </member>

+      <size width="36.0" height="12.0"/>

+      <reference x="36.0" y="6.0"/>

+    </definition>

+    <definition xsi:type="dg:Marker" id="endSolidCircleHollowDiamondOpenArrow">

+      <member xsi:type="dg:Circle" radius="3.0">

+        <style>

+          <fill color="#000000"/>

+        </style>

+        <center x="32.0" y="6.0"/>

+      </member>

+      <member xsi:type="dg:Polygon">

+        <style>

+          <fill color="#FFFFFF"/>

+        </style>

+        <point x="12.0" y="6.0"/>

+        <point x="20.0" y="1.0"/>

+        <point x="28.0" y="6.0"/>

+        <point x="20.0" y="11.0"/>

+      </member>

+      <member xsi:type="dg:Polyline">

+        <point x="1.0" y="1.0"/>

+        <point x="12.0" y="6.0"/>

+        <point x="1.0" y="11.0"/>

+      </member>

+      <size width="36.0" height="12.0"/>

+      <reference x="36.0" y="6.0"/>

+    </definition>

+    <definition xsi:type="dg:Marker" id="startOpenArrow">

+      <member xsi:type="dg:Polyline">

+        <point x="11.0" y="1.0"/>

+        <point x="1.0" y="6.0"/>

+        <point x="11.0" y="11.0"/>

+      </member>

+      <size width="12.0" height="12.0"/>

+      <reference x="0.0" y="6.0"/>

+    </definition>

+    <definition xsi:type="dg:Marker" id="startSolidCircleOpenArrow">

+      <member xsi:type="dg:Circle" radius="3.0">

+        <style>

+          <fill color="#000000"/>

+        </style>

+        <center x="4.0" y="6.0"/>

+      </member>

+      <member xsi:type="dg:Polyline">

+        <point x="19.0" y="1.0"/>

+        <point x="8.0" y="6.0"/>

+        <point x="19.0" y="11.0"/>

+      </member>

+      <size width="20.0" height="12.0"/>

+      <reference x="0.0" y="6.0"/>

+    </definition>

+    <definition xsi:type="dg:Marker" id="startSolidDiamond">

+      <member xsi:type="dg:Polygon">

+        <style>

+          <fill color="#000000"/>

+        </style>

+        <point x="0.0" y="6.0"/>

+        <point x="8.0" y="1.0"/>

+        <point x="16.0" y="6.0"/>

+        <point x="8.0" y="11.0"/>

+      </member>

+      <size width="16.0" height="12.0"/>

+      <reference x="0.0" y="6.0"/>

+    </definition>

+    <definition xsi:type="dg:Marker" id="startHollowDiamond">

+      <member xsi:type="dg:Polygon">

+        <style>

+          <fill color="#FFFFFF"/>

+        </style>

+        <point x="0.0" y="6.0"/>

+        <point x="8.0" y="1.0"/>

+        <point x="16.0" y="6.0"/>

+        <point x="8.0" y="11.0"/>

+      </member>

+      <size width="16.0" height="12.0"/>

+      <reference x="0.0" y="6.0"/>

+    </definition>

+    <definition xsi:type="dg:Marker" id="startSolidDiamondOpenArrow">

+      <member xsi:type="dg:Polygon">

+        <style>

+          <fill color="#000000"/>

+        </style>

+        <point x="0.0" y="6.0"/>

+        <point x="8.0" y="1.0"/>

+        <point x="16.0" y="6.0"/>

+        <point x="8.0" y="11.0"/>

+      </member>

+      <member xsi:type="dg:Polyline">

+        <point x="27.0" y="1.0"/>

+        <point x="16.0" y="6.0"/>

+        <point x="27.0" y="11.0"/>

+      </member>

+      <size width="28.0" height="12.0"/>

+      <reference x="0.0" y="6.0"/>

+    </definition>

+    <definition xsi:type="dg:Marker" id="startHollowDiamondOpenArrow">

+      <member xsi:type="dg:Polygon">

+        <style>

+          <fill color="#FFFFFF"/>

+        </style>

+        <point x="0.0" y="6.0"/>

+        <point x="8.0" y="1.0"/>

+        <point x="16.0" y="6.0"/>

+        <point x="8.0" y="11.0"/>

+      </member>

+      <member xsi:type="dg:Polyline">

+        <point x="27.0" y="1.0"/>

+        <point x="16.0" y="6.0"/>

+        <point x="27.0" y="11.0"/>

+      </member>

+      <size width="28.0" height="12.0"/>

+      <reference x="0.0" y="6.0"/>

+    </definition>

+    <definition xsi:type="dg:Marker" id="startSolidCircleSolidDiamondOpenArrow">

+      <member xsi:type="dg:Circle" radius="3.0">

+        <style>

+          <fill color="#000000"/>

+        </style>

+        <center x="4.0" y="6.0"/>

+      </member>

+      <member xsi:type="dg:Polygon">

+        <style>

+          <fill color="#000000"/>

+        </style>

+        <point x="8.0" y="6.0"/>

+        <point x="16.0" y="1.0"/>

+        <point x="24.0" y="6.0"/>

+        <point x="16.0" y="11.0"/>

+      </member>

+      <member xsi:type="dg:Polyline">

+        <point x="35.0" y="1.0"/>

+        <point x="24.0" y="6.0"/>

+        <point x="35.0" y="11.0"/>

+      </member>

+      <size width="36.0" height="12.0"/>

+      <reference x="0.0" y="6.0"/>

+    </definition>

+    <definition xsi:type="dg:Marker" id="startSolidCircleHollowDiamondOpenArrow">

+      <member xsi:type="dg:Circle" radius="3.0">

+        <style>

+          <fill color="#000000"/>

+        </style>

+        <center x="4.0" y="6.0"/>

+      </member>

+      <member xsi:type="dg:Polygon">

+        <style>

+          <fill color="#FFFFFF"/>

+        </style>

+        <point x="8.0" y="6.0"/>

+        <point x="16.0" y="1.0"/>

+        <point x="24.0" y="6.0"/>

+        <point x="16.0" y="11.0"/>

+      </member>

+      <member xsi:type="dg:Polyline">

+        <point x="35.0" y="1.0"/>

+        <point x="24.0" y="6.0"/>

+        <point x="35.0" y="11.0"/>

+      </member>

+      <size width="36.0" height="12.0"/>

+      <reference x="0.0" y="6.0"/>

+    </definition>

+    <styleSheet>

+      <rule>

+        <selector kind="canvas"/>

+        <style>

+          <fill xsi:nil="true"/>

+          <stroke color="#000000"/>

+        </style>

+      </rule>

+      <rule>

+        <selector kind="text"/>

+        <style>

+          <fill color="#000000"/>

+          <stroke xsi:nil="true"/>

+        </style>

+      </rule>

+      <rule>

+        <selector>

+          <class>interfaceRealization</class>

+        </selector>

+        <style>

+          <strokeDashLength>5.0</strokeDashLength>

+          <strokeDashLength>5.0</strokeDashLength>

+        </style>

+      </rule>

+    </styleSheet>

+  </definitions>

+  <script>platform:/plugin/org.eclipse.papyrus.umldi2dg/scripts/UmlLayouts.js</script>

+</dg:RootCanvas>

diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/ClassDiagram1.uml b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/ClassDiagram1.uml
new file mode 100644
index 00000000000..ace4d29469d
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/ClassDiagram1.uml
@@ -0,0 +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="_j3EqsPohEeOf0dEpmAKsGQ">
+  <packagedElement xmi:type="uml:Class" xmi:id="_t5jsQP5TEeOd74M_5vX1_g" name="Class1">
+    <ownedAttribute xmi:id="_1pXN0BPOEeS_pLDVuBp_mA" name="property1" type="_jKsXcBPsEeSDaKvmNNYT5Q">
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_T_l4QBloEeSxPsDSykZudg" value="2"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:id="_6Ek04BPOEeS_pLDVuBp_mA" name="property2" type="_jd09UBlnEeSxPsDSykZudg"/>
+    <ownedOperation xmi:id="_-_mMUBPtEeSDaKvmNNYT5Q" name="operation1">
+      <ownedParameter xmi:id="_Gx310BPuEeSDaKvmNNYT5Q" type="_jKsXcBPsEeSDaKvmNNYT5Q" direction="return"/>
+    </ownedOperation>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_urf78AjaEeSGdZskauFcNw" clientDependency="_-OT3MBWLEeSqLOm2PTk6Mw" name="Class2">
+    <generalization xmi:id="_RSQfIAjcEeSGdZskauFcNw" general="_t5jsQP5TEeOd74M_5vX1_g"/>
+    <ownedAttribute xmi:id="_yL8IwBfAEeSsyr8ywePkcA" name="class3" type="_urf78AjaEeSGdZskauFcNw" aggregation="composite" association="_Wrx_YBfAEeSsyr8ywePkcA"/>
+    <interfaceRealization xmi:id="_-OT3MBWLEeSqLOm2PTk6Mw" client="_urf78AjaEeSGdZskauFcNw" supplier="_j7ShQBWJEeSqLOm2PTk6Mw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_iR6VABfAEeSsyr8ywePkcA" name="Class3"/>
+  <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_jKsXcBPsEeSDaKvmNNYT5Q" name="String"/>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_j7ShQBWJEeSqLOm2PTk6Mw" name="Interface1"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="_Wrx_YBfAEeSsyr8ywePkcA" name="hasOneOf" memberEnd="_5EptABfAEeSsyr8ywePkcA _yL8IwBfAEeSsyr8ywePkcA">
+    <ownedEnd xmi:id="_5EptABfAEeSsyr8ywePkcA" name="class2" type="_iR6VABfAEeSsyr8ywePkcA" association="_Wrx_YBfAEeSsyr8ywePkcA"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_jd09UBlnEeSxPsDSykZudg" name="Integer"/>
+</uml:Model>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/ClassDiagram1.umldi b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/ClassDiagram1.umldi
new file mode 100644
index 00000000000..2ef80fbef55
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/ClassDiagram1.umldi
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<umldi:UmlDiagram xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmlns:umldi="http://www.omg.org/spec/UML/20131001/UMLDI">
+  <ownedUmlDiagramElement xsi:type="umldi:UmlShape" umlModelElement="uml:Class ClassDiagram1.uml#_t5jsQP5TEeOd74M_5vX1_g">
+    <ownedUmlDiagramElement xsi:type="umldi:UmlLabel" umlModelElement="uml:Class ClassDiagram1.uml#_t5jsQP5TEeOd74M_5vX1_g">
+      <bounds x="0.0" y="0.0" width="130.0" height="20.0"/>
+    </ownedUmlDiagramElement>
+    <ownedUmlDiagramElement xsi:type="umldi:UmlCompartment" umlModelElement="uml:Class ClassDiagram1.uml#_t5jsQP5TEeOd74M_5vX1_g">
+      <ownedUmlDiagramElement xsi:type="umldi:UmlLabel" umlModelElement="uml:Property ClassDiagram1.uml#_1pXN0BPOEeS_pLDVuBp_mA">
+        <bounds width="100.0" height="20.0"/>
+      </ownedUmlDiagramElement>
+      <ownedUmlDiagramElement xsi:type="umldi:UmlLabel" umlModelElement="uml:Property ClassDiagram1.uml#_6Ek04BPOEeS_pLDVuBp_mA">
+        <bounds y="20.0" width="100.0" height="20.0"/>
+      </ownedUmlDiagramElement>
+      <bounds x="0.0" y="20.0" width="140.0" height="40.0"/>
+    </ownedUmlDiagramElement>
+    <ownedUmlDiagramElement xsi:type="umldi:UmlCompartment" umlModelElement="uml:Class ClassDiagram1.uml#_t5jsQP5TEeOd74M_5vX1_g" kind="operations">
+      <ownedUmlDiagramElement xsi:type="umldi:UmlLabel" umlModelElement="uml:Operation ClassDiagram1.uml#_-_mMUBPtEeSDaKvmNNYT5Q">
+        <bounds width="100.0" height="20.0"/>
+      </ownedUmlDiagramElement>
+      <bounds y="60.0" width="140.0" height="20.0"/>
+    </ownedUmlDiagramElement>
+    <bounds x="30.0" y="20.0" width="140.0" height="100.0"/>
+  </ownedUmlDiagramElement>
+  <ownedUmlDiagramElement xsi:type="umldi:UmlShape" umlModelElement="uml:Class ClassDiagram1.uml#_urf78AjaEeSGdZskauFcNw">
+    <ownedUmlDiagramElement xsi:type="umldi:UmlLabel" umlModelElement="uml:Class ClassDiagram1.uml#_urf78AjaEeSGdZskauFcNw">
+      <bounds width="100.0" height="20.0"/>
+    </ownedUmlDiagramElement>
+    <bounds x="20.0" y="200.0" width="100.0" height="100.0"/>
+  </ownedUmlDiagramElement>
+  <ownedUmlDiagramElement xsi:type="umldi:UmlShape" umlModelElement="uml:Interface ClassDiagram1.uml#_j7ShQBWJEeSqLOm2PTk6Mw">
+    <ownedUmlDiagramElement xsi:type="umldi:UmlLabel" umlModelElement="uml:Interface ClassDiagram1.uml#_j7ShQBWJEeSqLOm2PTk6Mw">
+      <bounds width="150.0" height="40.0"/>
+    </ownedUmlDiagramElement>
+    <bounds x="220.0" y="20.0" width="150.0" height="100.0"/>
+  </ownedUmlDiagramElement>
+  <ownedUmlDiagramElement xsi:type="umldi:UmlShape" umlModelElement="uml:Class ClassDiagram1.uml#_iR6VABfAEeSsyr8ywePkcA">
+    <ownedUmlDiagramElement xsi:type="umldi:UmlLabel" umlModelElement="uml:Class ClassDiagram1.uml#_iR6VABfAEeSsyr8ywePkcA">
+      <bounds width="100.0" height="20.0"/>
+    </ownedUmlDiagramElement>
+    <bounds x="320.0" y="200.0" width="100.0" height="100.0"/>
+  </ownedUmlDiagramElement>
+  <ownedUmlDiagramElement xsi:type="umldi:UmlEdge" umlModelElement="uml:Generalization ClassDiagram1.uml#_RSQfIAjcEeSGdZskauFcNw">
+    <waypoint x="70.0" y="200.0"/>
+    <waypoint x="70.0" y="120.0"/>
+  </ownedUmlDiagramElement>
+  <ownedUmlDiagramElement xsi:type="umldi:UmlEdge" umlModelElement="uml:InterfaceRealization ClassDiagram1.uml#_-OT3MBWLEeSqLOm2PTk6Mw">
+    <waypoint x="120.0" y="210.0"/>
+    <waypoint x="220.0" y="120.0"/>
+  </ownedUmlDiagramElement>
+  <ownedUmlDiagramElement xsi:type="umldi:UmlEdge" umlModelElement="uml:Association ClassDiagram1.uml#_Wrx_YBfAEeSsyr8ywePkcA">
+    <ownedUmlDiagramElement xsi:type="umldi:UmlLabel" umlModelElement="uml:Association ClassDiagram1.uml#_Wrx_YBfAEeSsyr8ywePkcA">
+      <bounds x="200.0" y="250.0" width="40.0" height="20.0"/>
+    </ownedUmlDiagramElement>
+    <ownedUmlDiagramElement xsi:type="umldi:UmlLabel" umlModelElement="uml:Property ClassDiagram1.uml#_5EptABfAEeSsyr8ywePkcA">
+      <bounds x="130.0" y="260.0" width="40.0" height="20.0"/>
+    </ownedUmlDiagramElement>
+    <ownedUmlDiagramElement xsi:type="umldi:UmlLabel" umlModelElement="uml:Property ClassDiagram1.uml#_yL8IwBfAEeSsyr8ywePkcA">
+      <bounds x="250.0" y="210.0" width="40.0" height="20.0"/>
+    </ownedUmlDiagramElement>
+    <waypoint x="120.0" y="250.0"/>
+    <waypoint x="320.0" y="225.0"/>
+  </ownedUmlDiagramElement>
+</umldi:UmlDiagram>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.settings/org.eclipse.jdt.core.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..e5766923962
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,281 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0
+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=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0
+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=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+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=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=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=false
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
+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=150
+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=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+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_at_end_of_file_if_missing=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=do not 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_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_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=do not 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=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not 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=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not 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=do not 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=true
+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=200
+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=0
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
+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/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..b5f980cae55
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+formatter_profile=_Zero blank Papyrus Formatter Profile CDM
+formatter_settings_version=12
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/META-INF/MANIFEST.MF b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/META-INF/MANIFEST.MF
index cc874ee051f..a40cadb0e03 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/META-INF/MANIFEST.MF
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/META-INF/MANIFEST.MF
@@ -1,21 +1,20 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.umldi,

- org.eclipse.papyrus.umldi.impl,

- org.eclipse.papyrus.umldi.util

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

- org.eclipse.emf.ecore,

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

- org.eclipse.papyrus.dd;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.uml2.types;visibility:=reexport,

- org.eclipse.uml2.uml;visibility:=reexport,

- org.eclipse.uml2.common;visibility:=reexport

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

-

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.umldi;singleton:=true
+Bundle-Version: 0.1.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: org.eclipse.papyrus.umldi,
+ org.eclipse.papyrus.umldi.impl,
+ org.eclipse.papyrus.umldi.util
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.papyrus.dd;visibility:=reexport,
+ org.eclipse.uml2.types;visibility:=reexport,
+ org.eclipse.uml2.uml;visibility:=reexport,
+ org.eclipse.uml2.common;visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.di b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.di
index fe0800dc64e..5a2858ac300 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.di
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.di
@@ -13,6 +13,12 @@
     <availablePage>
       <emfPageIdentifier href="UMLDI.notation#_zh2dgP8vEeObup8tdlL4zw"/>
     </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="UMLDI.notation#_nLnL4BVwEeSbve-DNFls6A"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="UMLDI.notation#_tjU74BVwEeSbve-DNFls6A"/>
+    </availablePage>
   </pageList>
   <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
     <windows>
@@ -29,6 +35,12 @@
         <children>
           <emfPageIdentifier href="UMLDI.notation#_zh2dgP8vEeObup8tdlL4zw"/>
         </children>
+        <children>
+          <emfPageIdentifier href="UMLDI.notation#_nLnL4BVwEeSbve-DNFls6A"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="UMLDI.notation#_tjU74BVwEeSbve-DNFls6A"/>
+        </children>
       </children>
     </windows>
   </sashModel>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.ecore b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.ecore
index b9010a13140..5da60789b4d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.ecore
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.ecore
@@ -4,15 +4,12 @@
   <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
     <details key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>
   </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="UmlDiagram" eSuperTypes="#//UmlShape ../../org.eclipse.papyrus.dd/model/DI.ecore#//Diagram">
+  <eClassifiers xsi:type="ecore:EClass" name="UmlDiagram" eSuperTypes="#//UmlDiagramElement ../../org.eclipse.papyrus.dd/model/DI.ecore#//Diagram">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="The most general class for UML diagrams."/>
     </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UmlShape" eSuperTypes="#//UmlDiagramElement ../../org.eclipse.papyrus.dd/model/DI.ecore#//Shape">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The most general class for UML diagram elements that are not rendered as lines."/>
-    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" ordered="false" lowerBound="1"
+        eType="#//UmlDiagramKind"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="UmlDiagramElement" abstract="true" eSuperTypes="../../org.eclipse.papyrus.dd/model/DI.ecore#//DiagramElement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -120,7 +117,15 @@
       <eAnnotations source="subsets" references="../../org.eclipse.papyrus.dd/model/DI.ecore#//Edge/targetDiagramElement"/>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UmlCompartment" eSuperTypes="#//UmlShape">
+  <eClassifiers xsi:type="ecore:EEnum" name="UmlDiagramKind">
+    <eLiterals name="class"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="UmlShape" eSuperTypes="#//UmlDiagramElement ../../org.eclipse.papyrus.dd/model/DI.ecore#//Shape">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="The most general class for UML diagram elements that are not rendered as lines."/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="UmlCompartment" eSuperTypes="#//UmlDiagramElement ../../org.eclipse.papyrus.dd/model/DI.ecore#//Shape">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" ordered="false" lowerBound="1"
         eType="#//UmlCompartmentKind"/>
   </eClassifiers>
@@ -128,11 +133,12 @@
     <eLiterals name="attributes"/>
     <eLiterals name="operations" value="1"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UmlLabel" eSuperTypes="#//UmlShape">
+  <eClassifiers xsi:type="ecore:EClass" name="UmlLabel" eSuperTypes="#//UmlDiagramElement ../../org.eclipse.papyrus.dd/model/DI.ecore#//Shape">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" ordered="false" lowerBound="1"
         eType="#//UmlLabelKind"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="UmlLabelKind">
     <eLiterals name="name"/>
+    <eLiterals name="multiplicity" value="1"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.genmodel b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.genmodel
index 86d8fb042ae..454a53136b8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.genmodel
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.genmodel
@@ -30,15 +30,20 @@
   <foreignModel>UMLDI.uml</foreignModel>
   <genPackages xsi:type="genmodel:GenPackage" prefix="UMLDI" basePackage="org.eclipse.papyrus"
       resource="XML" disposableProviderFactory="true" ecorePackage="UMLDI.ecore#/">
+    <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="UMLDI.ecore#//UmlDiagramKind">
+      <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="UMLDI.ecore#//UmlDiagramKind/class"/>
+    </genEnums>
     <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="UMLDI.ecore#//UmlCompartmentKind">
       <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="UMLDI.ecore#//UmlCompartmentKind/attributes"/>
       <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="UMLDI.ecore#//UmlCompartmentKind/operations"/>
     </genEnums>
     <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="UMLDI.ecore#//UmlLabelKind">
       <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="UMLDI.ecore#//UmlLabelKind/name"/>
+      <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="UMLDI.ecore#//UmlLabelKind/multiplicity"/>
     </genEnums>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLDI.ecore#//UmlDiagram"/>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLDI.ecore#//UmlShape"/>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLDI.ecore#//UmlDiagram">
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UMLDI.ecore#//UmlDiagram/kind"/>
+    </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UMLDI.ecore#//UmlDiagramElement">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
           propertySortChoices="true" ecoreFeature="ecore:EReference UMLDI.ecore#//UmlDiagramElement/umlModelElement"/>
@@ -69,6 +74,7 @@
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
           propertySortChoices="true" ecoreFeature="ecore:EReference UMLDI.ecore#//UmlEdge/targetUmlDiagramElement"/>
     </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLDI.ecore#//UmlShape"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLDI.ecore#//UmlCompartment">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UMLDI.ecore#//UmlCompartment/kind"/>
     </genClasses>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.notation b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.notation
index b89559a3acd..d8356e329b0 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.notation
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.notation
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI 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">
-  <notation:Diagram xmi:id="_-tcaIPp3EeOzRJ7_zNC4UA" type="PapyrusUMLClassDiagram" name="UMLDiagramElement" measurementUnit="Pixel">
+  <notation:Diagram xmi:id="_-tcaIPp3EeOzRJ7_zNC4UA" type="PapyrusUMLClassDiagram" name="UmlDiagramElement" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_jZYAIP5VEeObup8tdlL4zw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jZgjAP5VEeObup8tdlL4zw" source="ShadowFigure">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jZgjAf5VEeObup8tdlL4zw" key="ShadowFigure_Value" value="false"/>
@@ -311,7 +311,7 @@
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fVF1AgkOEeSM9dpvq2CG1g" points="[-69, -61, 200, 174]$[-269, -235, 0, 0]"/>
     </edges>
   </notation:Diagram>
-  <notation:Diagram xmi:id="_eqyvEP8vEeObup8tdlL4zw" type="PapyrusUMLClassDiagram" name="UMLDiagram" measurementUnit="Pixel">
+  <notation:Diagram xmi:id="_eqyvEP8vEeObup8tdlL4zw" type="PapyrusUMLClassDiagram" name="UmlDiagram" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_gGDzMP8vEeObup8tdlL4zw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gGEaQP8vEeObup8tdlL4zw" source="ShadowFigure">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gGEaQf8vEeObup8tdlL4zw" key="ShadowFigure_Value" value="false"/>
@@ -324,6 +324,10 @@
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_gGEaRv8vEeObup8tdlL4zw" type="5029"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_gGEaR_8vEeObup8tdlL4zw" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_zzakcBVxEeSbve-DNFls6A" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="UMLDI.uml#_zzOXMBVxEeSbve-DNFls6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_zzakcRVxEeSbve-DNFls6A"/>
+        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_gGEaSP8vEeObup8tdlL4zw"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_gGEaSf8vEeObup8tdlL4zw"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_gGEaSv8vEeObup8tdlL4zw"/>
@@ -346,7 +350,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gGMWEv8vEeObup8tdlL4zw"/>
       </children>
       <element xmi:type="uml:Class" href="UMLDI.uml#UMLDiagram"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gGDzMf8vEeObup8tdlL4zw" x="185" y="99" height="62"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gGDzMf8vEeObup8tdlL4zw" x="100" y="118" height="62"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_gGPZYP8vEeObup8tdlL4zw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gGQAcP8vEeObup8tdlL4zw" source="ShadowFigure">
@@ -384,41 +388,69 @@
       <element xmi:type="uml:Class" href="platform:/resource/org.eclipse.papyrus.dd/model/DI.uml#Diagram"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gGPZYf8vEeObup8tdlL4zw" x="185" y="18" height="41"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_FUooYAbgEeSMUp1tRQHOJw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FUooYQbgEeSMUp1tRQHOJw" source="ShadowFigure">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FUooYgbgEeSMUp1tRQHOJw" key="ShadowFigure_Value" value="false"/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FUooYwbgEeSMUp1tRQHOJw" source="displayNameLabelIcon">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FUooZAbgEeSMUp1tRQHOJw" key="displayNameLabelIcon_value" value="false"/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FUooZQbgEeSMUp1tRQHOJw" source="QualifiedName">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FUooZgbgEeSMUp1tRQHOJw" key="QualifiedNameDepth" value="1000"/>
-      </eAnnotations>
-      <children xmi:type="notation:DecorationNode" xmi:id="_FUooZwbgEeSMUp1tRQHOJw" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_FUooaAbgEeSMUp1tRQHOJw" visible="false" type="7017">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_FUooaQbgEeSMUp1tRQHOJw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_FUooagbgEeSMUp1tRQHOJw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_FUooawbgEeSMUp1tRQHOJw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FUoobAbgEeSMUp1tRQHOJw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_FUoobQbgEeSMUp1tRQHOJw" visible="false" type="7018">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_FUoobgbgEeSMUp1tRQHOJw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_FUoobwbgEeSMUp1tRQHOJw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_FUoocAbgEeSMUp1tRQHOJw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FUoocQbgEeSMUp1tRQHOJw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_FUoocgbgEeSMUp1tRQHOJw" visible="false" type="7019">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_FUoocwbgEeSMUp1tRQHOJw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_FUoodAbgEeSMUp1tRQHOJw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_FUoodQbgEeSMUp1tRQHOJw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FUoodgbgEeSMUp1tRQHOJw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_FUoodwbgEeSMUp1tRQHOJw" visible="false" type="compartment_shape_display">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_FUooeAbgEeSMUp1tRQHOJw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FUooeQbgEeSMUp1tRQHOJw"/>
+    <children xmi:type="notation:Shape" xmi:id="_raET4BVxEeSbve-DNFls6A" type="2006" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_raE68BVxEeSbve-DNFls6A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_raE68RVxEeSbve-DNFls6A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_raFiABVxEeSbve-DNFls6A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_raFiARVxEeSbve-DNFls6A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_raFiAhVxEeSbve-DNFls6A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_raFiAxVxEeSbve-DNFls6A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_raFiBBVxEeSbve-DNFls6A" type="5023"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_raFiBRVxEeSbve-DNFls6A" type="7015">
+        <children xmi:type="notation:Shape" xmi:id="_utnIQBVxEeSbve-DNFls6A" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="UMLDI.uml#_utelYBVxEeSbve-DNFls6A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_utnIQRVxEeSbve-DNFls6A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_raFiBhVxEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_raFiBxVxEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_raFiCBVxEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_raFiCRVxEeSbve-DNFls6A"/>
       </children>
-      <element xmi:type="uml:Class" href="UMLDI.uml#UMLShape"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FUooegbgEeSMUp1tRQHOJw" x="40" y="19" height="41"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_raMPsBVxEeSbve-DNFls6A" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_raMPsRVxEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_raMPshVxEeSbve-DNFls6A"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="UMLDI.uml#_rZ7J8BVxEeSbve-DNFls6A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_raET4RVxEeSbve-DNFls6A" x="360" y="20" width="121"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_m2ao4BV5EeSbve-DNFls6A" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m2ao4RV5EeSbve-DNFls6A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m2ao4hV5EeSbve-DNFls6A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m2ao4xV5EeSbve-DNFls6A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m2ao5BV5EeSbve-DNFls6A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m2ao5RV5EeSbve-DNFls6A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m2ao5hV5EeSbve-DNFls6A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_m2ao5xV5EeSbve-DNFls6A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_m2ao6BV5EeSbve-DNFls6A" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_m2ao6RV5EeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_m2ao6hV5EeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_m2ao6xV5EeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m2ao7BV5EeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_m2ao7RV5EeSbve-DNFls6A" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_m2ao7hV5EeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_m2ao7xV5EeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_m2ao8BV5EeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m2ao8RV5EeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_m2ao8hV5EeSbve-DNFls6A" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_m2ao8xV5EeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_m2ao9BV5EeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_m2ao9RV5EeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m2ao9hV5EeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_m2ao9xV5EeSbve-DNFls6A" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_m2ao-BV5EeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m2ao-RV5EeSbve-DNFls6A"/>
+      </children>
+      <element xmi:type="uml:Class" href="UMLDI.uml#UMLDiagramElement"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m2ao-hV5EeSbve-DNFls6A" x="40" y="19" width="121" height="41"/>
     </children>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_eqyvEf8vEeObup8tdlL4zw"/>
     <element xmi:type="uml:Package" href="UMLDI.uml#_0"/>
@@ -430,17 +462,16 @@
       <element xmi:type="uml:Generalization" href="UMLDI.uml#UMLDiagram-_generalization.0"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gGa_kv8vEeObup8tdlL4zw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_gYlGkP8vEeObup8tdlL4zw" type="4002" source="_gGDzMP8vEeObup8tdlL4zw" target="_FUooYAbgEeSMUp1tRQHOJw" lineColor="0">
+    <edges xmi:type="notation:Connector" xmi:id="_gYlGkP8vEeObup8tdlL4zw" type="4002" source="_gGDzMP8vEeObup8tdlL4zw" target="_m2ao4BV5EeSbve-DNFls6A" lineColor="0">
       <children xmi:type="notation:DecorationNode" xmi:id="_gYltoP8vEeObup8tdlL4zw" type="6007">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_gYltof8vEeObup8tdlL4zw" y="40"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_gYlGkf8vEeObup8tdlL4zw" fontName="Lucida Grande" fontHeight="11"/>
       <element xmi:type="uml:Generalization" href="UMLDI.uml#UMLDiagram-_generalization.2"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gYlGkv8vEeObup8tdlL4zw" points="[-36, -50, 244, 342]$[-280, -392, 0, 0]"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IuECUAbgEeSMUp1tRQHOJw" id="(0.8,1.0)"/>
     </edges>
   </notation:Diagram>
-  <notation:Diagram xmi:id="_yGSecP8vEeObup8tdlL4zw" type="PapyrusUMLClassDiagram" name="UMLShape" measurementUnit="Pixel">
+  <notation:Diagram xmi:id="_yGSecP8vEeObup8tdlL4zw" type="PapyrusUMLClassDiagram" name="UmlShape" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_-rzNcP8vEeObup8tdlL4zw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-rz0gP8vEeObup8tdlL4zw" source="ShadowFigure">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-rz0gf8vEeObup8tdlL4zw" key="ShadowFigure_Value" value="false"/>
@@ -477,42 +508,6 @@
       <element xmi:type="uml:Class" href="UMLDI.uml#UMLShape"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-rzNcf8vEeObup8tdlL4zw" x="160" y="100" height="61"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_-r-zoP8vEeObup8tdlL4zw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-r-zov8vEeObup8tdlL4zw" source="ShadowFigure">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-r-zo_8vEeObup8tdlL4zw" key="ShadowFigure_Value" value="false"/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-r-zpP8vEeObup8tdlL4zw" source="displayNameLabelIcon">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-r-zpf8vEeObup8tdlL4zw" key="displayNameLabelIcon_value" value="false"/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-r_asP8vEeObup8tdlL4zw" source="QualifiedName">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-r_asf8vEeObup8tdlL4zw" key="QualifiedNameDepth" value="1000"/>
-      </eAnnotations>
-      <children xmi:type="notation:DecorationNode" xmi:id="_-r_asv8vEeObup8tdlL4zw" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_-r_as_8vEeObup8tdlL4zw" visible="false" type="7017">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_-r_atP8vEeObup8tdlL4zw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_-r_atf8vEeObup8tdlL4zw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_-r_atv8vEeObup8tdlL4zw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-r_at_8vEeObup8tdlL4zw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_-r_auP8vEeObup8tdlL4zw" visible="false" type="7018">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_-r_auf8vEeObup8tdlL4zw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_-r_auv8vEeObup8tdlL4zw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_-r_au_8vEeObup8tdlL4zw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-r_avP8vEeObup8tdlL4zw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_-r_avf8vEeObup8tdlL4zw" visible="false" type="7019">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_-r_avv8vEeObup8tdlL4zw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_-r_av_8vEeObup8tdlL4zw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_-r_awP8vEeObup8tdlL4zw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-r_awf8vEeObup8tdlL4zw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_-sGvcP8vEeObup8tdlL4zw" visible="false" type="compartment_shape_display">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_-sGvcf8vEeObup8tdlL4zw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-sGvcv8vEeObup8tdlL4zw"/>
-      </children>
-      <element xmi:type="uml:Class" href="platform:/resource/org.eclipse.papyrus.dd/model/DI.uml#Shape"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-r-zof8vEeObup8tdlL4zw" x="220" y="19" height="41"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="__CqOQP8vEeObup8tdlL4zw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__CqOQv8vEeObup8tdlL4zw" source="ShadowFigure">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__CqOQ_8vEeObup8tdlL4zw" key="ShadowFigure_Value" value="false"/>
@@ -549,155 +544,52 @@
       <element xmi:type="uml:Class" href="UMLDI.uml#UMLDiagramElement"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="__CqOQf8vEeObup8tdlL4zw" x="60" y="20" width="121" height="41"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_bdoekBO_EeSXerk-XJQMGw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bdpFoBO_EeSXerk-XJQMGw" source="ShadowFigure">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bdpFoRO_EeSXerk-XJQMGw" key="ShadowFigure_Value" value="false"/>
+    <children xmi:type="notation:Shape" xmi:id="_xHTaABmDEeSbeugf5fno3w" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xHTaARmDEeSbeugf5fno3w" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xHTaAhmDEeSbeugf5fno3w" key="ShadowFigure_Value" value="false"/>
       </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bdpFohO_EeSXerk-XJQMGw" source="displayNameLabelIcon">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bdpFoxO_EeSXerk-XJQMGw" key="displayNameLabelIcon_value" value="false"/>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xHTaAxmDEeSbeugf5fno3w" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xHTaBBmDEeSbeugf5fno3w" key="displayNameLabelIcon_value" value="false"/>
       </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bdpFpBO_EeSXerk-XJQMGw" source="QualifiedName">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bdpFpRO_EeSXerk-XJQMGw" key="QualifiedNameDepth" value="1000"/>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xHTaBRmDEeSbeugf5fno3w" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xHTaBhmDEeSbeugf5fno3w" key="QualifiedNameDepth" value="1000"/>
       </eAnnotations>
-      <children xmi:type="notation:DecorationNode" xmi:id="_bdpFphO_EeSXerk-XJQMGw" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_bdpFpxO_EeSXerk-XJQMGw" type="7017">
-        <children xmi:type="notation:Shape" xmi:id="_yCyREBPAEeSXerk-XJQMGw" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
-          <element xmi:type="uml:Property" href="UMLDI.uml#_yCxC8BPAEeSXerk-XJQMGw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_yCyRERPAEeSXerk-XJQMGw"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_bdpFqBO_EeSXerk-XJQMGw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_bdpFqRO_EeSXerk-XJQMGw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_bdpFqhO_EeSXerk-XJQMGw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bdpFqxO_EeSXerk-XJQMGw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_bdpFrBO_EeSXerk-XJQMGw" visible="false" type="7018">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_bdpFrRO_EeSXerk-XJQMGw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_bdpFrhO_EeSXerk-XJQMGw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_bdpFrxO_EeSXerk-XJQMGw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bdpFsBO_EeSXerk-XJQMGw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_bdpssBO_EeSXerk-XJQMGw" visible="false" type="7019">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_bdpssRO_EeSXerk-XJQMGw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_bdpsshO_EeSXerk-XJQMGw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_bdpssxO_EeSXerk-XJQMGw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bdpstBO_EeSXerk-XJQMGw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_bd158BO_EeSXerk-XJQMGw" visible="false" type="compartment_shape_display">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_bd158RO_EeSXerk-XJQMGw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bd158hO_EeSXerk-XJQMGw"/>
-      </children>
-      <element xmi:type="uml:Class" href="UMLDI.uml#_bdk0MBO_EeSXerk-XJQMGw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bdoekRO_EeSXerk-XJQMGw" x="20" y="220" width="201" height="61"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_RqrhUBPAEeSXerk-XJQMGw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RqsIYBPAEeSXerk-XJQMGw" source="ShadowFigure">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RqsIYRPAEeSXerk-XJQMGw" key="ShadowFigure_Value" value="false"/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RqsIYhPAEeSXerk-XJQMGw" source="displayNameLabelIcon">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RqsIYxPAEeSXerk-XJQMGw" key="displayNameLabelIcon_value" value="false"/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RqsIZBPAEeSXerk-XJQMGw" source="QualifiedName">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RqsIZRPAEeSXerk-XJQMGw" key="QualifiedNameDepth" value="1000"/>
-      </eAnnotations>
-      <children xmi:type="notation:DecorationNode" xmi:id="_RqsIZhPAEeSXerk-XJQMGw" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_RqsIZxPAEeSXerk-XJQMGw" type="7017">
-        <children xmi:type="notation:Shape" xmi:id="_v1Ts4BPAEeSXerk-XJQMGw" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
-          <element xmi:type="uml:Property" href="UMLDI.uml#_v1SewBPAEeSXerk-XJQMGw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_v1Ts4RPAEeSXerk-XJQMGw"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_RqsIaBPAEeSXerk-XJQMGw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_RqsIaRPAEeSXerk-XJQMGw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_RqsIahPAEeSXerk-XJQMGw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RqsIaxPAEeSXerk-XJQMGw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_RqsIbBPAEeSXerk-XJQMGw" visible="false" type="7018">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_RqsIbRPAEeSXerk-XJQMGw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_RqsIbhPAEeSXerk-XJQMGw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_RqsIbxPAEeSXerk-XJQMGw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RqsIcBPAEeSXerk-XJQMGw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_RqsvcBPAEeSXerk-XJQMGw" visible="false" type="7019">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_RqsvcRPAEeSXerk-XJQMGw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_RqsvchPAEeSXerk-XJQMGw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_RqsvcxPAEeSXerk-XJQMGw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RqsvdBPAEeSXerk-XJQMGw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_RqzdIBPAEeSXerk-XJQMGw" visible="false" type="compartment_shape_display">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_RqzdIRPAEeSXerk-XJQMGw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RqzdIhPAEeSXerk-XJQMGw"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xHTaBxmDEeSbeugf5fno3w" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_xHTaCBmDEeSbeugf5fno3w" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xHTaCRmDEeSbeugf5fno3w"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xHTaChmDEeSbeugf5fno3w"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xHTaCxmDEeSbeugf5fno3w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xHTaDBmDEeSbeugf5fno3w"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_xHTaDRmDEeSbeugf5fno3w" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xHTaDhmDEeSbeugf5fno3w"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xHTaDxmDEeSbeugf5fno3w"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xHTaEBmDEeSbeugf5fno3w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xHTaERmDEeSbeugf5fno3w"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_xHTaEhmDEeSbeugf5fno3w" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xHTaExmDEeSbeugf5fno3w"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xHTaFBmDEeSbeugf5fno3w"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xHTaFRmDEeSbeugf5fno3w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xHTaFhmDEeSbeugf5fno3w"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_xHTaFxmDEeSbeugf5fno3w" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xHTaGBmDEeSbeugf5fno3w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xHTaGRmDEeSbeugf5fno3w"/>
       </children>
-      <element xmi:type="uml:Class" href="UMLDI.uml#_RqpFEBPAEeSXerk-XJQMGw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RqrhURPAEeSXerk-XJQMGw" x="251" y="220" height="61"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_dtlSgBPAEeSXerk-XJQMGw" type="2006" fontName="Lucida Grande" fontHeight="11" lineColor="0">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dtl5kBPAEeSXerk-XJQMGw" source="ShadowFigure">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dtl5kRPAEeSXerk-XJQMGw" key="ShadowFigure_Value" value="false"/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dtl5khPAEeSXerk-XJQMGw" source="displayNameLabelIcon">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dtl5kxPAEeSXerk-XJQMGw" key="displayNameLabelIcon_value" value="false"/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dtl5lBPAEeSXerk-XJQMGw" source="QualifiedName">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dtl5lRPAEeSXerk-XJQMGw" key="QualifiedNameDepth" value="1000"/>
-      </eAnnotations>
-      <children xmi:type="notation:DecorationNode" xmi:id="_dtl5lhPAEeSXerk-XJQMGw" type="5023"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_dtl5lxPAEeSXerk-XJQMGw" type="7015">
-        <children xmi:type="notation:Shape" xmi:id="_fytL8BPAEeSXerk-XJQMGw" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
-          <element xmi:type="uml:EnumerationLiteral" href="UMLDI.uml#_fyphkBPAEeSXerk-XJQMGw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_fytL8RPAEeSXerk-XJQMGw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_hUwNgBPAEeSXerk-XJQMGw" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
-          <element xmi:type="uml:EnumerationLiteral" href="UMLDI.uml#_hUu_YBPAEeSXerk-XJQMGw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_hUwNgRPAEeSXerk-XJQMGw"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_dtl5mBPAEeSXerk-XJQMGw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_dtl5mRPAEeSXerk-XJQMGw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_dtl5mhPAEeSXerk-XJQMGw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtl5mxPAEeSXerk-XJQMGw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_dtqyEBPAEeSXerk-XJQMGw" visible="false" type="compartment_shape_display">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_dtqyERPAEeSXerk-XJQMGw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtqyEhPAEeSXerk-XJQMGw"/>
-      </children>
-      <element xmi:type="uml:Enumeration" href="UMLDI.uml#_dtjdUBPAEeSXerk-XJQMGw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtlSgRPAEeSXerk-XJQMGw" x="420" y="20" width="141"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_mkwukBPAEeSXerk-XJQMGw" type="2006" fontName="Lucida Grande" fontHeight="11" lineColor="0">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mkxVoBPAEeSXerk-XJQMGw" source="ShadowFigure">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mkxVoRPAEeSXerk-XJQMGw" key="ShadowFigure_Value" value="false"/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mkxVohPAEeSXerk-XJQMGw" source="displayNameLabelIcon">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mkxVoxPAEeSXerk-XJQMGw" key="displayNameLabelIcon_value" value="false"/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mkxVpBPAEeSXerk-XJQMGw" source="QualifiedName">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mkxVpRPAEeSXerk-XJQMGw" key="QualifiedNameDepth" value="1000"/>
-      </eAnnotations>
-      <children xmi:type="notation:DecorationNode" xmi:id="_mkxVphPAEeSXerk-XJQMGw" type="5023"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_mkxVpxPAEeSXerk-XJQMGw" type="7015">
-        <children xmi:type="notation:Shape" xmi:id="_rrzg4BPAEeSXerk-XJQMGw" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
-          <element xmi:type="uml:EnumerationLiteral" href="UMLDI.uml#_rrySwBPAEeSXerk-XJQMGw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rrzg4RPAEeSXerk-XJQMGw"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_mkxVqBPAEeSXerk-XJQMGw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_mkxVqRPAEeSXerk-XJQMGw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_mkxVqhPAEeSXerk-XJQMGw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mkxVqxPAEeSXerk-XJQMGw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_mk1nEBPAEeSXerk-XJQMGw" visible="false" type="compartment_shape_display">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_mk1nERPAEeSXerk-XJQMGw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mk1nEhPAEeSXerk-XJQMGw"/>
-      </children>
-      <element xmi:type="uml:Enumeration" href="UMLDI.uml#_mku5YBPAEeSXerk-XJQMGw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mkwukRPAEeSXerk-XJQMGw" x="440" y="160"/>
+      <element xmi:type="uml:Class" href="platform:/resource/org.eclipse.papyrus.dd/model/DI.uml#Shape"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xHTaGhmDEeSbeugf5fno3w" x="220" y="20" height="41"/>
     </children>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_yGSecf8vEeObup8tdlL4zw"/>
     <element xmi:type="uml:Package" href="UMLDI.uml#_0"/>
-    <edges xmi:type="notation:Connector" xmi:id="_-sKZ0P8vEeObup8tdlL4zw" type="4002" source="_-rzNcP8vEeObup8tdlL4zw" target="_-r-zoP8vEeObup8tdlL4zw" lineColor="0">
+    <edges xmi:type="notation:Connector" xmi:id="_-sKZ0P8vEeObup8tdlL4zw" type="4002" source="_-rzNcP8vEeObup8tdlL4zw" target="_xHTaABmDEeSbeugf5fno3w" lineColor="0">
       <children xmi:type="notation:DecorationNode" xmi:id="_-sKZ0_8vEeObup8tdlL4zw" type="6007">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_-sKZ1P8vEeObup8tdlL4zw" y="40"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_-sKZ0f8vEeObup8tdlL4zw" fontName="Lucida Grande" fontHeight="11"/>
       <element xmi:type="uml:Generalization" href="UMLDI.uml#UMLShape-_generalization.0"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-sKZ0v8vEeObup8tdlL4zw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zyL7wBV5EeSbve-DNFls6A" id="(0.6,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="__C10cP8vEeObup8tdlL4zw" type="4002" source="_-rzNcP8vEeObup8tdlL4zw" target="__CqOQP8vEeObup8tdlL4zw" lineColor="0">
       <children xmi:type="notation:DecorationNode" xmi:id="__C2bgP8vEeObup8tdlL4zw" type="6007">
@@ -707,24 +599,8 @@
       <element xmi:type="uml:Generalization" href="UMLDI.uml#UMLShape-_generalization.1"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__C10cv8vEeObup8tdlL4zw" points="[-47, -50, 181, 193]$[-228, -243, 0, 0]"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_zI4L4BO_EeSXerk-XJQMGw" type="4002" source="_bdoekBO_EeSXerk-XJQMGw" target="_-rzNcP8vEeObup8tdlL4zw" lineColor="0">
-      <children xmi:type="notation:DecorationNode" xmi:id="_zI4y8BO_EeSXerk-XJQMGw" type="6007">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zI4y8RO_EeSXerk-XJQMGw" y="40"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_zI4L4RO_EeSXerk-XJQMGw" fontName="Lucida Grande" fontHeight="11"/>
-      <element xmi:type="uml:Generalization" href="UMLDI.uml#_zIr-oBO_EeSXerk-XJQMGw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zI4L4hO_EeSXerk-XJQMGw" points="[-40, -30, 81, 61]$[-100, -93, 21, -2]"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_XTTWsBPAEeSXerk-XJQMGw" type="4002" source="_RqrhUBPAEeSXerk-XJQMGw" target="_-rzNcP8vEeObup8tdlL4zw" lineColor="0">
-      <children xmi:type="notation:DecorationNode" xmi:id="_XTT9wBPAEeSXerk-XJQMGw" type="6007">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XTT9wRPAEeSXerk-XJQMGw" y="40"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_XTTWsRPAEeSXerk-XJQMGw" fontName="Lucida Grande" fontHeight="11"/>
-      <element xmi:type="uml:Generalization" href="UMLDI.uml#_XTSIkBPAEeSXerk-XJQMGw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XTTWshPAEeSXerk-XJQMGw" points="[-44, -30, 136, 90]$[-130, -113, 50, 7]"/>
-    </edges>
   </notation:Diagram>
-  <notation:Diagram xmi:id="_zh2dgP8vEeObup8tdlL4zw" type="PapyrusUMLClassDiagram" name="UMLEdge" measurementUnit="Pixel">
+  <notation:Diagram xmi:id="_zh2dgP8vEeObup8tdlL4zw" type="PapyrusUMLClassDiagram" name="UmlEdge" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_qoxukP8wEeObup8tdlL4zw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qoxukv8wEeObup8tdlL4zw" source="ShadowFigure">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qoxuk_8wEeObup8tdlL4zw" key="ShadowFigure_Value" value="false"/>
@@ -899,4 +775,334 @@
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uT5NcgbbEeSMUp1tRQHOJw" points="[-30, 21, -290, -109]$[-30, 120, -290, -10]$[210, 120, -50, -10]"/>
     </edges>
   </notation:Diagram>
+  <notation:Diagram xmi:id="_nLnL4BVwEeSbve-DNFls6A" type="PapyrusUMLClassDiagram" name="UmlLabel" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_wZCkwBVwEeSbve-DNFls6A" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wZCkwRVwEeSbve-DNFls6A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wZCkwhVwEeSbve-DNFls6A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wZCkwxVwEeSbve-DNFls6A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wZCkxBVwEeSbve-DNFls6A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wZCkxRVwEeSbve-DNFls6A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wZCkxhVwEeSbve-DNFls6A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_wZCkxxVwEeSbve-DNFls6A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wZCkyBVwEeSbve-DNFls6A" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wZCkyRVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wZCkyhVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wZCkyxVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZCkzBVwEeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wZCkzRVwEeSbve-DNFls6A" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wZCkzhVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wZCkzxVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wZCk0BVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZCk0RVwEeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wZCk0hVwEeSbve-DNFls6A" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wZCk0xVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wZCk1BVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wZCk1RVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZCk1hVwEeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wZCk1xVwEeSbve-DNFls6A" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wZCk2BVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZCk2RVwEeSbve-DNFls6A"/>
+      </children>
+      <element xmi:type="uml:Class" href="platform:/resource/org.eclipse.papyrus.dd/model/DI.uml#Shape"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZCk2hVwEeSbve-DNFls6A" x="230" y="29" height="41"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_wZCk2xVwEeSbve-DNFls6A" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wZCk3BVwEeSbve-DNFls6A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wZCk3RVwEeSbve-DNFls6A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wZCk3hVwEeSbve-DNFls6A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wZCk3xVwEeSbve-DNFls6A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wZCk4BVwEeSbve-DNFls6A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wZCk4RVwEeSbve-DNFls6A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_wZCk4hVwEeSbve-DNFls6A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wZCk4xVwEeSbve-DNFls6A" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wZCk5BVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wZCk5RVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wZCk5hVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZCk5xVwEeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wZCk6BVwEeSbve-DNFls6A" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wZCk6RVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wZCk6hVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wZCk6xVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZCk7BVwEeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wZCk7RVwEeSbve-DNFls6A" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wZCk7hVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wZCk7xVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wZCk8BVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZCk8RVwEeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wZCk8hVwEeSbve-DNFls6A" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wZCk8xVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZCk9BVwEeSbve-DNFls6A"/>
+      </children>
+      <element xmi:type="uml:Class" href="UMLDI.uml#UMLDiagramElement"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZCk9RVwEeSbve-DNFls6A" x="70" y="30" width="121" height="41"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_wZDL0BVwEeSbve-DNFls6A" type="2006" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wZDL0RVwEeSbve-DNFls6A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wZDL0hVwEeSbve-DNFls6A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wZDL0xVwEeSbve-DNFls6A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wZDL1BVwEeSbve-DNFls6A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wZDL1RVwEeSbve-DNFls6A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wZDL1hVwEeSbve-DNFls6A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_wZDL1xVwEeSbve-DNFls6A" type="5023"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wZDL2BVwEeSbve-DNFls6A" type="7015">
+        <children xmi:type="notation:Shape" xmi:id="_wZDL2RVwEeSbve-DNFls6A" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="UMLDI.uml#_rrySwBPAEeSXerk-XJQMGw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_wZDL2hVwEeSbve-DNFls6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_jMmf4BlmEeSbeugf5fno3w" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="UMLDI.uml#_jMkDoBlmEeSbeugf5fno3w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_jMmf4RlmEeSbeugf5fno3w"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wZDL2xVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wZDL3BVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wZDL3RVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZDL3hVwEeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wZDL3xVwEeSbve-DNFls6A" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wZDL4BVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZDL4RVwEeSbve-DNFls6A"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="UMLDI.uml#_mku5YBPAEeSXerk-XJQMGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZDL4hVwEeSbve-DNFls6A" x="383" y="26"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_wZEaBRVwEeSbve-DNFls6A" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wZEaBhVwEeSbve-DNFls6A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wZEaBxVwEeSbve-DNFls6A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wZEaCBVwEeSbve-DNFls6A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wZEaCRVwEeSbve-DNFls6A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wZEaChVwEeSbve-DNFls6A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wZEaCxVwEeSbve-DNFls6A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_wZEaDBVwEeSbve-DNFls6A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wZEaDRVwEeSbve-DNFls6A" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_wZEaDhVwEeSbve-DNFls6A" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="UMLDI.uml#_v1SewBPAEeSXerk-XJQMGw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_wZEaDxVwEeSbve-DNFls6A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wZEaEBVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wZEaERVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wZEaEhVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZEaExVwEeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wZFBABVwEeSbve-DNFls6A" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wZFBARVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wZFBAhVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wZFBAxVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZFBBBVwEeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wZFBBRVwEeSbve-DNFls6A" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wZFBBhVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wZFBBxVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wZFBCBVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZFBCRVwEeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wZFBChVwEeSbve-DNFls6A" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wZFBCxVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZFBDBVwEeSbve-DNFls6A"/>
+      </children>
+      <element xmi:type="uml:Class" href="UMLDI.uml#_RqpFEBPAEeSXerk-XJQMGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZFBDRVwEeSbve-DNFls6A" x="128" y="124" height="61"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_nLnL4RVwEeSbve-DNFls6A"/>
+    <element xmi:type="uml:Package" href="UMLDI.uml#_0"/>
+    <edges xmi:type="notation:Connector" xmi:id="_wZBWpRVwEeSbve-DNFls6A" type="4002" source="_wZEaBRVwEeSbve-DNFls6A" target="_wZCkwBVwEeSbve-DNFls6A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_wZBWphVwEeSbve-DNFls6A" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_wZBWpxVwEeSbve-DNFls6A" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_wZBWqBVwEeSbve-DNFls6A" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="UMLDI.uml#_XTSIkBPAEeSXerk-XJQMGw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wZBWqRVwEeSbve-DNFls6A" points="[-44, -30, 136, 90]$[-130, -113, 50, 7]"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_16Jc4BVwEeSbve-DNFls6A" id="(0.81,0.7804878048780488)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_5Hx2gBVwEeSbve-DNFls6A" type="4002" source="_wZEaBRVwEeSbve-DNFls6A" target="_wZCk2xVwEeSbve-DNFls6A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_5HzrsBVwEeSbve-DNFls6A" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5H0SwBVwEeSbve-DNFls6A" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_5Hx2gRVwEeSbve-DNFls6A" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="UMLDI.uml#_5HKLcBVwEeSbve-DNFls6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5Hx2ghVwEeSbve-DNFls6A" points="[-25, -30, 179, 180]$[-143, -216, 61, -6]"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_tjU74BVwEeSbve-DNFls6A" type="PapyrusUMLClassDiagram" name="UmlCompartment" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_wxv_sBVwEeSbve-DNFls6A" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wxv_sRVwEeSbve-DNFls6A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wxv_shVwEeSbve-DNFls6A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wxv_sxVwEeSbve-DNFls6A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wxv_tBVwEeSbve-DNFls6A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wxv_tRVwEeSbve-DNFls6A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wxv_thVwEeSbve-DNFls6A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_wxv_txVwEeSbve-DNFls6A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wxv_uBVwEeSbve-DNFls6A" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wxv_uRVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wxv_uhVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wxv_uxVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wxv_vBVwEeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wxv_vRVwEeSbve-DNFls6A" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wxv_vhVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wxv_vxVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wxv_wBVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wxv_wRVwEeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wxv_whVwEeSbve-DNFls6A" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wxv_wxVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wxv_xBVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wxv_xRVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wxv_xhVwEeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wxv_xxVwEeSbve-DNFls6A" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wxv_yBVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wxv_yRVwEeSbve-DNFls6A"/>
+      </children>
+      <element xmi:type="uml:Class" href="UMLDI.uml#UMLDiagramElement"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wxv_yhVwEeSbve-DNFls6A" x="62" y="26" width="121" height="41"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_wxxN2hVwEeSbve-DNFls6A" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wxxN2xVwEeSbve-DNFls6A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wxxN3BVwEeSbve-DNFls6A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wxxN3RVwEeSbve-DNFls6A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wxxN3hVwEeSbve-DNFls6A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wxxN3xVwEeSbve-DNFls6A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wxxN4BVwEeSbve-DNFls6A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_wxxN4RVwEeSbve-DNFls6A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wxxN4hVwEeSbve-DNFls6A" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_wxxN4xVwEeSbve-DNFls6A" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="UMLDI.uml#_yCxC8BPAEeSXerk-XJQMGw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_wxxN5BVwEeSbve-DNFls6A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wxxN5RVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wxxN5hVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wxxN5xVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wxxN6BVwEeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wxxN6RVwEeSbve-DNFls6A" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wxxN6hVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wxxN6xVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wxxN7BVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wxxN7RVwEeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wxxN7hVwEeSbve-DNFls6A" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wxxN7xVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wxxN8BVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wxxN8RVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wxxN8hVwEeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wxxN8xVwEeSbve-DNFls6A" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wxxN9BVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wxxN9RVwEeSbve-DNFls6A"/>
+      </children>
+      <element xmi:type="uml:Class" href="UMLDI.uml#_bdk0MBO_EeSXerk-XJQMGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wxxN9hVwEeSbve-DNFls6A" x="93" y="138" width="201" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_wxx04BVwEeSbve-DNFls6A" type="2006" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wxx04RVwEeSbve-DNFls6A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wxx04hVwEeSbve-DNFls6A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wxx04xVwEeSbve-DNFls6A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wxx05BVwEeSbve-DNFls6A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wxx05RVwEeSbve-DNFls6A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wxx05hVwEeSbve-DNFls6A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_wxx05xVwEeSbve-DNFls6A" type="5023"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wxyb8BVwEeSbve-DNFls6A" type="7015">
+        <children xmi:type="notation:Shape" xmi:id="_wxyb8RVwEeSbve-DNFls6A" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="UMLDI.uml#_fyphkBPAEeSXerk-XJQMGw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_wxyb8hVwEeSbve-DNFls6A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_wxyb8xVwEeSbve-DNFls6A" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="UMLDI.uml#_hUu_YBPAEeSXerk-XJQMGw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_wxyb9BVwEeSbve-DNFls6A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wxyb9RVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wxyb9hVwEeSbve-DNFls6A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wxyb9xVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wxyb-BVwEeSbve-DNFls6A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wxyb-RVwEeSbve-DNFls6A" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wxyb-hVwEeSbve-DNFls6A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wxyb-xVwEeSbve-DNFls6A"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="UMLDI.uml#_dtjdUBPAEeSXerk-XJQMGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wxyb_BVwEeSbve-DNFls6A" x="430" y="30" width="141"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_0806EBmDEeSbeugf5fno3w" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0806ERmDEeSbeugf5fno3w" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0806EhmDEeSbeugf5fno3w" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0806ExmDEeSbeugf5fno3w" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0806FBmDEeSbeugf5fno3w" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0806FRmDEeSbeugf5fno3w" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0806FhmDEeSbeugf5fno3w" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0806FxmDEeSbeugf5fno3w" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0806GBmDEeSbeugf5fno3w" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0806GRmDEeSbeugf5fno3w"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0806GhmDEeSbeugf5fno3w"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0806GxmDEeSbeugf5fno3w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0806HBmDEeSbeugf5fno3w"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0806HRmDEeSbeugf5fno3w" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0806HhmDEeSbeugf5fno3w"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0806HxmDEeSbeugf5fno3w"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0806IBmDEeSbeugf5fno3w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0806IRmDEeSbeugf5fno3w"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0806IhmDEeSbeugf5fno3w" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0806IxmDEeSbeugf5fno3w"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0806JBmDEeSbeugf5fno3w"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0806JRmDEeSbeugf5fno3w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0806JhmDEeSbeugf5fno3w"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0806JxmDEeSbeugf5fno3w" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0806KBmDEeSbeugf5fno3w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0806KRmDEeSbeugf5fno3w"/>
+      </children>
+      <element xmi:type="uml:Class" href="platform:/resource/org.eclipse.papyrus.dd/model/DI.uml#Shape"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0806KhmDEeSbeugf5fno3w" x="227" y="26" height="41"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_tjU74RVwEeSbve-DNFls6A"/>
+    <element xmi:type="uml:Package" href="UMLDI.uml#_0"/>
+    <edges xmi:type="notation:Connector" xmi:id="_wxxN0BVwEeSbve-DNFls6A" type="4002" source="_wxxN2hVwEeSbve-DNFls6A" target="_0806EBmDEeSbeugf5fno3w" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_wxxN0RVwEeSbve-DNFls6A" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_wxxN0hVwEeSbve-DNFls6A" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_wxxN0xVwEeSbve-DNFls6A" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="UMLDI.uml#_zIr-oBO_EeSXerk-XJQMGw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wxxN1BVwEeSbve-DNFls6A" points="[-40, -30, 81, 61]$[-100, -93, 21, -2]"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1ljuABmDEeSbeugf5fno3w" id="(0.47,0.8048780487804879)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_HcAxIBVxEeSbve-DNFls6A" type="4002" source="_wxxN2hVwEeSbve-DNFls6A" target="_wxv_sBVwEeSbve-DNFls6A" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_HcBYMBVxEeSbve-DNFls6A" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HcBYMRVxEeSbve-DNFls6A" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_HcAxIRVxEeSbve-DNFls6A" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="UMLDI.uml#_Hb-78BVxEeSbve-DNFls6A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HcAxIhVxEeSbve-DNFls6A" points="[-3, -30, -3, 180]$[-60, -202, -60, 8]"/>
+    </edges>
+  </notation:Diagram>
 </xmi:XMI>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.uml b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.uml
index ba3baa7234b..9d22839aab2 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.uml
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.uml
@@ -8,7 +8,14 @@
       <generalization xmi:type="uml:Generalization" xmi:id="UMLDiagram-_generalization.0">
         <general xmi:type="uml:Class" href="../../org.eclipse.papyrus.dd/model/DI.uml#Diagram"/>
       </generalization>
-      <generalization xmi:type="uml:Generalization" xmi:id="UMLDiagram-_generalization.2" general="UMLShape"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="UMLDiagram-_generalization.2" general="UMLDiagramElement"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_zzOXMBVxEeSbve-DNFls6A" name="kind" visibility="public" type="_rZ7J8BVxEeSbve-DNFls6A">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0SGrkBVxEeSbve-DNFls6A" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0SHSoBVxEeSbve-DNFls6A" value="1"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_0SH5sBVxEeSbve-DNFls6A">
+          <value xsi:nil="true"/>
+        </defaultValue>
+      </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="UMLDiagramElement" name="UmlDiagramElement" isAbstract="true">
       <ownedComment xmi:type="uml:Comment" xmi:id="UMLDiagramElement-_ownedComment.0" annotatedElement="UMLDiagramElement">
@@ -151,7 +158,10 @@
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="A_UMLDiagramElement_ownedElement_owningElement" name="A_ownedUmlDiagramElement_owningUmlDiagramElement" memberEnd="UMLDiagramElement-ownedElement UMLDiagramElement-owningElement"/>
     <packagedElement xmi:type="uml:Class" xmi:id="_bdk0MBO_EeSXerk-XJQMGw" name="UmlCompartment">
-      <generalization xmi:type="uml:Generalization" xmi:id="_zIr-oBO_EeSXerk-XJQMGw" general="UMLShape"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_zIr-oBO_EeSXerk-XJQMGw">
+        <general xmi:type="uml:Class" href="../../org.eclipse.papyrus.dd/model/DI.uml#Shape"/>
+      </generalization>
+      <generalization xmi:type="uml:Generalization" xmi:id="_Hb-78BVxEeSbve-DNFls6A" general="UMLDiagramElement"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_yCxC8BPAEeSXerk-XJQMGw" name="kind" visibility="public" type="_dtjdUBPAEeSXerk-XJQMGw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ySPpYBPAEeSXerk-XJQMGw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ySQQcBPAEeSXerk-XJQMGw" value="1"/>
@@ -161,7 +171,10 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_RqpFEBPAEeSXerk-XJQMGw" name="UmlLabel">
-      <generalization xmi:type="uml:Generalization" xmi:id="_XTSIkBPAEeSXerk-XJQMGw" general="UMLShape"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_XTSIkBPAEeSXerk-XJQMGw">
+        <general xmi:type="uml:Class" href="../../org.eclipse.papyrus.dd/model/DI.uml#Shape"/>
+      </generalization>
+      <generalization xmi:type="uml:Generalization" xmi:id="_5HKLcBVwEeSbve-DNFls6A" general="UMLDiagramElement"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_v1SewBPAEeSXerk-XJQMGw" name="kind" visibility="public" type="_mku5YBPAEeSXerk-XJQMGw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wM2qMBPAEeSXerk-XJQMGw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wM3RQBPAEeSXerk-XJQMGw" value="1"/>
@@ -176,6 +189,10 @@
     </packagedElement>
     <packagedElement xmi:type="uml:Enumeration" xmi:id="_mku5YBPAEeSXerk-XJQMGw" name="UmlLabelKind">
       <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_rrySwBPAEeSXerk-XJQMGw" name="name"/>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_jMkDoBlmEeSbeugf5fno3w" name="multiplicity"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Enumeration" xmi:id="_rZ7J8BVxEeSbve-DNFls6A" name="UmlDiagramKind">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_utelYBVxEeSbve-DNFls6A" name="class"/>
     </packagedElement>
     <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_eGYR4Po2EeOw_Nx9vOEGaA">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eGYR4fo2EeOw_Nx9vOEGaA" source="http://www.eclipse.org/uml2/2.0.0/UML">
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIFactory.java
index e7bd03ccb82..143eba69735 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIFactory.java
@@ -102,4 +102,4 @@ public interface UMLDIFactory extends EFactory {
 	 * @generated
 	 */
 	UMLDIPackage getUMLDIPackage();
-} // UMLDIFactory
+} //UMLDIFactory
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIPackage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIPackage.java
index 2df0686b1fc..96d373f523a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIPackage.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIPackage.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
+
 import org.eclipse.papyrus.dd.di.DIPackage;
 
 /**
@@ -84,7 +85,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlDiagramElement()
 	 * @generated
 	 */
-	int UML_DIAGRAM_ELEMENT = 2;
+	int UML_DIAGRAM_ELEMENT = 1;
 
 	/**
 	 * The feature id for the '<em><b>Model Element</b></em>' reference list.
@@ -266,7 +267,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlStyle()
 	 * @generated
 	 */
-	int UML_STYLE = 3;
+	int UML_STYLE = 2;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl <em>Uml Edge</em>}' class.
@@ -277,7 +278,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlEdge()
 	 * @generated
 	 */
-	int UML_EDGE = 4;
+	int UML_EDGE = 3;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.impl.UmlShapeImpl <em>Uml Shape</em>}' class.
@@ -288,7 +289,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlShape()
 	 * @generated
 	 */
-	int UML_SHAPE = 1;
+	int UML_SHAPE = 4;
 
 	/**
 	 * The feature id for the '<em><b>Model Element</b></em>' reference list.
@@ -298,7 +299,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_SHAPE__MODEL_ELEMENT = UML_DIAGRAM_ELEMENT__MODEL_ELEMENT;
+	int UML_DIAGRAM__MODEL_ELEMENT = UML_DIAGRAM_ELEMENT__MODEL_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
@@ -308,7 +309,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_SHAPE__OWNING_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT;
+	int UML_DIAGRAM__OWNING_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
@@ -318,7 +319,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_SHAPE__OWNED_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT;
+	int UML_DIAGRAM__OWNED_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Local Style</b></em>' reference.
@@ -328,7 +329,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_SHAPE__LOCAL_STYLE = UML_DIAGRAM_ELEMENT__LOCAL_STYLE;
+	int UML_DIAGRAM__LOCAL_STYLE = UML_DIAGRAM_ELEMENT__LOCAL_STYLE;
 
 	/**
 	 * The feature id for the '<em><b>Shared Style</b></em>' reference.
@@ -338,7 +339,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_SHAPE__SHARED_STYLE = UML_DIAGRAM_ELEMENT__SHARED_STYLE;
+	int UML_DIAGRAM__SHARED_STYLE = UML_DIAGRAM_ELEMENT__SHARED_STYLE;
 
 	/**
 	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
@@ -348,7 +349,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_SHAPE__TARGET_EDGE = UML_DIAGRAM_ELEMENT__TARGET_EDGE;
+	int UML_DIAGRAM__TARGET_EDGE = UML_DIAGRAM_ELEMENT__TARGET_EDGE;
 
 	/**
 	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
@@ -358,7 +359,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_SHAPE__SOURCE_EDGE = UML_DIAGRAM_ELEMENT__SOURCE_EDGE;
+	int UML_DIAGRAM__SOURCE_EDGE = UML_DIAGRAM_ELEMENT__SOURCE_EDGE;
 
 	/**
 	 * The feature id for the '<em><b>Uml Model Element</b></em>' reference list.
@@ -368,7 +369,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_SHAPE__UML_MODEL_ELEMENT = UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT;
+	int UML_DIAGRAM__UML_MODEL_ELEMENT = UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Shared Uml Style</b></em>' reference.
@@ -378,7 +379,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_SHAPE__SHARED_UML_STYLE = UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE;
+	int UML_DIAGRAM__SHARED_UML_STYLE = UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE;
 
 	/**
 	 * The feature id for the '<em><b>Local Uml Style</b></em>' containment reference.
@@ -388,7 +389,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_SHAPE__LOCAL_UML_STYLE = UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE;
+	int UML_DIAGRAM__LOCAL_UML_STYLE = UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE;
 
 	/**
 	 * The feature id for the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
@@ -398,7 +399,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_SHAPE__OWNING_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT;
+	int UML_DIAGRAM__OWNING_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
@@ -408,7 +409,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_SHAPE__OWNED_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT;
+	int UML_DIAGRAM__OWNED_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Target Uml Edge</b></em>' reference list.
@@ -418,7 +419,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_SHAPE__TARGET_UML_EDGE = UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE;
+	int UML_DIAGRAM__TARGET_UML_EDGE = UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE;
 
 	/**
 	 * The feature id for the '<em><b>Source Uml Edge</b></em>' reference list.
@@ -428,7 +429,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_SHAPE__SOURCE_UML_EDGE = UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE;
+	int UML_DIAGRAM__SOURCE_UML_EDGE = UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE;
 
 	/**
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
@@ -438,487 +439,497 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_SHAPE__BOUNDS = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
+	int UML_DIAGRAM__BOUNDS = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Uml Shape</em>' class.
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_SHAPE_FEATURE_COUNT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
+	int UML_DIAGRAM__NAME = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of operations of the '<em>Uml Shape</em>' class.
+	 * The feature id for the '<em><b>Documentation</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_SHAPE_OPERATION_COUNT = UML_DIAGRAM_ELEMENT_OPERATION_COUNT + 0;
+	int UML_DIAGRAM__DOCUMENTATION = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Model Element</b></em>' reference list.
+	 * The feature id for the '<em><b>Resolution</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM__MODEL_ELEMENT = UML_SHAPE__MODEL_ELEMENT;
+	int UML_DIAGRAM__RESOLUTION = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
+	 * The feature id for the '<em><b>Kind</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM__OWNING_DIAGRAM_ELEMENT = UML_SHAPE__OWNING_DIAGRAM_ELEMENT;
+	int UML_DIAGRAM__KIND = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
+	 * The number of structural features of the '<em>Uml Diagram</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM__OWNED_DIAGRAM_ELEMENT = UML_SHAPE__OWNED_DIAGRAM_ELEMENT;
+	int UML_DIAGRAM_FEATURE_COUNT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Local Style</b></em>' reference.
+	 * The number of operations of the '<em>Uml Diagram</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM__LOCAL_STYLE = UML_SHAPE__LOCAL_STYLE;
+	int UML_DIAGRAM_OPERATION_COUNT = UML_DIAGRAM_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Shared Style</b></em>' reference.
+	 * The feature id for the '<em><b>Font Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM__SHARED_STYLE = UML_SHAPE__SHARED_STYLE;
+	int UML_STYLE__FONT_NAME = DIPackage.STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
+	 * The feature id for the '<em><b>Font Size</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM__TARGET_EDGE = UML_SHAPE__TARGET_EDGE;
+	int UML_STYLE__FONT_SIZE = DIPackage.STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
+	 * The number of structural features of the '<em>Uml Style</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM__SOURCE_EDGE = UML_SHAPE__SOURCE_EDGE;
+	int UML_STYLE_FEATURE_COUNT = DIPackage.STYLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Uml Model Element</b></em>' reference list.
+	 * The operation id for the '<em>Fontsize Positive</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM__UML_MODEL_ELEMENT = UML_SHAPE__UML_MODEL_ELEMENT;
+	int UML_STYLE___FONTSIZE_POSITIVE__DIAGNOSTICCHAIN_MAP = DIPackage.STYLE_OPERATION_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Shared Uml Style</b></em>' reference.
+	 * The number of operations of the '<em>Uml Style</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM__SHARED_UML_STYLE = UML_SHAPE__SHARED_UML_STYLE;
+	int UML_STYLE_OPERATION_COUNT = DIPackage.STYLE_OPERATION_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Local Uml Style</b></em>' containment reference.
+	 * The feature id for the '<em><b>Model Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM__LOCAL_UML_STYLE = UML_SHAPE__LOCAL_UML_STYLE;
+	int UML_EDGE__MODEL_ELEMENT = UML_DIAGRAM_ELEMENT__MODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
+	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM__OWNING_UML_DIAGRAM_ELEMENT = UML_SHAPE__OWNING_UML_DIAGRAM_ELEMENT;
+	int UML_EDGE__OWNING_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM__OWNED_UML_DIAGRAM_ELEMENT = UML_SHAPE__OWNED_UML_DIAGRAM_ELEMENT;
+	int UML_EDGE__OWNED_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Target Uml Edge</b></em>' reference list.
+	 * The feature id for the '<em><b>Local Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM__TARGET_UML_EDGE = UML_SHAPE__TARGET_UML_EDGE;
+	int UML_EDGE__LOCAL_STYLE = UML_DIAGRAM_ELEMENT__LOCAL_STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Source Uml Edge</b></em>' reference list.
+	 * The feature id for the '<em><b>Shared Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM__SOURCE_UML_EDGE = UML_SHAPE__SOURCE_UML_EDGE;
+	int UML_EDGE__SHARED_STYLE = UML_DIAGRAM_ELEMENT__SHARED_STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
+	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM__BOUNDS = UML_SHAPE__BOUNDS;
+	int UML_EDGE__TARGET_EDGE = UML_DIAGRAM_ELEMENT__TARGET_EDGE;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM__NAME = UML_SHAPE_FEATURE_COUNT + 0;
+	int UML_EDGE__SOURCE_EDGE = UML_DIAGRAM_ELEMENT__SOURCE_EDGE;
 
 	/**
-	 * The feature id for the '<em><b>Documentation</b></em>' attribute.
+	 * The feature id for the '<em><b>Uml Model Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM__DOCUMENTATION = UML_SHAPE_FEATURE_COUNT + 1;
+	int UML_EDGE__UML_MODEL_ELEMENT = UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Resolution</b></em>' attribute.
+	 * The feature id for the '<em><b>Shared Uml Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM__RESOLUTION = UML_SHAPE_FEATURE_COUNT + 2;
+	int UML_EDGE__SHARED_UML_STYLE = UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE;
 
 	/**
-	 * The number of structural features of the '<em>Uml Diagram</em>' class.
+	 * The feature id for the '<em><b>Local Uml Style</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM_FEATURE_COUNT = UML_SHAPE_FEATURE_COUNT + 3;
+	int UML_EDGE__LOCAL_UML_STYLE = UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE;
 
 	/**
-	 * The number of operations of the '<em>Uml Diagram</em>' class.
+	 * The feature id for the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_DIAGRAM_OPERATION_COUNT = UML_SHAPE_OPERATION_COUNT + 0;
+	int UML_EDGE__OWNING_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Font Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_STYLE__FONT_NAME = DIPackage.STYLE_FEATURE_COUNT + 0;
+	int UML_EDGE__OWNED_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Font Size</b></em>' attribute.
+	 * The feature id for the '<em><b>Target Uml Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_STYLE__FONT_SIZE = DIPackage.STYLE_FEATURE_COUNT + 1;
+	int UML_EDGE__TARGET_UML_EDGE = UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE;
 
 	/**
-	 * The number of structural features of the '<em>Uml Style</em>' class.
+	 * The feature id for the '<em><b>Source Uml Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_STYLE_FEATURE_COUNT = DIPackage.STYLE_FEATURE_COUNT + 2;
+	int UML_EDGE__SOURCE_UML_EDGE = UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE;
 
 	/**
-	 * The operation id for the '<em>Fontsize Positive</em>' operation.
+	 * The feature id for the '<em><b>Source Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_STYLE___FONTSIZE_POSITIVE__DIAGNOSTICCHAIN_MAP = DIPackage.STYLE_OPERATION_COUNT + 0;
+	int UML_EDGE__SOURCE_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of operations of the '<em>Uml Style</em>' class.
+	 * The feature id for the '<em><b>Waypoint</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_STYLE_OPERATION_COUNT = DIPackage.STYLE_OPERATION_COUNT + 1;
+	int UML_EDGE__WAYPOINT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Model Element</b></em>' reference list.
+	 * The feature id for the '<em><b>Target Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE__MODEL_ELEMENT = UML_DIAGRAM_ELEMENT__MODEL_ELEMENT;
+	int UML_EDGE__TARGET_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
+	 * The feature id for the '<em><b>Source Uml Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE__OWNING_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT;
+	int UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
+	 * The feature id for the '<em><b>Target Uml Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE__OWNED_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT;
+	int UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Local Style</b></em>' reference.
+	 * The number of structural features of the '<em>Uml Edge</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE__LOCAL_STYLE = UML_DIAGRAM_ELEMENT__LOCAL_STYLE;
+	int UML_EDGE_FEATURE_COUNT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Shared Style</b></em>' reference.
+	 * The number of operations of the '<em>Uml Edge</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE__SHARED_STYLE = UML_DIAGRAM_ELEMENT__SHARED_STYLE;
+	int UML_EDGE_OPERATION_COUNT = UML_DIAGRAM_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
+	 * The feature id for the '<em><b>Model Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE__TARGET_EDGE = UML_DIAGRAM_ELEMENT__TARGET_EDGE;
+	int UML_SHAPE__MODEL_ELEMENT = UML_DIAGRAM_ELEMENT__MODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
+	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE__SOURCE_EDGE = UML_DIAGRAM_ELEMENT__SOURCE_EDGE;
+	int UML_SHAPE__OWNING_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Uml Model Element</b></em>' reference list.
+	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE__UML_MODEL_ELEMENT = UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT;
+	int UML_SHAPE__OWNED_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Shared Uml Style</b></em>' reference.
+	 * The feature id for the '<em><b>Local Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE__SHARED_UML_STYLE = UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE;
+	int UML_SHAPE__LOCAL_STYLE = UML_DIAGRAM_ELEMENT__LOCAL_STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Local Uml Style</b></em>' containment reference.
+	 * The feature id for the '<em><b>Shared Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE__LOCAL_UML_STYLE = UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE;
+	int UML_SHAPE__SHARED_STYLE = UML_DIAGRAM_ELEMENT__SHARED_STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
+	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE__OWNING_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT;
+	int UML_SHAPE__TARGET_EDGE = UML_DIAGRAM_ELEMENT__TARGET_EDGE;
 
 	/**
-	 * The feature id for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE__OWNED_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT;
+	int UML_SHAPE__SOURCE_EDGE = UML_DIAGRAM_ELEMENT__SOURCE_EDGE;
 
 	/**
-	 * The feature id for the '<em><b>Target Uml Edge</b></em>' reference list.
+	 * The feature id for the '<em><b>Uml Model Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE__TARGET_UML_EDGE = UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE;
+	int UML_SHAPE__UML_MODEL_ELEMENT = UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Source Uml Edge</b></em>' reference list.
+	 * The feature id for the '<em><b>Shared Uml Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE__SOURCE_UML_EDGE = UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE;
+	int UML_SHAPE__SHARED_UML_STYLE = UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Source Diagram Element</b></em>' reference.
+	 * The feature id for the '<em><b>Local Uml Style</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE__SOURCE_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
+	int UML_SHAPE__LOCAL_UML_STYLE = UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Waypoint</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE__WAYPOINT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
+	int UML_SHAPE__OWNING_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Target Diagram Element</b></em>' reference.
+	 * The feature id for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE__TARGET_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 2;
+	int UML_SHAPE__OWNED_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Source Uml Diagram Element</b></em>' reference.
+	 * The feature id for the '<em><b>Target Uml Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 3;
+	int UML_SHAPE__TARGET_UML_EDGE = UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE;
 
 	/**
-	 * The feature id for the '<em><b>Target Uml Diagram Element</b></em>' reference.
+	 * The feature id for the '<em><b>Source Uml Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 4;
+	int UML_SHAPE__SOURCE_UML_EDGE = UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE;
 
 	/**
-	 * The number of structural features of the '<em>Uml Edge</em>' class.
+	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE_FEATURE_COUNT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 5;
+	int UML_SHAPE__BOUNDS = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of operations of the '<em>Uml Edge</em>' class.
+	 * The number of structural features of the '<em>Uml Shape</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 * @ordered
 	 */
-	int UML_EDGE_OPERATION_COUNT = UML_DIAGRAM_ELEMENT_OPERATION_COUNT + 0;
+	int UML_SHAPE_FEATURE_COUNT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Uml Shape</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_OPERATION_COUNT = UML_DIAGRAM_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.impl.UmlCompartmentImpl <em>Uml Compartment</em>}' class.
@@ -939,7 +950,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_COMPARTMENT__MODEL_ELEMENT = UML_SHAPE__MODEL_ELEMENT;
+	int UML_COMPARTMENT__MODEL_ELEMENT = UML_DIAGRAM_ELEMENT__MODEL_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
@@ -949,7 +960,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_COMPARTMENT__OWNING_DIAGRAM_ELEMENT = UML_SHAPE__OWNING_DIAGRAM_ELEMENT;
+	int UML_COMPARTMENT__OWNING_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
@@ -959,7 +970,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_COMPARTMENT__OWNED_DIAGRAM_ELEMENT = UML_SHAPE__OWNED_DIAGRAM_ELEMENT;
+	int UML_COMPARTMENT__OWNED_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Local Style</b></em>' reference.
@@ -969,7 +980,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_COMPARTMENT__LOCAL_STYLE = UML_SHAPE__LOCAL_STYLE;
+	int UML_COMPARTMENT__LOCAL_STYLE = UML_DIAGRAM_ELEMENT__LOCAL_STYLE;
 
 	/**
 	 * The feature id for the '<em><b>Shared Style</b></em>' reference.
@@ -979,7 +990,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_COMPARTMENT__SHARED_STYLE = UML_SHAPE__SHARED_STYLE;
+	int UML_COMPARTMENT__SHARED_STYLE = UML_DIAGRAM_ELEMENT__SHARED_STYLE;
 
 	/**
 	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
@@ -989,7 +1000,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_COMPARTMENT__TARGET_EDGE = UML_SHAPE__TARGET_EDGE;
+	int UML_COMPARTMENT__TARGET_EDGE = UML_DIAGRAM_ELEMENT__TARGET_EDGE;
 
 	/**
 	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
@@ -999,7 +1010,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_COMPARTMENT__SOURCE_EDGE = UML_SHAPE__SOURCE_EDGE;
+	int UML_COMPARTMENT__SOURCE_EDGE = UML_DIAGRAM_ELEMENT__SOURCE_EDGE;
 
 	/**
 	 * The feature id for the '<em><b>Uml Model Element</b></em>' reference list.
@@ -1009,7 +1020,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_COMPARTMENT__UML_MODEL_ELEMENT = UML_SHAPE__UML_MODEL_ELEMENT;
+	int UML_COMPARTMENT__UML_MODEL_ELEMENT = UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Shared Uml Style</b></em>' reference.
@@ -1019,7 +1030,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_COMPARTMENT__SHARED_UML_STYLE = UML_SHAPE__SHARED_UML_STYLE;
+	int UML_COMPARTMENT__SHARED_UML_STYLE = UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE;
 
 	/**
 	 * The feature id for the '<em><b>Local Uml Style</b></em>' containment reference.
@@ -1029,7 +1040,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_COMPARTMENT__LOCAL_UML_STYLE = UML_SHAPE__LOCAL_UML_STYLE;
+	int UML_COMPARTMENT__LOCAL_UML_STYLE = UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE;
 
 	/**
 	 * The feature id for the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
@@ -1039,7 +1050,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_COMPARTMENT__OWNING_UML_DIAGRAM_ELEMENT = UML_SHAPE__OWNING_UML_DIAGRAM_ELEMENT;
+	int UML_COMPARTMENT__OWNING_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
@@ -1049,7 +1060,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_COMPARTMENT__OWNED_UML_DIAGRAM_ELEMENT = UML_SHAPE__OWNED_UML_DIAGRAM_ELEMENT;
+	int UML_COMPARTMENT__OWNED_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Target Uml Edge</b></em>' reference list.
@@ -1059,7 +1070,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_COMPARTMENT__TARGET_UML_EDGE = UML_SHAPE__TARGET_UML_EDGE;
+	int UML_COMPARTMENT__TARGET_UML_EDGE = UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE;
 
 	/**
 	 * The feature id for the '<em><b>Source Uml Edge</b></em>' reference list.
@@ -1069,7 +1080,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_COMPARTMENT__SOURCE_UML_EDGE = UML_SHAPE__SOURCE_UML_EDGE;
+	int UML_COMPARTMENT__SOURCE_UML_EDGE = UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE;
 
 	/**
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
@@ -1079,7 +1090,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_COMPARTMENT__BOUNDS = UML_SHAPE__BOUNDS;
+	int UML_COMPARTMENT__BOUNDS = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Kind</b></em>' attribute.
@@ -1089,7 +1100,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_COMPARTMENT__KIND = UML_SHAPE_FEATURE_COUNT + 0;
+	int UML_COMPARTMENT__KIND = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of structural features of the '<em>Uml Compartment</em>' class.
@@ -1099,7 +1110,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_COMPARTMENT_FEATURE_COUNT = UML_SHAPE_FEATURE_COUNT + 1;
+	int UML_COMPARTMENT_FEATURE_COUNT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
 	 * The number of operations of the '<em>Uml Compartment</em>' class.
@@ -1109,7 +1120,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_COMPARTMENT_OPERATION_COUNT = UML_SHAPE_OPERATION_COUNT + 0;
+	int UML_COMPARTMENT_OPERATION_COUNT = UML_DIAGRAM_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.impl.UmlLabelImpl <em>Uml Label</em>}' class.
@@ -1130,7 +1141,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_LABEL__MODEL_ELEMENT = UML_SHAPE__MODEL_ELEMENT;
+	int UML_LABEL__MODEL_ELEMENT = UML_DIAGRAM_ELEMENT__MODEL_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
@@ -1140,7 +1151,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_LABEL__OWNING_DIAGRAM_ELEMENT = UML_SHAPE__OWNING_DIAGRAM_ELEMENT;
+	int UML_LABEL__OWNING_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
@@ -1150,7 +1161,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_LABEL__OWNED_DIAGRAM_ELEMENT = UML_SHAPE__OWNED_DIAGRAM_ELEMENT;
+	int UML_LABEL__OWNED_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Local Style</b></em>' reference.
@@ -1160,7 +1171,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_LABEL__LOCAL_STYLE = UML_SHAPE__LOCAL_STYLE;
+	int UML_LABEL__LOCAL_STYLE = UML_DIAGRAM_ELEMENT__LOCAL_STYLE;
 
 	/**
 	 * The feature id for the '<em><b>Shared Style</b></em>' reference.
@@ -1170,7 +1181,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_LABEL__SHARED_STYLE = UML_SHAPE__SHARED_STYLE;
+	int UML_LABEL__SHARED_STYLE = UML_DIAGRAM_ELEMENT__SHARED_STYLE;
 
 	/**
 	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
@@ -1180,7 +1191,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_LABEL__TARGET_EDGE = UML_SHAPE__TARGET_EDGE;
+	int UML_LABEL__TARGET_EDGE = UML_DIAGRAM_ELEMENT__TARGET_EDGE;
 
 	/**
 	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
@@ -1190,7 +1201,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_LABEL__SOURCE_EDGE = UML_SHAPE__SOURCE_EDGE;
+	int UML_LABEL__SOURCE_EDGE = UML_DIAGRAM_ELEMENT__SOURCE_EDGE;
 
 	/**
 	 * The feature id for the '<em><b>Uml Model Element</b></em>' reference list.
@@ -1200,7 +1211,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_LABEL__UML_MODEL_ELEMENT = UML_SHAPE__UML_MODEL_ELEMENT;
+	int UML_LABEL__UML_MODEL_ELEMENT = UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Shared Uml Style</b></em>' reference.
@@ -1210,7 +1221,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_LABEL__SHARED_UML_STYLE = UML_SHAPE__SHARED_UML_STYLE;
+	int UML_LABEL__SHARED_UML_STYLE = UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE;
 
 	/**
 	 * The feature id for the '<em><b>Local Uml Style</b></em>' containment reference.
@@ -1220,7 +1231,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_LABEL__LOCAL_UML_STYLE = UML_SHAPE__LOCAL_UML_STYLE;
+	int UML_LABEL__LOCAL_UML_STYLE = UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE;
 
 	/**
 	 * The feature id for the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
@@ -1230,7 +1241,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_LABEL__OWNING_UML_DIAGRAM_ELEMENT = UML_SHAPE__OWNING_UML_DIAGRAM_ELEMENT;
+	int UML_LABEL__OWNING_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
@@ -1240,7 +1251,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_LABEL__OWNED_UML_DIAGRAM_ELEMENT = UML_SHAPE__OWNED_UML_DIAGRAM_ELEMENT;
+	int UML_LABEL__OWNED_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Target Uml Edge</b></em>' reference list.
@@ -1250,7 +1261,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_LABEL__TARGET_UML_EDGE = UML_SHAPE__TARGET_UML_EDGE;
+	int UML_LABEL__TARGET_UML_EDGE = UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE;
 
 	/**
 	 * The feature id for the '<em><b>Source Uml Edge</b></em>' reference list.
@@ -1260,7 +1271,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_LABEL__SOURCE_UML_EDGE = UML_SHAPE__SOURCE_UML_EDGE;
+	int UML_LABEL__SOURCE_UML_EDGE = UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE;
 
 	/**
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
@@ -1270,7 +1281,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_LABEL__BOUNDS = UML_SHAPE__BOUNDS;
+	int UML_LABEL__BOUNDS = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Kind</b></em>' attribute.
@@ -1280,7 +1291,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_LABEL__KIND = UML_SHAPE_FEATURE_COUNT + 0;
+	int UML_LABEL__KIND = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of structural features of the '<em>Uml Label</em>' class.
@@ -1290,7 +1301,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_LABEL_FEATURE_COUNT = UML_SHAPE_FEATURE_COUNT + 1;
+	int UML_LABEL_FEATURE_COUNT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
 	 * The number of operations of the '<em>Uml Label</em>' class.
@@ -1300,7 +1311,18 @@ public interface UMLDIPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UML_LABEL_OPERATION_COUNT = UML_SHAPE_OPERATION_COUNT + 0;
+	int UML_LABEL_OPERATION_COUNT = UML_DIAGRAM_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.UmlDiagramKind <em>Uml Diagram Kind</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.umldi.UmlDiagramKind
+	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlDiagramKind()
+	 * @generated
+	 */
+	int UML_DIAGRAM_KIND = 7;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.UmlCompartmentKind <em>Uml Compartment Kind</em>}' enum.
@@ -1311,7 +1333,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlCompartmentKind()
 	 * @generated
 	 */
-	int UML_COMPARTMENT_KIND = 7;
+	int UML_COMPARTMENT_KIND = 8;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.UmlLabelKind <em>Uml Label Kind</em>}' enum.
@@ -1322,7 +1344,7 @@ public interface UMLDIPackage extends EPackage {
 	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlLabelKind()
 	 * @generated
 	 */
-	int UML_LABEL_KIND = 8;
+	int UML_LABEL_KIND = 9;
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umldi.UmlDiagram <em>Uml Diagram</em>}'.
@@ -1336,6 +1358,18 @@ public interface UMLDIPackage extends EPackage {
 	EClass getUmlDiagram();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.umldi.UmlDiagram#getKind <em>Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Kind</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlDiagram#getKind()
+	 * @see #getUmlDiagram()
+	 * @generated
+	 */
+	EAttribute getUmlDiagram_Kind();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umldi.UmlDiagramElement <em>Uml Diagram Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1470,7 +1504,8 @@ public interface UMLDIPackage extends EPackage {
 	EAttribute getUmlStyle_FontSize();
 
 	/**
-	 * Returns the meta object for the ' {@link org.eclipse.papyrus.umldi.UmlStyle#fontsizePositive(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.umldi.UmlStyle#fontsizePositive(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Fontsize Positive</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1565,6 +1600,17 @@ public interface UMLDIPackage extends EPackage {
 	EAttribute getUmlLabel_Kind();
 
 	/**
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.umldi.UmlDiagramKind <em>Uml Diagram Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for enum '<em>Uml Diagram Kind</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlDiagramKind
+	 * @generated
+	 */
+	EEnum getUmlDiagramKind();
+
+	/**
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.umldi.UmlCompartmentKind <em>Uml Compartment Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1635,6 +1681,15 @@ public interface UMLDIPackage extends EPackage {
 		EClass UML_DIAGRAM = eINSTANCE.getUmlDiagram();
 
 		/**
+		 * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute UML_DIAGRAM__KIND = eINSTANCE.getUmlDiagram_Kind();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl <em>Uml Diagram Element</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -1816,6 +1871,17 @@ public interface UMLDIPackage extends EPackage {
 		EAttribute UML_LABEL__KIND = eINSTANCE.getUmlLabel_Kind();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.UmlDiagramKind <em>Uml Diagram Kind</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.umldi.UmlDiagramKind
+		 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlDiagramKind()
+		 * @generated
+		 */
+		EEnum UML_DIAGRAM_KIND = eINSTANCE.getUmlDiagramKind();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.UmlCompartmentKind <em>Uml Compartment Kind</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -1848,4 +1914,4 @@ public interface UMLDIPackage extends EPackage {
 		 */
 		EClass UML_SHAPE = eINSTANCE.getUmlShape();
 	}
-} // UMLDIPackage
+} //UMLDIPackage
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartment.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartment.java
index 503b0121220..d5f6eb79cb6 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartment.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartment.java
@@ -11,6 +11,8 @@
  */
 package org.eclipse.papyrus.umldi;
 
+import org.eclipse.papyrus.dd.di.Shape;
+
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Uml Compartment</b></em>'.
@@ -27,7 +29,7 @@ package org.eclipse.papyrus.umldi;
  * @model
  * @generated
  */
-public interface UmlCompartment extends UmlShape {
+public interface UmlCompartment extends UmlDiagramElement, Shape {
 
 	/**
 	 * Returns the value of the '<em><b>Kind</b></em>' attribute.
@@ -53,7 +55,7 @@ public interface UmlCompartment extends UmlShape {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Kind</em>' attribute.
+	 *        the new value of the '<em>Kind</em>' attribute.
 	 * @see org.eclipse.papyrus.umldi.UmlCompartmentKind
 	 * @see #getKind()
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartmentKind.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartmentKind.java
index a61dc9c2759..c756ad0971e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartmentKind.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartmentKind.java
@@ -86,7 +86,7 @@ public enum UmlCompartmentKind implements Enumerator {
 	 *
 	 * @generated
 	 */
-	private static final UmlCompartmentKind[] VALUES_ARRAY = new UmlCompartmentKind[] { ATTRIBUTES, OPERATIONS, };
+	private static final UmlCompartmentKind[] VALUES_ARRAY = new UmlCompartmentKind[]{ ATTRIBUTES, OPERATIONS, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Uml Compartment Kind</b></em>' enumerators.
@@ -105,9 +105,9 @@ public enum UmlCompartmentKind implements Enumerator {
 	 * @generated
 	 */
 	public static UmlCompartmentKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			UmlCompartmentKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -122,9 +122,9 @@ public enum UmlCompartmentKind implements Enumerator {
 	 * @generated
 	 */
 	public static UmlCompartmentKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			UmlCompartmentKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -139,7 +139,7 @@ public enum UmlCompartmentKind implements Enumerator {
 	 * @generated
 	 */
 	public static UmlCompartmentKind get(int value) {
-		switch (value) {
+		switch(value) {
 		case ATTRIBUTES_VALUE:
 			return ATTRIBUTES;
 		case OPERATIONS_VALUE:
@@ -229,4 +229,4 @@ public enum UmlCompartmentKind implements Enumerator {
 	public String toString() {
 		return literal;
 	}
-} // UmlCompartmentKind
+} //UmlCompartmentKind
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagram.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagram.java
index f1c342dde3c..ca8454c9fc5 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagram.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagram.java
@@ -22,10 +22,47 @@ import org.eclipse.papyrus.dd.di.Diagram;
  * The most general class for UML diagrams.
  * <!-- end-model-doc -->
  *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.umldi.UmlDiagram#getKind <em>Kind</em>}</li>
+ * </ul>
+ * </p>
  *
  * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagram()
  * @model
  * @generated
  */
-public interface UmlDiagram extends UmlShape, Diagram {
+public interface UmlDiagram extends UmlDiagramElement, Diagram {
+
+	/**
+	 * Returns the value of the '<em><b>Kind</b></em>' attribute.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.umldi.UmlDiagramKind}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Kind</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Kind</em>' attribute.
+	 * @see org.eclipse.papyrus.umldi.UmlDiagramKind
+	 * @see #setKind(UmlDiagramKind)
+	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagram_Kind()
+	 * @model required="true" ordered="false"
+	 * @generated
+	 */
+	UmlDiagramKind getKind();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlDiagram#getKind <em>Kind</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *        the new value of the '<em>Kind</em>' attribute.
+	 * @see org.eclipse.papyrus.umldi.UmlDiagramKind
+	 * @see #getKind()
+	 * @generated
+	 */
+	void setKind(UmlDiagramKind value);
 } // UmlDiagram
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramElement.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramElement.java
index 10f65437c15..348a679729c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramElement.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramElement.java
@@ -12,7 +12,9 @@
 package org.eclipse.papyrus.umldi;
 
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.papyrus.dd.di.DiagramElement;
+
 import org.eclipse.uml2.uml.Element;
 
 /**
@@ -93,7 +95,7 @@ public interface UmlDiagramElement extends DiagramElement {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Shared Uml Style</em>' reference.
+	 *        the new value of the '<em>Shared Uml Style</em>' reference.
 	 * @see #getSharedUmlStyle()
 	 * @generated
 	 */
@@ -127,7 +129,7 @@ public interface UmlDiagramElement extends DiagramElement {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Local Uml Style</em>' containment reference.
+	 *        the new value of the '<em>Local Uml Style</em>' containment reference.
 	 * @see #getLocalUmlStyle()
 	 * @generated
 	 */
@@ -165,7 +167,7 @@ public interface UmlDiagramElement extends DiagramElement {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Owning Uml Diagram Element</em>' container reference.
+	 *        the new value of the '<em>Owning Uml Diagram Element</em>' container reference.
 	 * @see #getOwningUmlDiagramElement()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramKind.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramKind.java
new file mode 100644
index 00000000000..973fd105f16
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramKind.java
@@ -0,0 +1,205 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Uml Diagram Kind</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagramKind()
+ * @model
+ * @generated
+ */
+public enum UmlDiagramKind implements Enumerator {
+	/**
+	 * The '<em><b>Class</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #CLASS_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	CLASS(0, "class", "class");
+
+	/**
+	 * The '<em><b>Class</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>Class</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #CLASS
+	 * @model name="class"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int CLASS_VALUE = 0;
+
+	/**
+	 * An array of all the '<em><b>Uml Diagram Kind</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private static final UmlDiagramKind[] VALUES_ARRAY = new UmlDiagramKind[]{ CLASS, };
+
+	/**
+	 * A public read-only list of all the '<em><b>Uml Diagram Kind</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static final List<UmlDiagramKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Uml Diagram Kind</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static UmlDiagramKind get(String literal) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
+			UmlDiagramKind result = VALUES_ARRAY[i];
+			if(result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Uml Diagram Kind</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static UmlDiagramKind getByName(String name) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
+			UmlDiagramKind result = VALUES_ARRAY[i];
+			if(result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Uml Diagram Kind</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static UmlDiagramKind get(int value) {
+		switch(value) {
+		case CLASS_VALUE:
+			return CLASS;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private UmlDiagramKind(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+		return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+} //UmlDiagramKind
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlEdge.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlEdge.java
index ceebdd787da..74b2710a53d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlEdge.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlEdge.java
@@ -66,7 +66,7 @@ public interface UmlEdge extends UmlDiagramElement, Edge {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Source Uml Diagram Element</em>' reference.
+	 *        the new value of the '<em>Source Uml Diagram Element</em>' reference.
 	 * @see #getSourceUmlDiagramElement()
 	 * @generated
 	 */
@@ -102,7 +102,7 @@ public interface UmlEdge extends UmlDiagramElement, Edge {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Target Uml Diagram Element</em>' reference.
+	 *        the new value of the '<em>Target Uml Diagram Element</em>' reference.
 	 * @see #getTargetUmlDiagramElement()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabel.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabel.java
index ae2d3edfd5f..66b0d6e9f4d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabel.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabel.java
@@ -11,6 +11,8 @@
  */
 package org.eclipse.papyrus.umldi;
 
+import org.eclipse.papyrus.dd.di.Shape;
+
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Uml Label</b></em>'.
@@ -27,7 +29,7 @@ package org.eclipse.papyrus.umldi;
  * @model
  * @generated
  */
-public interface UmlLabel extends UmlShape {
+public interface UmlLabel extends UmlDiagramElement, Shape {
 
 	/**
 	 * Returns the value of the '<em><b>Kind</b></em>' attribute.
@@ -53,7 +55,7 @@ public interface UmlLabel extends UmlShape {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Kind</em>' attribute.
+	 *        the new value of the '<em>Kind</em>' attribute.
 	 * @see org.eclipse.papyrus.umldi.UmlLabelKind
 	 * @see #getKind()
 	 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabelKind.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabelKind.java
index f9ceeb605c1..fc627c332e8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabelKind.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabelKind.java
@@ -37,7 +37,16 @@ public enum UmlLabelKind implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	NAME(0, "name", "name");
+	NAME(0, "name", "name"), /**
+	 * The '<em><b>Multiplicity</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #MULTIPLICITY_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	MULTIPLICITY(1, "multiplicity", "multiplicity");
 
 	/**
 	 * The '<em><b>Name</b></em>' literal value.
@@ -55,13 +64,28 @@ public enum UmlLabelKind implements Enumerator {
 	public static final int NAME_VALUE = 0;
 
 	/**
+	 * The '<em><b>Multiplicity</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>Multiplicity</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #MULTIPLICITY
+	 * @model name="multiplicity"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int MULTIPLICITY_VALUE = 1;
+
+	/**
 	 * An array of all the '<em><b>Uml Label Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 */
-	private static final UmlLabelKind[] VALUES_ARRAY = new UmlLabelKind[] { NAME, };
+	private static final UmlLabelKind[] VALUES_ARRAY = new UmlLabelKind[]{ NAME, MULTIPLICITY, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Uml Label Kind</b></em>' enumerators.
@@ -80,9 +104,9 @@ public enum UmlLabelKind implements Enumerator {
 	 * @generated
 	 */
 	public static UmlLabelKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			UmlLabelKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -97,9 +121,9 @@ public enum UmlLabelKind implements Enumerator {
 	 * @generated
 	 */
 	public static UmlLabelKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			UmlLabelKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -114,9 +138,11 @@ public enum UmlLabelKind implements Enumerator {
 	 * @generated
 	 */
 	public static UmlLabelKind get(int value) {
-		switch (value) {
+		switch(value) {
 		case NAME_VALUE:
 			return NAME;
+		case MULTIPLICITY_VALUE:
+			return MULTIPLICITY;
 		}
 		return null;
 	}
@@ -202,4 +228,4 @@ public enum UmlLabelKind implements Enumerator {
 	public String toString() {
 		return literal;
 	}
-} // UmlLabelKind
+} //UmlLabelKind
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlStyle.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlStyle.java
index 2aaee35167a..3619c8cc35c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlStyle.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlStyle.java
@@ -14,6 +14,7 @@ package org.eclipse.papyrus.umldi;
 import java.util.Map;
 
 import org.eclipse.emf.common.util.DiagnosticChain;
+
 import org.eclipse.papyrus.dd.di.Style;
 
 /**
@@ -61,7 +62,7 @@ public interface UmlStyle extends Style {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Font Name</em>' attribute.
+	 *        the new value of the '<em>Font Name</em>' attribute.
 	 * @see #getFontName()
 	 * @generated
 	 */
@@ -89,7 +90,7 @@ public interface UmlStyle extends Style {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Font Size</em>' attribute.
+	 *        the new value of the '<em>Font Size</em>' attribute.
 	 * @see #getFontSize()
 	 * @generated
 	 */
@@ -102,10 +103,10 @@ public interface UmlStyle extends Style {
 	 * fontSize must be greater than zero.
 	 *
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information.
-	 *            <!-- end-model-doc -->
+	 *        The cache of context-specific information.
+	 *        <!-- end-model-doc -->
 	 * @model annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='fontSize > 0'"
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIFactoryImpl.java
index 853a8518525..6d2cb79d0cf 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIFactoryImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIFactoryImpl.java
@@ -15,18 +15,12 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.umldi.UMLDIFactory;
-import org.eclipse.papyrus.umldi.UMLDIPackage;
-import org.eclipse.papyrus.umldi.UmlCompartment;
-import org.eclipse.papyrus.umldi.UmlCompartmentKind;
-import org.eclipse.papyrus.umldi.UmlDiagram;
-import org.eclipse.papyrus.umldi.UmlEdge;
-import org.eclipse.papyrus.umldi.UmlLabel;
-import org.eclipse.papyrus.umldi.UmlLabelKind;
-import org.eclipse.papyrus.umldi.UmlShape;
-import org.eclipse.papyrus.umldi.UmlStyle;
+
+import org.eclipse.papyrus.umldi.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -46,8 +40,8 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	 */
 	public static UMLDIFactory init() {
 		try {
-			UMLDIFactory theUMLDIFactory = (UMLDIFactory) EPackage.Registry.INSTANCE.getEFactory(UMLDIPackage.eNS_URI);
-			if (theUMLDIFactory != null) {
+			UMLDIFactory theUMLDIFactory = (UMLDIFactory)EPackage.Registry.INSTANCE.getEFactory(UMLDIPackage.eNS_URI);
+			if(theUMLDIFactory != null) {
 				return theUMLDIFactory;
 			}
 		} catch (Exception exception) {
@@ -75,15 +69,15 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
+		switch(eClass.getClassifierID()) {
 		case UMLDIPackage.UML_DIAGRAM:
 			return createUmlDiagram();
-		case UMLDIPackage.UML_SHAPE:
-			return createUmlShape();
 		case UMLDIPackage.UML_STYLE:
 			return createUmlStyle();
 		case UMLDIPackage.UML_EDGE:
 			return createUmlEdge();
+		case UMLDIPackage.UML_SHAPE:
+			return createUmlShape();
 		case UMLDIPackage.UML_COMPARTMENT:
 			return createUmlCompartment();
 		case UMLDIPackage.UML_LABEL:
@@ -101,7 +95,9 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
+		switch(eDataType.getClassifierID()) {
+		case UMLDIPackage.UML_DIAGRAM_KIND:
+			return createUmlDiagramKindFromString(eDataType, initialValue);
 		case UMLDIPackage.UML_COMPARTMENT_KIND:
 			return createUmlCompartmentKindFromString(eDataType, initialValue);
 		case UMLDIPackage.UML_LABEL_KIND:
@@ -119,7 +115,9 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
+		switch(eDataType.getClassifierID()) {
+		case UMLDIPackage.UML_DIAGRAM_KIND:
+			return convertUmlDiagramKindToString(eDataType, instanceValue);
 		case UMLDIPackage.UML_COMPARTMENT_KIND:
 			return convertUmlCompartmentKindToString(eDataType, instanceValue);
 		case UMLDIPackage.UML_LABEL_KIND:
@@ -195,9 +193,33 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	 *
 	 * @generated
 	 */
+	public UmlDiagramKind createUmlDiagramKindFromString(EDataType eDataType, String initialValue) {
+		UmlDiagramKind result = UmlDiagramKind.get(initialValue);
+		if(result == null) {
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		}
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String convertUmlDiagramKindToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
 	public UmlCompartmentKind createUmlCompartmentKindFromString(EDataType eDataType, String initialValue) {
 		UmlCompartmentKind result = UmlCompartmentKind.get(initialValue);
-		if (result == null) {
+		if(result == null) {
 			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		}
 		return result;
@@ -221,7 +243,7 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	 */
 	public UmlLabelKind createUmlLabelKindFromString(EDataType eDataType, String initialValue) {
 		UmlLabelKind result = UmlLabelKind.get(initialValue);
-		if (result == null) {
+		if(result == null) {
 			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		}
 		return result;
@@ -257,7 +279,7 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	 */
 	@Override
 	public UMLDIPackage getUMLDIPackage() {
-		return (UMLDIPackage) getEPackage();
+		return (UMLDIPackage)getEPackage();
 	}
 
 	/**
@@ -271,4 +293,4 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	public static UMLDIPackage getPackage() {
 		return UMLDIPackage.eINSTANCE;
 	}
-} // UMLDIFactoryImpl
+} //UMLDIFactoryImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIPackageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIPackageImpl.java
index fc2c73f85bc..a9a7bffe42d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIPackageImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIPackageImpl.java
@@ -12,6 +12,7 @@
 package org.eclipse.papyrus.umldi.impl;
 
 import org.eclipse.emf.common.util.URI;
+
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EEnum;
@@ -20,21 +21,28 @@ import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EValidator;
+
 import org.eclipse.emf.ecore.impl.EPackageImpl;
+
 import org.eclipse.papyrus.dd.dc.DCPackage;
+
 import org.eclipse.papyrus.dd.di.DIPackage;
+
 import org.eclipse.papyrus.umldi.UMLDIFactory;
 import org.eclipse.papyrus.umldi.UMLDIPackage;
 import org.eclipse.papyrus.umldi.UmlCompartment;
 import org.eclipse.papyrus.umldi.UmlCompartmentKind;
 import org.eclipse.papyrus.umldi.UmlDiagram;
 import org.eclipse.papyrus.umldi.UmlDiagramElement;
+import org.eclipse.papyrus.umldi.UmlDiagramKind;
 import org.eclipse.papyrus.umldi.UmlEdge;
 import org.eclipse.papyrus.umldi.UmlLabel;
 import org.eclipse.papyrus.umldi.UmlLabelKind;
 import org.eclipse.papyrus.umldi.UmlShape;
 import org.eclipse.papyrus.umldi.UmlStyle;
+
 import org.eclipse.papyrus.umldi.util.UMLDIValidator;
+
 import org.eclipse.uml2.uml.UMLPackage;
 
 /**
@@ -100,6 +108,14 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 *
 	 * @generated
 	 */
+	private EEnum umlDiagramKindEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
 	private EEnum umlCompartmentKindEEnum = null;
 
 	/**
@@ -123,7 +139,8 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 * package
 	 * package URI value.
 	 * <p>
-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#eNS_URI
@@ -146,7 +163,8 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
 	 *
 	 * <p>
-	 * This method is used to initialize {@link UMLDIPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * This method is used to initialize {@link UMLDIPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead,
+	 * they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
@@ -154,11 +172,11 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 * @generated
 	 */
 	public static UMLDIPackage init() {
-		if (isInited) {
-			return (UMLDIPackage) EPackage.Registry.INSTANCE.getEPackage(UMLDIPackage.eNS_URI);
+		if(isInited) {
+			return (UMLDIPackage)EPackage.Registry.INSTANCE.getEPackage(UMLDIPackage.eNS_URI);
 		}
 		// Obtain or create and register package
-		UMLDIPackageImpl theUMLDIPackage = (UMLDIPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UMLDIPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UMLDIPackageImpl());
+		UMLDIPackageImpl theUMLDIPackage = (UMLDIPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UMLDIPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UMLDIPackageImpl());
 		isInited = true;
 		// Initialize simple dependencies
 		DIPackage.eINSTANCE.eClass();
@@ -200,6 +218,17 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 * @generated
 	 */
 	@Override
+	public EAttribute getUmlDiagram_Kind() {
+		return (EAttribute)umlDiagramEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public EClass getUmlDiagramElement() {
 		return umlDiagramElementEClass;
 	}
@@ -212,7 +241,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 */
 	@Override
 	public EReference getUmlDiagramElement_UmlModelElement() {
-		return (EReference) umlDiagramElementEClass.getEStructuralFeatures().get(0);
+		return (EReference)umlDiagramElementEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -223,7 +252,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 */
 	@Override
 	public EReference getUmlDiagramElement_SharedUmlStyle() {
-		return (EReference) umlDiagramElementEClass.getEStructuralFeatures().get(1);
+		return (EReference)umlDiagramElementEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -234,7 +263,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 */
 	@Override
 	public EReference getUmlDiagramElement_LocalUmlStyle() {
-		return (EReference) umlDiagramElementEClass.getEStructuralFeatures().get(2);
+		return (EReference)umlDiagramElementEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -245,7 +274,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 */
 	@Override
 	public EReference getUmlDiagramElement_OwningUmlDiagramElement() {
-		return (EReference) umlDiagramElementEClass.getEStructuralFeatures().get(3);
+		return (EReference)umlDiagramElementEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -256,7 +285,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 */
 	@Override
 	public EReference getUmlDiagramElement_OwnedUmlDiagramElement() {
-		return (EReference) umlDiagramElementEClass.getEStructuralFeatures().get(4);
+		return (EReference)umlDiagramElementEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -267,7 +296,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 */
 	@Override
 	public EReference getUmlDiagramElement_TargetUmlEdge() {
-		return (EReference) umlDiagramElementEClass.getEStructuralFeatures().get(5);
+		return (EReference)umlDiagramElementEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -278,7 +307,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 */
 	@Override
 	public EReference getUmlDiagramElement_SourceUmlEdge() {
-		return (EReference) umlDiagramElementEClass.getEStructuralFeatures().get(6);
+		return (EReference)umlDiagramElementEClass.getEStructuralFeatures().get(6);
 	}
 
 	/**
@@ -300,7 +329,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 */
 	@Override
 	public EAttribute getUmlStyle_FontName() {
-		return (EAttribute) umlStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)umlStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -311,7 +340,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 */
 	@Override
 	public EAttribute getUmlStyle_FontSize() {
-		return (EAttribute) umlStyleEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)umlStyleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -344,7 +373,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 */
 	@Override
 	public EReference getUmlEdge_SourceUmlDiagramElement() {
-		return (EReference) umlEdgeEClass.getEStructuralFeatures().get(0);
+		return (EReference)umlEdgeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -355,7 +384,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 */
 	@Override
 	public EReference getUmlEdge_TargetUmlDiagramElement() {
-		return (EReference) umlEdgeEClass.getEStructuralFeatures().get(1);
+		return (EReference)umlEdgeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -377,7 +406,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 */
 	@Override
 	public EAttribute getUmlCompartment_Kind() {
-		return (EAttribute) umlCompartmentEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)umlCompartmentEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -399,7 +428,18 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 */
 	@Override
 	public EAttribute getUmlLabel_Kind() {
-		return (EAttribute) umlLabelEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)umlLabelEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EEnum getUmlDiagramKind() {
+		return umlDiagramKindEEnum;
 	}
 
 	/**
@@ -443,7 +483,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 */
 	@Override
 	public UMLDIFactory getUMLDIFactory() {
-		return (UMLDIFactory) getEFactoryInstance();
+		return (UMLDIFactory)getEFactoryInstance();
 	}
 
 	/**
@@ -463,13 +503,13 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) {
+		if(isCreated) {
 			return;
 		}
 		isCreated = true;
 		// Create classes and their features
 		umlDiagramEClass = createEClass(UML_DIAGRAM);
-		umlShapeEClass = createEClass(UML_SHAPE);
+		createEAttribute(umlDiagramEClass, UML_DIAGRAM__KIND);
 		umlDiagramElementEClass = createEClass(UML_DIAGRAM_ELEMENT);
 		createEReference(umlDiagramElementEClass, UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT);
 		createEReference(umlDiagramElementEClass, UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE);
@@ -485,11 +525,13 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 		umlEdgeEClass = createEClass(UML_EDGE);
 		createEReference(umlEdgeEClass, UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT);
 		createEReference(umlEdgeEClass, UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT);
+		umlShapeEClass = createEClass(UML_SHAPE);
 		umlCompartmentEClass = createEClass(UML_COMPARTMENT);
 		createEAttribute(umlCompartmentEClass, UML_COMPARTMENT__KIND);
 		umlLabelEClass = createEClass(UML_LABEL);
 		createEAttribute(umlLabelEClass, UML_LABEL__KIND);
 		// Create enums
+		umlDiagramKindEEnum = createEEnum(UML_DIAGRAM_KIND);
 		umlCompartmentKindEEnum = createEEnum(UML_COMPARTMENT_KIND);
 		umlLabelKindEEnum = createEEnum(UML_LABEL_KIND);
 	}
@@ -511,7 +553,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) {
+		if(isInitialized) {
 			return;
 		}
 		isInitialized = true;
@@ -520,40 +562,35 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 		setNsPrefix(eNS_PREFIX);
 		setNsURI(eNS_URI);
 		// Obtain other dependent packages
-		DIPackage theDIPackage = (DIPackage) EPackage.Registry.INSTANCE.getEPackage(DIPackage.eNS_URI);
-		UMLPackage theUMLPackage = (UMLPackage) EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);
-		DCPackage theDCPackage = (DCPackage) EPackage.Registry.INSTANCE.getEPackage(DCPackage.eNS_URI);
+		DIPackage theDIPackage = (DIPackage)EPackage.Registry.INSTANCE.getEPackage(DIPackage.eNS_URI);
+		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);
+		DCPackage theDCPackage = (DCPackage)EPackage.Registry.INSTANCE.getEPackage(DCPackage.eNS_URI);
 		// Create type parameters
 		// Set bounds for type parameters
 		// Add supertypes to classes
-		umlDiagramEClass.getESuperTypes().add(this.getUmlShape());
+		umlDiagramEClass.getESuperTypes().add(this.getUmlDiagramElement());
 		umlDiagramEClass.getESuperTypes().add(theDIPackage.getDiagram());
-		umlShapeEClass.getESuperTypes().add(this.getUmlDiagramElement());
-		umlShapeEClass.getESuperTypes().add(theDIPackage.getShape());
 		umlDiagramElementEClass.getESuperTypes().add(theDIPackage.getDiagramElement());
 		umlStyleEClass.getESuperTypes().add(theDIPackage.getStyle());
 		umlEdgeEClass.getESuperTypes().add(this.getUmlDiagramElement());
 		umlEdgeEClass.getESuperTypes().add(theDIPackage.getEdge());
-		umlCompartmentEClass.getESuperTypes().add(this.getUmlShape());
-		umlLabelEClass.getESuperTypes().add(this.getUmlShape());
+		umlShapeEClass.getESuperTypes().add(this.getUmlDiagramElement());
+		umlShapeEClass.getESuperTypes().add(theDIPackage.getShape());
+		umlCompartmentEClass.getESuperTypes().add(this.getUmlDiagramElement());
+		umlCompartmentEClass.getESuperTypes().add(theDIPackage.getShape());
+		umlLabelEClass.getESuperTypes().add(this.getUmlDiagramElement());
+		umlLabelEClass.getESuperTypes().add(theDIPackage.getShape());
 		// Initialize classes, features, and operations; add parameters
 		initEClass(umlDiagramEClass, UmlDiagram.class, "UmlDiagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEClass(umlShapeEClass, UmlShape.class, "UmlShape", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getUmlDiagram_Kind(), this.getUmlDiagramKind(), "kind", null, 1, 1, UmlDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEClass(umlDiagramElementEClass, UmlDiagramElement.class, "UmlDiagramElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getUmlDiagramElement_UmlModelElement(), theUMLPackage.getElement(), null, "umlModelElement", null, 0, -1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
-		initEReference(getUmlDiagramElement_SharedUmlStyle(), this.getUmlStyle(), null, "sharedUmlStyle", null, 0, 1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
-		initEReference(getUmlDiagramElement_LocalUmlStyle(), this.getUmlStyle(), null, "localUmlStyle", null, 0, 1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEReference(getUmlDiagramElement_OwningUmlDiagramElement(), this.getUmlDiagramElement(), this.getUmlDiagramElement_OwnedUmlDiagramElement(), "owningUmlDiagramElement", null, 0, 1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				!IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getUmlDiagramElement_OwnedUmlDiagramElement(), this.getUmlDiagramElement(), this.getUmlDiagramElement_OwningUmlDiagramElement(), "ownedUmlDiagramElement", null, 0, -1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getUmlDiagramElement_TargetUmlEdge(), this.getUmlEdge(), this.getUmlEdge_TargetUmlDiagramElement(), "targetUmlEdge", null, 0, -1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getUmlDiagramElement_SourceUmlEdge(), this.getUmlEdge(), this.getUmlEdge_SourceUmlDiagramElement(), "sourceUmlEdge", null, 0, -1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getUmlDiagramElement_UmlModelElement(), theUMLPackage.getElement(), null, "umlModelElement", null, 0, -1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getUmlDiagramElement_SharedUmlStyle(), this.getUmlStyle(), null, "sharedUmlStyle", null, 0, 1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getUmlDiagramElement_LocalUmlStyle(), this.getUmlStyle(), null, "localUmlStyle", null, 0, 1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getUmlDiagramElement_OwningUmlDiagramElement(), this.getUmlDiagramElement(), this.getUmlDiagramElement_OwnedUmlDiagramElement(), "owningUmlDiagramElement", null, 0, 1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getUmlDiagramElement_OwnedUmlDiagramElement(), this.getUmlDiagramElement(), this.getUmlDiagramElement_OwningUmlDiagramElement(), "ownedUmlDiagramElement", null, 0, -1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getUmlDiagramElement_TargetUmlEdge(), this.getUmlEdge(), this.getUmlEdge_TargetUmlDiagramElement(), "targetUmlEdge", null, 0, -1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getUmlDiagramElement_SourceUmlEdge(), this.getUmlEdge(), this.getUmlEdge_SourceUmlDiagramElement(), "sourceUmlEdge", null, 0, -1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEClass(umlStyleEClass, UmlStyle.class, "UmlStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getUmlStyle_FontName(), theDCPackage.getString(), "fontName", null, 0, 1, UmlStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getUmlStyle_FontSize(), theDCPackage.getReal(), "fontSize", null, 0, 1, UmlStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
@@ -566,20 +603,22 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 		initEClass(umlEdgeEClass, UmlEdge.class, "UmlEdge", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getUmlEdge_SourceUmlDiagramElement(), this.getUmlDiagramElement(), this.getUmlDiagramElement_SourceUmlEdge(), "sourceUmlDiagramElement", null, 1, 1, UmlEdge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getUmlEdge_TargetUmlDiagramElement(), this.getUmlDiagramElement(), this.getUmlDiagramElement_TargetUmlEdge(), "targetUmlDiagramElement", null, 1, 1, UmlEdge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getUmlEdge_SourceUmlDiagramElement(), this.getUmlDiagramElement(), this.getUmlDiagramElement_SourceUmlEdge(), "sourceUmlDiagramElement", null, 1, 1, UmlEdge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getUmlEdge_TargetUmlDiagramElement(), this.getUmlDiagramElement(), this.getUmlDiagramElement_TargetUmlEdge(), "targetUmlDiagramElement", null, 1, 1, UmlEdge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(umlShapeEClass, UmlShape.class, "UmlShape", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(umlCompartmentEClass, UmlCompartment.class, "UmlCompartment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getUmlCompartment_Kind(), this.getUmlCompartmentKind(), "kind", null, 1, 1, UmlCompartment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEClass(umlLabelEClass, UmlLabel.class, "UmlLabel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getUmlLabel_Kind(), this.getUmlLabelKind(), "kind", null, 1, 1, UmlLabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		// Initialize enums and add enum literals
+		initEEnum(umlDiagramKindEEnum, UmlDiagramKind.class, "UmlDiagramKind");
+		addEEnumLiteral(umlDiagramKindEEnum, UmlDiagramKind.CLASS);
 		initEEnum(umlCompartmentKindEEnum, UmlCompartmentKind.class, "UmlCompartmentKind");
 		addEEnumLiteral(umlCompartmentKindEEnum, UmlCompartmentKind.ATTRIBUTES);
 		addEEnumLiteral(umlCompartmentKindEEnum, UmlCompartmentKind.OPERATIONS);
 		initEEnum(umlLabelKindEEnum, UmlLabelKind.class, "UmlLabelKind");
 		addEEnumLiteral(umlLabelKindEEnum, UmlLabelKind.NAME);
+		addEEnumLiteral(umlLabelKindEEnum, UmlLabelKind.MULTIPLICITY);
 		// Create resource
 		createResource(eNS_URI);
 		// Create annotations
@@ -600,7 +639,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 */
 	protected void createEcoreAnnotations() {
 		String source = "http://www.eclipse.org/emf/2002/Ecore";
-		addAnnotation(this, source, new String[] { "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL" });
+		addAnnotation(this, source, new String[]{ "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL" });
 	}
 
 	/**
@@ -612,15 +651,15 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 */
 	protected void createSubsetsAnnotations() {
 		String source = "subsets";
-		addAnnotation(getUmlDiagramElement_UmlModelElement(), source, new String[] {}, new URI[] { URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/modelElement") });
-		addAnnotation(getUmlDiagramElement_SharedUmlStyle(), source, new String[] {}, new URI[] { URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/sharedStyle") });
-		addAnnotation(getUmlDiagramElement_LocalUmlStyle(), source, new String[] {}, new URI[] { URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/localStyle") });
-		addAnnotation(getUmlDiagramElement_OwningUmlDiagramElement(), source, new String[] {}, new URI[] { URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/owningDiagramElement") });
-		addAnnotation(getUmlDiagramElement_OwnedUmlDiagramElement(), source, new String[] {}, new URI[] { URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/ownedDiagramElement") });
-		addAnnotation(getUmlDiagramElement_TargetUmlEdge(), source, new String[] {}, new URI[] { URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/targetEdge") });
-		addAnnotation(getUmlDiagramElement_SourceUmlEdge(), source, new String[] {}, new URI[] { URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/sourceEdge") });
-		addAnnotation(getUmlEdge_SourceUmlDiagramElement(), source, new String[] {}, new URI[] { URI.createURI(DIPackage.eNS_URI).appendFragment("//Edge/sourceDiagramElement") });
-		addAnnotation(getUmlEdge_TargetUmlDiagramElement(), source, new String[] {}, new URI[] { URI.createURI(DIPackage.eNS_URI).appendFragment("//Edge/targetDiagramElement") });
+		addAnnotation(getUmlDiagramElement_UmlModelElement(), source, new String[]{}, new URI[]{ URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/modelElement") });
+		addAnnotation(getUmlDiagramElement_SharedUmlStyle(), source, new String[]{}, new URI[]{ URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/sharedStyle") });
+		addAnnotation(getUmlDiagramElement_LocalUmlStyle(), source, new String[]{}, new URI[]{ URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/localStyle") });
+		addAnnotation(getUmlDiagramElement_OwningUmlDiagramElement(), source, new String[]{}, new URI[]{ URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/owningDiagramElement") });
+		addAnnotation(getUmlDiagramElement_OwnedUmlDiagramElement(), source, new String[]{}, new URI[]{ URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/ownedDiagramElement") });
+		addAnnotation(getUmlDiagramElement_TargetUmlEdge(), source, new String[]{}, new URI[]{ URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/targetEdge") });
+		addAnnotation(getUmlDiagramElement_SourceUmlEdge(), source, new String[]{}, new URI[]{ URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/sourceEdge") });
+		addAnnotation(getUmlEdge_SourceUmlDiagramElement(), source, new String[]{}, new URI[]{ URI.createURI(DIPackage.eNS_URI).appendFragment("//Edge/sourceDiagramElement") });
+		addAnnotation(getUmlEdge_TargetUmlDiagramElement(), source, new String[]{}, new URI[]{ URI.createURI(DIPackage.eNS_URI).appendFragment("//Edge/targetDiagramElement") });
 	}
 
 	/**
@@ -632,6 +671,6 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 */
 	protected void createOCLAnnotations() {
 		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL";
-		addAnnotation(getUmlStyle__FontsizePositive__DiagnosticChain_Map(), source, new String[] { "body", "fontSize > 0" });
+		addAnnotation(getUmlStyle__FontsizePositive__DiagnosticChain_Map(), source, new String[]{ "body", "fontSize > 0" });
 	}
-} // UMLDIPackageImpl
+} //UMLDIPackageImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlCompartmentImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlCompartmentImpl.java
index d52b45a07a0..d8b97fe54c9 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlCompartmentImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlCompartmentImpl.java
@@ -12,8 +12,13 @@
 package org.eclipse.papyrus.umldi.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.dd.dc.Bounds;
+import org.eclipse.papyrus.dd.di.DIPackage;
+import org.eclipse.papyrus.dd.di.Shape;
 import org.eclipse.papyrus.umldi.UMLDIPackage;
 import org.eclipse.papyrus.umldi.UmlCompartment;
 import org.eclipse.papyrus.umldi.UmlCompartmentKind;
@@ -25,13 +30,25 @@ import org.eclipse.papyrus.umldi.UmlCompartmentKind;
  * <p>
  * The following features are implemented:
  * <ul>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlCompartmentImpl#getBounds <em>Bounds</em>}</li>
  * <li>{@link org.eclipse.papyrus.umldi.impl.UmlCompartmentImpl#getKind <em>Kind</em>}</li>
  * </ul>
  * </p>
  *
  * @generated
  */
-public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
+public class UmlCompartmentImpl extends UmlDiagramElementImpl implements UmlCompartment {
+
+	/**
+	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getBounds()
+	 * @generated
+	 * @ordered
+	 */
+	protected Bounds bounds;
 
 	/**
 	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
@@ -83,6 +100,62 @@ public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
 	 * @generated
 	 */
 	@Override
+	public Bounds getBounds() {
+		return bounds;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetBounds(Bounds newBounds, NotificationChain msgs) {
+		Bounds oldBounds = bounds;
+		bounds = newBounds;
+		if(eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_COMPARTMENT__BOUNDS, oldBounds, newBounds);
+			if(msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setBounds(Bounds newBounds) {
+		if(newBounds != bounds) {
+			NotificationChain msgs = null;
+			if(bounds != null) {
+				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_COMPARTMENT__BOUNDS, null, msgs);
+			}
+			if(newBounds != null) {
+				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_COMPARTMENT__BOUNDS, null, msgs);
+			}
+			msgs = basicSetBounds(newBounds, msgs);
+			if(msgs != null) {
+				msgs.dispatch();
+			}
+		} else if(eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_COMPARTMENT__BOUNDS, newBounds, newBounds));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public UmlCompartmentKind getKind() {
 		return kind;
 	}
@@ -97,7 +170,7 @@ public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
 	public void setKind(UmlCompartmentKind newKind) {
 		UmlCompartmentKind oldKind = kind;
 		kind = newKind == null ? KIND_EDEFAULT : newKind;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_COMPARTMENT__KIND, oldKind, kind));
 		}
 	}
@@ -109,8 +182,25 @@ public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
 	 * @generated
 	 */
 	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case UMLDIPackage.UML_COMPARTMENT__BOUNDS:
+			return basicSetBounds(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
+		case UMLDIPackage.UML_COMPARTMENT__BOUNDS:
+			return getBounds();
 		case UMLDIPackage.UML_COMPARTMENT__KIND:
 			return getKind();
 		}
@@ -125,9 +215,12 @@ public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
+		case UMLDIPackage.UML_COMPARTMENT__BOUNDS:
+			setBounds((Bounds)newValue);
+			return;
 		case UMLDIPackage.UML_COMPARTMENT__KIND:
-			setKind((UmlCompartmentKind) newValue);
+			setKind((UmlCompartmentKind)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -141,7 +234,10 @@ public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
+		case UMLDIPackage.UML_COMPARTMENT__BOUNDS:
+			setBounds((Bounds)null);
+			return;
 		case UMLDIPackage.UML_COMPARTMENT__KIND:
 			setKind(KIND_EDEFAULT);
 			return;
@@ -157,7 +253,9 @@ public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
+		case UMLDIPackage.UML_COMPARTMENT__BOUNDS:
+			return bounds != null;
 		case UMLDIPackage.UML_COMPARTMENT__KIND:
 			return kind != KIND_EDEFAULT;
 		}
@@ -171,8 +269,46 @@ public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
 	 * @generated
 	 */
 	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if(baseClass == Shape.class) {
+			switch(derivedFeatureID) {
+			case UMLDIPackage.UML_COMPARTMENT__BOUNDS:
+				return DIPackage.SHAPE__BOUNDS;
+			default:
+				return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if(baseClass == Shape.class) {
+			switch(baseFeatureID) {
+			case DIPackage.SHAPE__BOUNDS:
+				return UMLDIPackage.UML_COMPARTMENT__BOUNDS;
+			default:
+				return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
@@ -181,4 +317,4 @@ public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
 		result.append(')');
 		return result.toString();
 	}
-} // UmlCompartmentImpl
+} //UmlCompartmentImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramElementImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramElementImpl.java
index b8a636d04a0..ab1a5938009 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramElementImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramElementImpl.java
@@ -15,25 +15,34 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.InternalEList;
+
 import org.eclipse.papyrus.dd.di.DiagramElement;
 import org.eclipse.papyrus.dd.di.Edge;
 import org.eclipse.papyrus.dd.di.Style;
+
 import org.eclipse.papyrus.dd.di.impl.DiagramElementImpl;
+
 import org.eclipse.papyrus.umldi.UMLDIPackage;
 import org.eclipse.papyrus.umldi.UmlDiagramElement;
 import org.eclipse.papyrus.umldi.UmlEdge;
 import org.eclipse.papyrus.umldi.UmlStyle;
+
 import org.eclipse.uml2.common.util.DerivedUnionEObjectEList;
+
 import org.eclipse.uml2.uml.Element;
 
 /**
@@ -171,7 +180,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] MODEL_ELEMENT_ESUBSETS = new int[] { UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT };
+	protected static final int[] MODEL_ELEMENT_ESUBSETS = new int[]{ UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT };
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -182,7 +191,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	@Override
 	public Style getSharedStyle() {
 		Style sharedStyle = basicGetSharedStyle();
-		return sharedStyle != null && sharedStyle.eIsProxy() ? (Style) eResolveProxy((InternalEObject) sharedStyle) : sharedStyle;
+		return sharedStyle != null && sharedStyle.eIsProxy() ? (Style)eResolveProxy((InternalEObject)sharedStyle) : sharedStyle;
 	}
 
 	/**
@@ -193,7 +202,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 */
 	@Override
 	public Style basicGetSharedStyle() {
-		if (eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE)) {
+		if(eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE)) {
 			return basicGetSharedUmlStyle();
 		}
 		return super.basicGetSharedStyle();
@@ -208,7 +217,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	@Override
 	public Style getLocalStyle() {
 		Style localStyle = basicGetLocalStyle();
-		return localStyle != null && localStyle.eIsProxy() ? (Style) eResolveProxy((InternalEObject) localStyle) : localStyle;
+		return localStyle != null && localStyle.eIsProxy() ? (Style)eResolveProxy((InternalEObject)localStyle) : localStyle;
 	}
 
 	/**
@@ -219,7 +228,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 */
 	@Override
 	public Style basicGetLocalStyle() {
-		if (eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE)) {
+		if(eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE)) {
 			return getLocalUmlStyle();
 		}
 		return super.basicGetLocalStyle();
@@ -234,7 +243,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	@Override
 	public DiagramElement getOwningDiagramElement() {
 		DiagramElement owningDiagramElement = basicGetOwningDiagramElement();
-		return owningDiagramElement != null && owningDiagramElement.eIsProxy() ? (DiagramElement) eResolveProxy((InternalEObject) owningDiagramElement) : owningDiagramElement;
+		return owningDiagramElement != null && owningDiagramElement.eIsProxy() ? (DiagramElement)eResolveProxy((InternalEObject)owningDiagramElement) : owningDiagramElement;
 	}
 
 	/**
@@ -246,7 +255,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	@Override
 	public DiagramElement basicGetOwningDiagramElement() {
 		UmlDiagramElement owningUmlDiagramElement = getOwningUmlDiagramElement();
-		if (owningUmlDiagramElement != null) {
+		if(owningUmlDiagramElement != null) {
 			return owningUmlDiagramElement;
 		}
 		return super.basicGetOwningDiagramElement();
@@ -272,7 +281,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OWNED_DIAGRAM_ELEMENT_ESUBSETS = new int[] { UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT };
+	protected static final int[] OWNED_DIAGRAM_ELEMENT_ESUBSETS = new int[]{ UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT };
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -294,7 +303,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] TARGET_EDGE_ESUBSETS = new int[] { UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE };
+	protected static final int[] TARGET_EDGE_ESUBSETS = new int[]{ UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE };
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -316,7 +325,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] SOURCE_EDGE_ESUBSETS = new int[] { UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE };
+	protected static final int[] SOURCE_EDGE_ESUBSETS = new int[]{ UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE };
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -326,7 +335,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 */
 	@Override
 	public EList<Element> getUmlModelElement() {
-		if (umlModelElement == null) {
+		if(umlModelElement == null) {
 			umlModelElement = new EObjectResolvingEList<Element>(Element.class, this, UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT);
 		}
 		return umlModelElement;
@@ -340,11 +349,11 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 */
 	@Override
 	public UmlStyle getSharedUmlStyle() {
-		if (sharedUmlStyle != null && sharedUmlStyle.eIsProxy()) {
-			InternalEObject oldSharedUmlStyle = (InternalEObject) sharedUmlStyle;
-			sharedUmlStyle = (UmlStyle) eResolveProxy(oldSharedUmlStyle);
-			if (sharedUmlStyle != oldSharedUmlStyle) {
-				if (eNotificationRequired()) {
+		if(sharedUmlStyle != null && sharedUmlStyle.eIsProxy()) {
+			InternalEObject oldSharedUmlStyle = (InternalEObject)sharedUmlStyle;
+			sharedUmlStyle = (UmlStyle)eResolveProxy(oldSharedUmlStyle);
+			if(sharedUmlStyle != oldSharedUmlStyle) {
+				if(eNotificationRequired()) {
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE, oldSharedUmlStyle, sharedUmlStyle));
 				}
 			}
@@ -372,7 +381,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	public void setSharedUmlStyle(UmlStyle newSharedUmlStyle) {
 		UmlStyle oldSharedUmlStyle = sharedUmlStyle;
 		sharedUmlStyle = newSharedUmlStyle;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE, oldSharedUmlStyle, sharedUmlStyle));
 		}
 	}
@@ -397,9 +406,9 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	public NotificationChain basicSetLocalUmlStyle(UmlStyle newLocalUmlStyle, NotificationChain msgs) {
 		UmlStyle oldLocalUmlStyle = localUmlStyle;
 		localUmlStyle = newLocalUmlStyle;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE, oldLocalUmlStyle, newLocalUmlStyle);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -416,19 +425,19 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 */
 	@Override
 	public void setLocalUmlStyle(UmlStyle newLocalUmlStyle) {
-		if (newLocalUmlStyle != localUmlStyle) {
+		if(newLocalUmlStyle != localUmlStyle) {
 			NotificationChain msgs = null;
-			if (localUmlStyle != null) {
-				msgs = ((InternalEObject) localUmlStyle).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE, null, msgs);
+			if(localUmlStyle != null) {
+				msgs = ((InternalEObject)localUmlStyle).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE, null, msgs);
 			}
-			if (newLocalUmlStyle != null) {
-				msgs = ((InternalEObject) newLocalUmlStyle).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE, null, msgs);
+			if(newLocalUmlStyle != null) {
+				msgs = ((InternalEObject)newLocalUmlStyle).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE, null, msgs);
 			}
 			msgs = basicSetLocalUmlStyle(newLocalUmlStyle, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE, newLocalUmlStyle, newLocalUmlStyle));
 		}
 	}
@@ -441,10 +450,10 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 */
 	@Override
 	public UmlDiagramElement getOwningUmlDiagramElement() {
-		if (eContainerFeatureID() != UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT) {
+		if(eContainerFeatureID() != UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT) {
 			return null;
 		}
-		return (UmlDiagramElement) eInternalContainer();
+		return (UmlDiagramElement)eInternalContainer();
 	}
 
 	/**
@@ -454,7 +463,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 * @generated
 	 */
 	public NotificationChain basicSetOwningUmlDiagramElement(UmlDiagramElement newOwningUmlDiagramElement, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject) newOwningUmlDiagramElement, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT, msgs);
+		msgs = eBasicSetContainer((InternalEObject)newOwningUmlDiagramElement, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT, msgs);
 		return msgs;
 	}
 
@@ -466,22 +475,22 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 */
 	@Override
 	public void setOwningUmlDiagramElement(UmlDiagramElement newOwningUmlDiagramElement) {
-		if (newOwningUmlDiagramElement != eInternalContainer() || (eContainerFeatureID() != UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT && newOwningUmlDiagramElement != null)) {
-			if (EcoreUtil.isAncestor(this, newOwningUmlDiagramElement)) {
+		if(newOwningUmlDiagramElement != eInternalContainer() || (eContainerFeatureID() != UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT && newOwningUmlDiagramElement != null)) {
+			if(EcoreUtil.isAncestor(this, newOwningUmlDiagramElement)) {
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			}
 			NotificationChain msgs = null;
-			if (eInternalContainer() != null) {
+			if(eInternalContainer() != null) {
 				msgs = eBasicRemoveFromContainer(msgs);
 			}
-			if (newOwningUmlDiagramElement != null) {
-				msgs = ((InternalEObject) newOwningUmlDiagramElement).eInverseAdd(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UmlDiagramElement.class, msgs);
+			if(newOwningUmlDiagramElement != null) {
+				msgs = ((InternalEObject)newOwningUmlDiagramElement).eInverseAdd(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UmlDiagramElement.class, msgs);
 			}
 			msgs = basicSetOwningUmlDiagramElement(newOwningUmlDiagramElement, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT, newOwningUmlDiagramElement, newOwningUmlDiagramElement));
 		}
 	}
@@ -494,7 +503,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 */
 	@Override
 	public EList<UmlDiagramElement> getOwnedUmlDiagramElement() {
-		if (ownedUmlDiagramElement == null) {
+		if(ownedUmlDiagramElement == null) {
 			ownedUmlDiagramElement = new EObjectContainmentWithInverseEList<UmlDiagramElement>(UmlDiagramElement.class, this, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT);
 		}
 		return ownedUmlDiagramElement;
@@ -508,7 +517,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 */
 	@Override
 	public EList<UmlEdge> getTargetUmlEdge() {
-		if (targetUmlEdge == null) {
+		if(targetUmlEdge == null) {
 			targetUmlEdge = new EObjectWithInverseResolvingEList<UmlEdge>(UmlEdge.class, this, UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT);
 		}
 		return targetUmlEdge;
@@ -522,7 +531,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 */
 	@Override
 	public EList<UmlEdge> getSourceUmlEdge() {
-		if (sourceUmlEdge == null) {
+		if(sourceUmlEdge == null) {
 			sourceUmlEdge = new EObjectWithInverseResolvingEList<UmlEdge>(UmlEdge.class, this, UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT);
 		}
 		return sourceUmlEdge;
@@ -537,18 +546,18 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	@SuppressWarnings("unchecked")
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
-			if (eInternalContainer() != null) {
+			if(eInternalContainer() != null) {
 				msgs = eBasicRemoveFromContainer(msgs);
 			}
-			return basicSetOwningUmlDiagramElement((UmlDiagramElement) otherEnd, msgs);
+			return basicSetOwningUmlDiagramElement((UmlDiagramElement)otherEnd, msgs);
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getOwnedUmlDiagramElement()).basicAdd(otherEnd, msgs);
+			return ((InternalEList<InternalEObject>)(InternalEList<?>)getOwnedUmlDiagramElement()).basicAdd(otherEnd, msgs);
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getTargetUmlEdge()).basicAdd(otherEnd, msgs);
+			return ((InternalEList<InternalEObject>)(InternalEList<?>)getTargetUmlEdge()).basicAdd(otherEnd, msgs);
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getSourceUmlEdge()).basicAdd(otherEnd, msgs);
+			return ((InternalEList<InternalEObject>)(InternalEList<?>)getSourceUmlEdge()).basicAdd(otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -561,17 +570,17 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
 			return basicSetLocalUmlStyle(null, msgs);
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
 			return basicSetOwningUmlDiagramElement(null, msgs);
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
-			return ((InternalEList<?>) getOwnedUmlDiagramElement()).basicRemove(otherEnd, msgs);
+			return ((InternalEList<?>)getOwnedUmlDiagramElement()).basicRemove(otherEnd, msgs);
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
-			return ((InternalEList<?>) getTargetUmlEdge()).basicRemove(otherEnd, msgs);
+			return ((InternalEList<?>)getTargetUmlEdge()).basicRemove(otherEnd, msgs);
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
-			return ((InternalEList<?>) getSourceUmlEdge()).basicRemove(otherEnd, msgs);
+			return ((InternalEList<?>)getSourceUmlEdge()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -584,7 +593,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 */
 	@Override
 	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
+		switch(eContainerFeatureID()) {
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
 			return eInternalContainer().eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UmlDiagramElement.class, msgs);
 		}
@@ -599,11 +608,11 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT:
 			return getUmlModelElement();
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE:
-			if (resolve) {
+			if(resolve) {
 				return getSharedUmlStyle();
 			}
 			return basicGetSharedUmlStyle();
@@ -630,31 +639,31 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT:
 			getUmlModelElement().clear();
-			getUmlModelElement().addAll((Collection<? extends Element>) newValue);
+			getUmlModelElement().addAll((Collection<? extends Element>)newValue);
 			return;
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE:
-			setSharedUmlStyle((UmlStyle) newValue);
+			setSharedUmlStyle((UmlStyle)newValue);
 			return;
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
-			setLocalUmlStyle((UmlStyle) newValue);
+			setLocalUmlStyle((UmlStyle)newValue);
 			return;
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
-			setOwningUmlDiagramElement((UmlDiagramElement) newValue);
+			setOwningUmlDiagramElement((UmlDiagramElement)newValue);
 			return;
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
 			getOwnedUmlDiagramElement().clear();
-			getOwnedUmlDiagramElement().addAll((Collection<? extends UmlDiagramElement>) newValue);
+			getOwnedUmlDiagramElement().addAll((Collection<? extends UmlDiagramElement>)newValue);
 			return;
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
 			getTargetUmlEdge().clear();
-			getTargetUmlEdge().addAll((Collection<? extends UmlEdge>) newValue);
+			getTargetUmlEdge().addAll((Collection<? extends UmlEdge>)newValue);
 			return;
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
 			getSourceUmlEdge().clear();
-			getSourceUmlEdge().addAll((Collection<? extends UmlEdge>) newValue);
+			getSourceUmlEdge().addAll((Collection<? extends UmlEdge>)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -668,18 +677,18 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT:
 			getUmlModelElement().clear();
 			return;
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE:
-			setSharedUmlStyle((UmlStyle) null);
+			setSharedUmlStyle((UmlStyle)null);
 			return;
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
-			setLocalUmlStyle((UmlStyle) null);
+			setLocalUmlStyle((UmlStyle)null);
 			return;
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
-			setOwningUmlDiagramElement((UmlDiagramElement) null);
+			setOwningUmlDiagramElement((UmlDiagramElement)null);
 			return;
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
 			getOwnedUmlDiagramElement().clear();
@@ -702,7 +711,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__MODEL_ELEMENT:
 			return isSetModelElement();
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_STYLE:
@@ -811,4 +820,4 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	public boolean isSetSourceEdge() {
 		return super.isSetSourceEdge() || eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE);
 	}
-} // UmlDiagramElementImpl
+} //UmlDiagramElementImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramImpl.java
index 856ac7f6719..da4da384d0a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramImpl.java
@@ -12,12 +12,17 @@
 package org.eclipse.papyrus.umldi.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.dd.dc.Bounds;
 import org.eclipse.papyrus.dd.di.DIPackage;
 import org.eclipse.papyrus.dd.di.Diagram;
+import org.eclipse.papyrus.dd.di.Shape;
 import org.eclipse.papyrus.umldi.UMLDIPackage;
 import org.eclipse.papyrus.umldi.UmlDiagram;
+import org.eclipse.papyrus.umldi.UmlDiagramKind;
 
 /**
  * <!-- begin-user-doc -->
@@ -26,15 +31,28 @@ import org.eclipse.papyrus.umldi.UmlDiagram;
  * <p>
  * The following features are implemented:
  * <ul>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramImpl#getBounds <em>Bounds</em>}</li>
  * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramImpl#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramImpl#getDocumentation <em>Documentation</em>}</li>
  * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramImpl#getResolution <em>Resolution</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramImpl#getKind <em>Kind</em>}</li>
  * </ul>
  * </p>
  *
  * @generated
  */
-public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
+public class UmlDiagramImpl extends UmlDiagramElementImpl implements UmlDiagram {
+
+	/**
+	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getBounds()
+	 * @generated
+	 * @ordered
+	 */
+	protected Bounds bounds;
 
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -103,6 +121,28 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	protected double resolution = RESOLUTION_EDEFAULT;
 
 	/**
+	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getKind()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final UmlDiagramKind KIND_EDEFAULT = UmlDiagramKind.CLASS;
+
+	/**
+	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getKind()
+	 * @generated
+	 * @ordered
+	 */
+	protected UmlDiagramKind kind = KIND_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -130,6 +170,62 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	 * @generated
 	 */
 	@Override
+	public Bounds getBounds() {
+		return bounds;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetBounds(Bounds newBounds, NotificationChain msgs) {
+		Bounds oldBounds = bounds;
+		bounds = newBounds;
+		if(eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM__BOUNDS, oldBounds, newBounds);
+			if(msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setBounds(Bounds newBounds) {
+		if(newBounds != bounds) {
+			NotificationChain msgs = null;
+			if(bounds != null) {
+				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_DIAGRAM__BOUNDS, null, msgs);
+			}
+			if(newBounds != null) {
+				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_DIAGRAM__BOUNDS, null, msgs);
+			}
+			msgs = basicSetBounds(newBounds, msgs);
+			if(msgs != null) {
+				msgs.dispatch();
+			}
+		} else if(eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM__BOUNDS, newBounds, newBounds));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -144,7 +240,7 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM__NAME, oldName, name));
 		}
 	}
@@ -170,7 +266,7 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	public void setDocumentation(String newDocumentation) {
 		String oldDocumentation = documentation;
 		documentation = newDocumentation;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM__DOCUMENTATION, oldDocumentation, documentation));
 		}
 	}
@@ -196,7 +292,7 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	public void setResolution(double newResolution) {
 		double oldResolution = resolution;
 		resolution = newResolution;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM__RESOLUTION, oldResolution, resolution));
 		}
 	}
@@ -208,14 +304,59 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	 * @generated
 	 */
 	@Override
+	public UmlDiagramKind getKind() {
+		return kind;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setKind(UmlDiagramKind newKind) {
+		UmlDiagramKind oldKind = kind;
+		kind = newKind == null ? KIND_EDEFAULT : newKind;
+		if(eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM__KIND, oldKind, kind));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case UMLDIPackage.UML_DIAGRAM__BOUNDS:
+			return basicSetBounds(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
+		case UMLDIPackage.UML_DIAGRAM__BOUNDS:
+			return getBounds();
 		case UMLDIPackage.UML_DIAGRAM__NAME:
 			return getName();
 		case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
 			return getDocumentation();
 		case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
 			return getResolution();
+		case UMLDIPackage.UML_DIAGRAM__KIND:
+			return getKind();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -228,15 +369,21 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
+		case UMLDIPackage.UML_DIAGRAM__BOUNDS:
+			setBounds((Bounds)newValue);
+			return;
 		case UMLDIPackage.UML_DIAGRAM__NAME:
-			setName((String) newValue);
+			setName((String)newValue);
 			return;
 		case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
-			setDocumentation((String) newValue);
+			setDocumentation((String)newValue);
 			return;
 		case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
-			setResolution((Double) newValue);
+			setResolution((Double)newValue);
+			return;
+		case UMLDIPackage.UML_DIAGRAM__KIND:
+			setKind((UmlDiagramKind)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -250,7 +397,10 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
+		case UMLDIPackage.UML_DIAGRAM__BOUNDS:
+			setBounds((Bounds)null);
+			return;
 		case UMLDIPackage.UML_DIAGRAM__NAME:
 			setName(NAME_EDEFAULT);
 			return;
@@ -260,6 +410,9 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 		case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
 			setResolution(RESOLUTION_EDEFAULT);
 			return;
+		case UMLDIPackage.UML_DIAGRAM__KIND:
+			setKind(KIND_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -272,13 +425,17 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
+		case UMLDIPackage.UML_DIAGRAM__BOUNDS:
+			return bounds != null;
 		case UMLDIPackage.UML_DIAGRAM__NAME:
 			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 		case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
 			return DOCUMENTATION_EDEFAULT == null ? documentation != null : !DOCUMENTATION_EDEFAULT.equals(documentation);
 		case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
 			return resolution != RESOLUTION_EDEFAULT;
+		case UMLDIPackage.UML_DIAGRAM__KIND:
+			return kind != KIND_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -291,8 +448,16 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == Diagram.class) {
-			switch (derivedFeatureID) {
+		if(baseClass == Shape.class) {
+			switch(derivedFeatureID) {
+			case UMLDIPackage.UML_DIAGRAM__BOUNDS:
+				return DIPackage.SHAPE__BOUNDS;
+			default:
+				return -1;
+			}
+		}
+		if(baseClass == Diagram.class) {
+			switch(derivedFeatureID) {
 			case UMLDIPackage.UML_DIAGRAM__NAME:
 				return DIPackage.DIAGRAM__NAME;
 			case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
@@ -314,8 +479,16 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == Diagram.class) {
-			switch (baseFeatureID) {
+		if(baseClass == Shape.class) {
+			switch(baseFeatureID) {
+			case DIPackage.SHAPE__BOUNDS:
+				return UMLDIPackage.UML_DIAGRAM__BOUNDS;
+			default:
+				return -1;
+			}
+		}
+		if(baseClass == Diagram.class) {
+			switch(baseFeatureID) {
 			case DIPackage.DIAGRAM__NAME:
 				return UMLDIPackage.UML_DIAGRAM__NAME;
 			case DIPackage.DIAGRAM__DOCUMENTATION:
@@ -337,7 +510,7 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
@@ -347,7 +520,9 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 		result.append(documentation);
 		result.append(", resolution: ");
 		result.append(resolution);
+		result.append(", kind: ");
+		result.append(kind);
 		result.append(')');
 		return result.toString();
 	}
-} // UmlDiagramImpl
+} //UmlDiagramImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlEdgeImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlEdgeImpl.java
index 2f5f2224583..34991c79dbd 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlEdgeImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlEdgeImpl.java
@@ -15,16 +15,23 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+
 import org.eclipse.papyrus.dd.dc.Point;
+
 import org.eclipse.papyrus.dd.di.DIPackage;
 import org.eclipse.papyrus.dd.di.DiagramElement;
 import org.eclipse.papyrus.dd.di.Edge;
+
 import org.eclipse.papyrus.umldi.UMLDIPackage;
 import org.eclipse.papyrus.umldi.UmlDiagramElement;
 import org.eclipse.papyrus.umldi.UmlEdge;
@@ -111,7 +118,7 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	@Override
 	public DiagramElement getSourceDiagramElement() {
 		DiagramElement sourceDiagramElement = basicGetSourceDiagramElement();
-		return sourceDiagramElement != null && sourceDiagramElement.eIsProxy() ? (DiagramElement) eResolveProxy((InternalEObject) sourceDiagramElement) : sourceDiagramElement;
+		return sourceDiagramElement != null && sourceDiagramElement.eIsProxy() ? (DiagramElement)eResolveProxy((InternalEObject)sourceDiagramElement) : sourceDiagramElement;
 	}
 
 	/**
@@ -121,7 +128,7 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	 * @generated
 	 */
 	public DiagramElement basicGetSourceDiagramElement() {
-		if (eIsSet(UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT)) {
+		if(eIsSet(UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT)) {
 			return basicGetSourceUmlDiagramElement();
 		}
 		return null;
@@ -136,7 +143,7 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	@Override
 	public DiagramElement getTargetDiagramElement() {
 		DiagramElement targetDiagramElement = basicGetTargetDiagramElement();
-		return targetDiagramElement != null && targetDiagramElement.eIsProxy() ? (DiagramElement) eResolveProxy((InternalEObject) targetDiagramElement) : targetDiagramElement;
+		return targetDiagramElement != null && targetDiagramElement.eIsProxy() ? (DiagramElement)eResolveProxy((InternalEObject)targetDiagramElement) : targetDiagramElement;
 	}
 
 	/**
@@ -146,7 +153,7 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	 * @generated
 	 */
 	public DiagramElement basicGetTargetDiagramElement() {
-		if (eIsSet(UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT)) {
+		if(eIsSet(UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT)) {
 			return basicGetTargetUmlDiagramElement();
 		}
 		return null;
@@ -160,7 +167,7 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	 */
 	@Override
 	public EList<Point> getWaypoint() {
-		if (waypoint == null) {
+		if(waypoint == null) {
 			waypoint = new EObjectContainmentEList<Point>(Point.class, this, UMLDIPackage.UML_EDGE__WAYPOINT);
 		}
 		return waypoint;
@@ -174,11 +181,11 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	 */
 	@Override
 	public UmlDiagramElement getSourceUmlDiagramElement() {
-		if (sourceUmlDiagramElement != null && sourceUmlDiagramElement.eIsProxy()) {
-			InternalEObject oldSourceUmlDiagramElement = (InternalEObject) sourceUmlDiagramElement;
-			sourceUmlDiagramElement = (UmlDiagramElement) eResolveProxy(oldSourceUmlDiagramElement);
-			if (sourceUmlDiagramElement != oldSourceUmlDiagramElement) {
-				if (eNotificationRequired()) {
+		if(sourceUmlDiagramElement != null && sourceUmlDiagramElement.eIsProxy()) {
+			InternalEObject oldSourceUmlDiagramElement = (InternalEObject)sourceUmlDiagramElement;
+			sourceUmlDiagramElement = (UmlDiagramElement)eResolveProxy(oldSourceUmlDiagramElement);
+			if(sourceUmlDiagramElement != oldSourceUmlDiagramElement) {
+				if(eNotificationRequired()) {
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT, oldSourceUmlDiagramElement, sourceUmlDiagramElement));
 				}
 			}
@@ -205,9 +212,9 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	public NotificationChain basicSetSourceUmlDiagramElement(UmlDiagramElement newSourceUmlDiagramElement, NotificationChain msgs) {
 		UmlDiagramElement oldSourceUmlDiagramElement = sourceUmlDiagramElement;
 		sourceUmlDiagramElement = newSourceUmlDiagramElement;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT, oldSourceUmlDiagramElement, newSourceUmlDiagramElement);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -224,19 +231,19 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	 */
 	@Override
 	public void setSourceUmlDiagramElement(UmlDiagramElement newSourceUmlDiagramElement) {
-		if (newSourceUmlDiagramElement != sourceUmlDiagramElement) {
+		if(newSourceUmlDiagramElement != sourceUmlDiagramElement) {
 			NotificationChain msgs = null;
-			if (sourceUmlDiagramElement != null) {
-				msgs = ((InternalEObject) sourceUmlDiagramElement).eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, UmlDiagramElement.class, msgs);
+			if(sourceUmlDiagramElement != null) {
+				msgs = ((InternalEObject)sourceUmlDiagramElement).eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, UmlDiagramElement.class, msgs);
 			}
-			if (newSourceUmlDiagramElement != null) {
-				msgs = ((InternalEObject) newSourceUmlDiagramElement).eInverseAdd(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, UmlDiagramElement.class, msgs);
+			if(newSourceUmlDiagramElement != null) {
+				msgs = ((InternalEObject)newSourceUmlDiagramElement).eInverseAdd(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, UmlDiagramElement.class, msgs);
 			}
 			msgs = basicSetSourceUmlDiagramElement(newSourceUmlDiagramElement, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT, newSourceUmlDiagramElement, newSourceUmlDiagramElement));
 		}
 	}
@@ -249,11 +256,11 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	 */
 	@Override
 	public UmlDiagramElement getTargetUmlDiagramElement() {
-		if (targetUmlDiagramElement != null && targetUmlDiagramElement.eIsProxy()) {
-			InternalEObject oldTargetUmlDiagramElement = (InternalEObject) targetUmlDiagramElement;
-			targetUmlDiagramElement = (UmlDiagramElement) eResolveProxy(oldTargetUmlDiagramElement);
-			if (targetUmlDiagramElement != oldTargetUmlDiagramElement) {
-				if (eNotificationRequired()) {
+		if(targetUmlDiagramElement != null && targetUmlDiagramElement.eIsProxy()) {
+			InternalEObject oldTargetUmlDiagramElement = (InternalEObject)targetUmlDiagramElement;
+			targetUmlDiagramElement = (UmlDiagramElement)eResolveProxy(oldTargetUmlDiagramElement);
+			if(targetUmlDiagramElement != oldTargetUmlDiagramElement) {
+				if(eNotificationRequired()) {
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT, oldTargetUmlDiagramElement, targetUmlDiagramElement));
 				}
 			}
@@ -280,9 +287,9 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	public NotificationChain basicSetTargetUmlDiagramElement(UmlDiagramElement newTargetUmlDiagramElement, NotificationChain msgs) {
 		UmlDiagramElement oldTargetUmlDiagramElement = targetUmlDiagramElement;
 		targetUmlDiagramElement = newTargetUmlDiagramElement;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT, oldTargetUmlDiagramElement, newTargetUmlDiagramElement);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -299,19 +306,19 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	 */
 	@Override
 	public void setTargetUmlDiagramElement(UmlDiagramElement newTargetUmlDiagramElement) {
-		if (newTargetUmlDiagramElement != targetUmlDiagramElement) {
+		if(newTargetUmlDiagramElement != targetUmlDiagramElement) {
 			NotificationChain msgs = null;
-			if (targetUmlDiagramElement != null) {
-				msgs = ((InternalEObject) targetUmlDiagramElement).eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, UmlDiagramElement.class, msgs);
+			if(targetUmlDiagramElement != null) {
+				msgs = ((InternalEObject)targetUmlDiagramElement).eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, UmlDiagramElement.class, msgs);
 			}
-			if (newTargetUmlDiagramElement != null) {
-				msgs = ((InternalEObject) newTargetUmlDiagramElement).eInverseAdd(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, UmlDiagramElement.class, msgs);
+			if(newTargetUmlDiagramElement != null) {
+				msgs = ((InternalEObject)newTargetUmlDiagramElement).eInverseAdd(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, UmlDiagramElement.class, msgs);
 			}
 			msgs = basicSetTargetUmlDiagramElement(newTargetUmlDiagramElement, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT, newTargetUmlDiagramElement, newTargetUmlDiagramElement));
 		}
 	}
@@ -324,17 +331,17 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	 */
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
-			if (sourceUmlDiagramElement != null) {
-				msgs = ((InternalEObject) sourceUmlDiagramElement).eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, UmlDiagramElement.class, msgs);
+			if(sourceUmlDiagramElement != null) {
+				msgs = ((InternalEObject)sourceUmlDiagramElement).eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, UmlDiagramElement.class, msgs);
 			}
-			return basicSetSourceUmlDiagramElement((UmlDiagramElement) otherEnd, msgs);
+			return basicSetSourceUmlDiagramElement((UmlDiagramElement)otherEnd, msgs);
 		case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
-			if (targetUmlDiagramElement != null) {
-				msgs = ((InternalEObject) targetUmlDiagramElement).eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, UmlDiagramElement.class, msgs);
+			if(targetUmlDiagramElement != null) {
+				msgs = ((InternalEObject)targetUmlDiagramElement).eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, UmlDiagramElement.class, msgs);
 			}
-			return basicSetTargetUmlDiagramElement((UmlDiagramElement) otherEnd, msgs);
+			return basicSetTargetUmlDiagramElement((UmlDiagramElement)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -347,9 +354,9 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_EDGE__WAYPOINT:
-			return ((InternalEList<?>) getWaypoint()).basicRemove(otherEnd, msgs);
+			return ((InternalEList<?>)getWaypoint()).basicRemove(otherEnd, msgs);
 		case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
 			return basicSetSourceUmlDiagramElement(null, msgs);
 		case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
@@ -366,26 +373,26 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_EDGE__SOURCE_DIAGRAM_ELEMENT:
-			if (resolve) {
+			if(resolve) {
 				return getSourceDiagramElement();
 			}
 			return basicGetSourceDiagramElement();
 		case UMLDIPackage.UML_EDGE__TARGET_DIAGRAM_ELEMENT:
-			if (resolve) {
+			if(resolve) {
 				return getTargetDiagramElement();
 			}
 			return basicGetTargetDiagramElement();
 		case UMLDIPackage.UML_EDGE__WAYPOINT:
 			return getWaypoint();
 		case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
-			if (resolve) {
+			if(resolve) {
 				return getSourceUmlDiagramElement();
 			}
 			return basicGetSourceUmlDiagramElement();
 		case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
-			if (resolve) {
+			if(resolve) {
 				return getTargetUmlDiagramElement();
 			}
 			return basicGetTargetUmlDiagramElement();
@@ -402,16 +409,16 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_EDGE__WAYPOINT:
 			getWaypoint().clear();
-			getWaypoint().addAll((Collection<? extends Point>) newValue);
+			getWaypoint().addAll((Collection<? extends Point>)newValue);
 			return;
 		case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
-			setSourceUmlDiagramElement((UmlDiagramElement) newValue);
+			setSourceUmlDiagramElement((UmlDiagramElement)newValue);
 			return;
 		case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
-			setTargetUmlDiagramElement((UmlDiagramElement) newValue);
+			setTargetUmlDiagramElement((UmlDiagramElement)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -425,15 +432,15 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_EDGE__WAYPOINT:
 			getWaypoint().clear();
 			return;
 		case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
-			setSourceUmlDiagramElement((UmlDiagramElement) null);
+			setSourceUmlDiagramElement((UmlDiagramElement)null);
 			return;
 		case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
-			setTargetUmlDiagramElement((UmlDiagramElement) null);
+			setTargetUmlDiagramElement((UmlDiagramElement)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -447,7 +454,7 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_EDGE__SOURCE_DIAGRAM_ELEMENT:
 			return isSetSourceDiagramElement();
 		case UMLDIPackage.UML_EDGE__TARGET_DIAGRAM_ELEMENT:
@@ -470,8 +477,8 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == Edge.class) {
-			switch (derivedFeatureID) {
+		if(baseClass == Edge.class) {
+			switch(derivedFeatureID) {
 			case UMLDIPackage.UML_EDGE__SOURCE_DIAGRAM_ELEMENT:
 				return DIPackage.EDGE__SOURCE_DIAGRAM_ELEMENT;
 			case UMLDIPackage.UML_EDGE__WAYPOINT:
@@ -493,8 +500,8 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == Edge.class) {
-			switch (baseFeatureID) {
+		if(baseClass == Edge.class) {
+			switch(baseFeatureID) {
 			case DIPackage.EDGE__SOURCE_DIAGRAM_ELEMENT:
 				return UMLDIPackage.UML_EDGE__SOURCE_DIAGRAM_ELEMENT;
 			case DIPackage.EDGE__WAYPOINT:
@@ -527,4 +534,4 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	public boolean isSetTargetDiagramElement() {
 		return eIsSet(UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT);
 	}
-} // UmlEdgeImpl
+} //UmlEdgeImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlLabelImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlLabelImpl.java
index 8940ea7da6d..e059c19e939 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlLabelImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlLabelImpl.java
@@ -12,8 +12,16 @@
 package org.eclipse.papyrus.umldi.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.dd.dc.Bounds;
+import org.eclipse.papyrus.dd.di.DIPackage;
+import org.eclipse.papyrus.dd.di.Shape;
 import org.eclipse.papyrus.umldi.UMLDIPackage;
 import org.eclipse.papyrus.umldi.UmlLabel;
 import org.eclipse.papyrus.umldi.UmlLabelKind;
@@ -25,13 +33,25 @@ import org.eclipse.papyrus.umldi.UmlLabelKind;
  * <p>
  * The following features are implemented:
  * <ul>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlLabelImpl#getBounds <em>Bounds</em>}</li>
  * <li>{@link org.eclipse.papyrus.umldi.impl.UmlLabelImpl#getKind <em>Kind</em>}</li>
  * </ul>
  * </p>
  *
  * @generated
  */
-public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
+public class UmlLabelImpl extends UmlDiagramElementImpl implements UmlLabel {
+
+	/**
+	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getBounds()
+	 * @generated
+	 * @ordered
+	 */
+	protected Bounds bounds;
 
 	/**
 	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
@@ -83,6 +103,62 @@ public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
 	 * @generated
 	 */
 	@Override
+	public Bounds getBounds() {
+		return bounds;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetBounds(Bounds newBounds, NotificationChain msgs) {
+		Bounds oldBounds = bounds;
+		bounds = newBounds;
+		if(eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_LABEL__BOUNDS, oldBounds, newBounds);
+			if(msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setBounds(Bounds newBounds) {
+		if(newBounds != bounds) {
+			NotificationChain msgs = null;
+			if(bounds != null) {
+				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_LABEL__BOUNDS, null, msgs);
+			}
+			if(newBounds != null) {
+				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_LABEL__BOUNDS, null, msgs);
+			}
+			msgs = basicSetBounds(newBounds, msgs);
+			if(msgs != null) {
+				msgs.dispatch();
+			}
+		} else if(eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_LABEL__BOUNDS, newBounds, newBounds));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public UmlLabelKind getKind() {
 		return kind;
 	}
@@ -97,7 +173,7 @@ public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
 	public void setKind(UmlLabelKind newKind) {
 		UmlLabelKind oldKind = kind;
 		kind = newKind == null ? KIND_EDEFAULT : newKind;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_LABEL__KIND, oldKind, kind));
 		}
 	}
@@ -109,8 +185,25 @@ public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
 	 * @generated
 	 */
 	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case UMLDIPackage.UML_LABEL__BOUNDS:
+			return basicSetBounds(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
+		case UMLDIPackage.UML_LABEL__BOUNDS:
+			return getBounds();
 		case UMLDIPackage.UML_LABEL__KIND:
 			return getKind();
 		}
@@ -125,9 +218,12 @@ public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
+		case UMLDIPackage.UML_LABEL__BOUNDS:
+			setBounds((Bounds)newValue);
+			return;
 		case UMLDIPackage.UML_LABEL__KIND:
-			setKind((UmlLabelKind) newValue);
+			setKind((UmlLabelKind)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -141,7 +237,10 @@ public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
+		case UMLDIPackage.UML_LABEL__BOUNDS:
+			setBounds((Bounds)null);
+			return;
 		case UMLDIPackage.UML_LABEL__KIND:
 			setKind(KIND_EDEFAULT);
 			return;
@@ -157,7 +256,9 @@ public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
+		case UMLDIPackage.UML_LABEL__BOUNDS:
+			return bounds != null;
 		case UMLDIPackage.UML_LABEL__KIND:
 			return kind != KIND_EDEFAULT;
 		}
@@ -171,8 +272,46 @@ public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
 	 * @generated
 	 */
 	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if(baseClass == Shape.class) {
+			switch(derivedFeatureID) {
+			case UMLDIPackage.UML_LABEL__BOUNDS:
+				return DIPackage.SHAPE__BOUNDS;
+			default:
+				return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if(baseClass == Shape.class) {
+			switch(baseFeatureID) {
+			case DIPackage.SHAPE__BOUNDS:
+				return UMLDIPackage.UML_LABEL__BOUNDS;
+			default:
+				return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
@@ -181,4 +320,4 @@ public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
 		result.append(')');
 		return result.toString();
 	}
-} // UmlLabelImpl
+} //UmlLabelImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlShapeImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlShapeImpl.java
index c43439eaff5..17b02aeb96d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlShapeImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlShapeImpl.java
@@ -89,9 +89,9 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	public NotificationChain basicSetBounds(Bounds newBounds, NotificationChain msgs) {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_SHAPE__BOUNDS, oldBounds, newBounds);
-			if (msgs == null) {
+			if(msgs == null) {
 				msgs = notification;
 			} else {
 				msgs.add(notification);
@@ -108,19 +108,19 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	 */
 	@Override
 	public void setBounds(Bounds newBounds) {
-		if (newBounds != bounds) {
+		if(newBounds != bounds) {
 			NotificationChain msgs = null;
-			if (bounds != null) {
-				msgs = ((InternalEObject) bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_SHAPE__BOUNDS, null, msgs);
+			if(bounds != null) {
+				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_SHAPE__BOUNDS, null, msgs);
 			}
-			if (newBounds != null) {
-				msgs = ((InternalEObject) newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_SHAPE__BOUNDS, null, msgs);
+			if(newBounds != null) {
+				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_SHAPE__BOUNDS, null, msgs);
 			}
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null) {
+			if(msgs != null) {
 				msgs.dispatch();
 			}
-		} else if (eNotificationRequired()) {
+		} else if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_SHAPE__BOUNDS, newBounds, newBounds));
 		}
 	}
@@ -133,7 +133,7 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_SHAPE__BOUNDS:
 			return basicSetBounds(null, msgs);
 		}
@@ -148,7 +148,7 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_SHAPE__BOUNDS:
 			return getBounds();
 		}
@@ -163,9 +163,9 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_SHAPE__BOUNDS:
-			setBounds((Bounds) newValue);
+			setBounds((Bounds)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -179,9 +179,9 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_SHAPE__BOUNDS:
-			setBounds((Bounds) null);
+			setBounds((Bounds)null);
 			return;
 		}
 		super.eUnset(featureID);
@@ -195,7 +195,7 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_SHAPE__BOUNDS:
 			return bounds != null;
 		}
@@ -210,8 +210,8 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == Shape.class) {
-			switch (derivedFeatureID) {
+		if(baseClass == Shape.class) {
+			switch(derivedFeatureID) {
 			case UMLDIPackage.UML_SHAPE__BOUNDS:
 				return DIPackage.SHAPE__BOUNDS;
 			default:
@@ -229,8 +229,8 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == Shape.class) {
-			switch (baseFeatureID) {
+		if(baseClass == Shape.class) {
+			switch(baseFeatureID) {
 			case DIPackage.SHAPE__BOUNDS:
 				return UMLDIPackage.UML_SHAPE__BOUNDS;
 			default:
@@ -239,4 +239,4 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
-} // UmlShapeImpl
+} //UmlShapeImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlStyleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlStyleImpl.java
index f54274fd185..4cd69756da7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlStyleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlStyleImpl.java
@@ -12,17 +12,24 @@
 package org.eclipse.papyrus.umldi.impl;
 
 import java.lang.reflect.InvocationTargetException;
+
 import java.util.Map;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.papyrus.dd.di.impl.StyleImpl;
+
 import org.eclipse.papyrus.umldi.UMLDIPackage;
 import org.eclipse.papyrus.umldi.UmlStyle;
+
 import org.eclipse.papyrus.umldi.util.UMLDIValidator;
 
 /**
@@ -127,7 +134,7 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	public void setFontName(String newFontName) {
 		String oldFontName = fontName;
 		fontName = newFontName;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_STYLE__FONT_NAME, oldFontName, fontName));
 		}
 	}
@@ -153,7 +160,7 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	public void setFontSize(double newFontSize) {
 		double oldFontSize = fontSize;
 		fontSize = newFontSize;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_STYLE__FONT_SIZE, oldFontSize, fontSize));
 		}
 	}
@@ -178,8 +185,7 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	 */
 	@Override
 	public boolean fontsizePositive(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return UMLDIValidator.validate(UMLDIPackage.Literals.UML_STYLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", UMLDIPackage.Literals.UML_STYLE___FONTSIZE_POSITIVE__DIAGNOSTICCHAIN_MAP,
-				FONTSIZE_POSITIVE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, UMLDIValidator.DIAGNOSTIC_SOURCE, UMLDIValidator.UML_STYLE__FONTSIZE_POSITIVE);
+		return UMLDIValidator.validate(UMLDIPackage.Literals.UML_STYLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", UMLDIPackage.Literals.UML_STYLE___FONTSIZE_POSITIVE__DIAGNOSTICCHAIN_MAP, FONTSIZE_POSITIVE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, UMLDIValidator.DIAGNOSTIC_SOURCE, UMLDIValidator.UML_STYLE__FONTSIZE_POSITIVE);
 	}
 
 	/**
@@ -190,7 +196,7 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_STYLE__FONT_NAME:
 			return getFontName();
 		case UMLDIPackage.UML_STYLE__FONT_SIZE:
@@ -207,12 +213,12 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_STYLE__FONT_NAME:
-			setFontName((String) newValue);
+			setFontName((String)newValue);
 			return;
 		case UMLDIPackage.UML_STYLE__FONT_SIZE:
-			setFontSize((Double) newValue);
+			setFontSize((Double)newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -226,7 +232,7 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_STYLE__FONT_NAME:
 			setFontName(FONT_NAME_EDEFAULT);
 			return;
@@ -245,7 +251,7 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
+		switch(featureID) {
 		case UMLDIPackage.UML_STYLE__FONT_NAME:
 			return FONT_NAME_EDEFAULT == null ? fontName != null : !FONT_NAME_EDEFAULT.equals(fontName);
 		case UMLDIPackage.UML_STYLE__FONT_SIZE:
@@ -263,9 +269,9 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
+		switch(operationID) {
 		case UMLDIPackage.UML_STYLE___FONTSIZE_POSITIVE__DIAGNOSTICCHAIN_MAP:
-			return fontsizePositive((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));
+			return fontsizePositive((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
@@ -278,7 +284,7 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if(eIsProxy()) {
 			return super.toString();
 		}
 		StringBuffer result = new StringBuffer(super.toString());
@@ -289,4 +295,4 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 		result.append(')');
 		return result.toString();
 	}
-} // UmlStyleImpl
+} //UmlStyleImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIAdapterFactory.java
index cce8c8716b3..7740fb96c02 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIAdapterFactory.java
@@ -13,21 +13,18 @@ package org.eclipse.papyrus.umldi.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
+
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
 import org.eclipse.emf.ecore.EObject;
+
 import org.eclipse.papyrus.dd.di.Diagram;
 import org.eclipse.papyrus.dd.di.DiagramElement;
 import org.eclipse.papyrus.dd.di.Edge;
 import org.eclipse.papyrus.dd.di.Shape;
 import org.eclipse.papyrus.dd.di.Style;
-import org.eclipse.papyrus.umldi.UMLDIPackage;
-import org.eclipse.papyrus.umldi.UmlCompartment;
-import org.eclipse.papyrus.umldi.UmlDiagram;
-import org.eclipse.papyrus.umldi.UmlDiagramElement;
-import org.eclipse.papyrus.umldi.UmlEdge;
-import org.eclipse.papyrus.umldi.UmlLabel;
-import org.eclipse.papyrus.umldi.UmlShape;
-import org.eclipse.papyrus.umldi.UmlStyle;
+
+import org.eclipse.papyrus.umldi.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -57,7 +54,7 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 	 * @generated
 	 */
 	public UMLDIAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = UMLDIPackage.eINSTANCE;
 		}
 	}
@@ -73,11 +70,11 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
+		if(object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
 	}
@@ -97,11 +94,6 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 		}
 
 		@Override
-		public Adapter caseUmlShape(UmlShape object) {
-			return createUmlShapeAdapter();
-		}
-
-		@Override
 		public Adapter caseUmlDiagramElement(UmlDiagramElement object) {
 			return createUmlDiagramElementAdapter();
 		}
@@ -117,6 +109,11 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 		}
 
 		@Override
+		public Adapter caseUmlShape(UmlShape object) {
+			return createUmlShapeAdapter();
+		}
+
+		@Override
 		public Adapter caseUmlCompartment(UmlCompartment object) {
 			return createUmlCompartmentAdapter();
 		}
@@ -163,13 +160,13 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param target
-	 *            the object to adapt.
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
 	@Override
 	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject) target);
+		return modelSwitch.doSwitch((EObject)target);
 	}
 
 	/**
@@ -364,4 +361,4 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 	public Adapter createEObjectAdapter() {
 		return null;
 	}
-} // UMLDIAdapterFactory
+} //UMLDIAdapterFactory
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIDerivedUnionAdapter.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIDerivedUnionAdapter.java
index 68a235351cb..aa8bc4e7138 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIDerivedUnionAdapter.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIDerivedUnionAdapter.java
@@ -12,11 +12,15 @@
 package org.eclipse.papyrus.umldi.util;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.notify.impl.AdapterImpl;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.papyrus.dd.di.DIPackage;
+
 import org.eclipse.papyrus.umldi.UMLDIPackage;
 import org.eclipse.papyrus.umldi.UmlCompartment;
 import org.eclipse.papyrus.umldi.UmlDiagram;
@@ -51,7 +55,7 @@ public class UMLDIDerivedUnionAdapter extends AdapterImpl {
 	 * @generated
 	 */
 	public UMLDIDerivedUnionAdapter() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = UMLDIPackage.eINSTANCE;
 		}
 	}
@@ -62,15 +66,15 @@ public class UMLDIDerivedUnionAdapter extends AdapterImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param notification
-	 *            a description of the change.
+	 *        a description of the change.
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		Object notifier = notification.getNotifier();
-		if (notifier instanceof EObject) {
-			EClass eClass = ((EObject) notifier).eClass();
-			if (eClass.eContainer() == modelPackage) {
+		if(notifier instanceof EObject) {
+			EClass eClass = ((EObject)notifier).eClass();
+			if(eClass.eContainer() == modelPackage) {
 				notifyChanged(notification, eClass);
 			}
 		}
@@ -82,22 +86,22 @@ public class UMLDIDerivedUnionAdapter extends AdapterImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param notification
-	 *            a description of the change.
+	 *        a description of the change.
 	 * @param eClass
-	 *            the Ecore class of the notifier.
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyChanged(Notification notification, EClass eClass) {
-		switch (eClass.getClassifierID()) {
+		switch(eClass.getClassifierID()) {
 		case UMLDIPackage.UML_DIAGRAM:
 			notifyUmlDiagramChanged(notification, eClass);
 			break;
-		case UMLDIPackage.UML_SHAPE:
-			notifyUmlShapeChanged(notification, eClass);
-			break;
 		case UMLDIPackage.UML_EDGE:
 			notifyUmlEdgeChanged(notification, eClass);
 			break;
+		case UMLDIPackage.UML_SHAPE:
+			notifyUmlShapeChanged(notification, eClass);
+			break;
 		case UMLDIPackage.UML_COMPARTMENT:
 			notifyUmlCompartmentChanged(notification, eClass);
 			break;
@@ -113,11 +117,11 @@ public class UMLDIDerivedUnionAdapter extends AdapterImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param notification
-	 *            a description of the change.
+	 *        a description of the change.
 	 * @param eClass
-	 *            the Ecore class of the notifier.
+	 *        the Ecore class of the notifier.
 	 * @param derivedUnion
-	 *            the derived union affected by the change.
+	 *        the derived union affected by the change.
 	 * @generated
 	 */
 	public void notifyChanged(Notification notification, EClass eClass, EStructuralFeature derivedUnion) {
@@ -130,13 +134,13 @@ public class UMLDIDerivedUnionAdapter extends AdapterImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param notification
-	 *            a description of the change.
+	 *        a description of the change.
 	 * @param eClass
-	 *            the Ecore class of the notifier.
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyUmlDiagramChanged(Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(UmlDiagram.class)) {
+		switch(notification.getFeatureID(UmlDiagram.class)) {
 		case UMLDIPackage.UML_DIAGRAM__UML_MODEL_ELEMENT:
 			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
 			break;
@@ -167,13 +171,13 @@ public class UMLDIDerivedUnionAdapter extends AdapterImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param notification
-	 *            a description of the change.
+	 *        a description of the change.
 	 * @param eClass
-	 *            the Ecore class of the notifier.
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyUmlEdgeChanged(Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(UmlEdge.class)) {
+		switch(notification.getFeatureID(UmlEdge.class)) {
 		case UMLDIPackage.UML_EDGE__UML_MODEL_ELEMENT:
 			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
 			break;
@@ -210,13 +214,13 @@ public class UMLDIDerivedUnionAdapter extends AdapterImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param notification
-	 *            a description of the change.
+	 *        a description of the change.
 	 * @param eClass
-	 *            the Ecore class of the notifier.
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyUmlCompartmentChanged(Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(UmlCompartment.class)) {
+		switch(notification.getFeatureID(UmlCompartment.class)) {
 		case UMLDIPackage.UML_COMPARTMENT__UML_MODEL_ELEMENT:
 			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
 			break;
@@ -247,13 +251,13 @@ public class UMLDIDerivedUnionAdapter extends AdapterImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param notification
-	 *            a description of the change.
+	 *        a description of the change.
 	 * @param eClass
-	 *            the Ecore class of the notifier.
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyUmlLabelChanged(Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(UmlLabel.class)) {
+		switch(notification.getFeatureID(UmlLabel.class)) {
 		case UMLDIPackage.UML_LABEL__UML_MODEL_ELEMENT:
 			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
 			break;
@@ -284,13 +288,13 @@ public class UMLDIDerivedUnionAdapter extends AdapterImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param notification
-	 *            a description of the change.
+	 *        a description of the change.
 	 * @param eClass
-	 *            the Ecore class of the notifier.
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyUmlShapeChanged(Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(UmlShape.class)) {
+		switch(notification.getFeatureID(UmlShape.class)) {
 		case UMLDIPackage.UML_SHAPE__UML_MODEL_ELEMENT:
 			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
 			break;
@@ -314,4 +318,4 @@ public class UMLDIDerivedUnionAdapter extends AdapterImpl {
 			break;
 		}
 	}
-} // UMLDIDerivedUnionAdapter
+} //UMLDIDerivedUnionAdapter
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceFactoryImpl.java
index f0c79007a34..18a6860856b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceFactoryImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceFactoryImpl.java
@@ -12,8 +12,11 @@
 package org.eclipse.papyrus.umldi.util;
 
 import org.eclipse.emf.common.util.URI;
+
 import org.eclipse.emf.ecore.resource.Resource;
+
 import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
+
 import org.eclipse.emf.ecore.xmi.XMLResource;
 
 /**
@@ -55,4 +58,4 @@ public class UMLDIResourceFactoryImpl extends ResourceFactoryImpl {
 		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
 		return result;
 	}
-} // UMLDIResourceFactoryImpl
+} //UMLDIResourceFactoryImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceImpl.java
index ebc7160eee6..5aed6a3b5c2 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceImpl.java
@@ -12,6 +12,7 @@
 package org.eclipse.papyrus.umldi.util;
 
 import org.eclipse.emf.common.util.URI;
+
 import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 
 /**
@@ -30,10 +31,10 @@ public class UMLDIResourceImpl extends XMLResourceImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param uri
-	 *            the URI of the new resource.
+	 *        the URI of the new resource.
 	 * @generated
 	 */
 	public UMLDIResourceImpl(URI uri) {
 		super(uri);
 	}
-} // UMLDIResourceImpl
+} //UMLDIResourceImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDISwitch.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDISwitch.java
index ec6e67adbc3..0ac1fb8c62c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDISwitch.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDISwitch.java
@@ -13,20 +13,16 @@ package org.eclipse.papyrus.umldi.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.emf.ecore.util.Switch;
+
 import org.eclipse.papyrus.dd.di.Diagram;
 import org.eclipse.papyrus.dd.di.DiagramElement;
 import org.eclipse.papyrus.dd.di.Edge;
 import org.eclipse.papyrus.dd.di.Shape;
 import org.eclipse.papyrus.dd.di.Style;
-import org.eclipse.papyrus.umldi.UMLDIPackage;
-import org.eclipse.papyrus.umldi.UmlCompartment;
-import org.eclipse.papyrus.umldi.UmlDiagram;
-import org.eclipse.papyrus.umldi.UmlDiagramElement;
-import org.eclipse.papyrus.umldi.UmlEdge;
-import org.eclipse.papyrus.umldi.UmlLabel;
-import org.eclipse.papyrus.umldi.UmlShape;
-import org.eclipse.papyrus.umldi.UmlStyle;
+
+import org.eclipse.papyrus.umldi.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -60,7 +56,7 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * @generated
 	 */
 	public UMLDISwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = UMLDIPackage.eINSTANCE;
 		}
 	}
@@ -89,122 +85,120 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-		case UMLDIPackage.UML_DIAGRAM: {
-			UmlDiagram umlDiagram = (UmlDiagram) theEObject;
+		switch(classifierID) {
+		case UMLDIPackage.UML_DIAGRAM:
+		{
+			UmlDiagram umlDiagram = (UmlDiagram)theEObject;
 			T result = caseUmlDiagram(umlDiagram);
-			if (result == null) {
-				result = caseUmlShape(umlDiagram);
+			if(result == null) {
+				result = caseUmlDiagramElement(umlDiagram);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDiagram(umlDiagram);
 			}
-			if (result == null) {
-				result = caseUmlDiagramElement(umlDiagram);
-			}
-			if (result == null) {
+			if(result == null) {
 				result = caseShape(umlDiagram);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDiagramElement(umlDiagram);
 			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case UMLDIPackage.UML_SHAPE: {
-			UmlShape umlShape = (UmlShape) theEObject;
-			T result = caseUmlShape(umlShape);
-			if (result == null) {
-				result = caseUmlDiagramElement(umlShape);
-			}
-			if (result == null) {
-				result = caseShape(umlShape);
-			}
-			if (result == null) {
-				result = caseDiagramElement(umlShape);
-			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case UMLDIPackage.UML_DIAGRAM_ELEMENT: {
-			UmlDiagramElement umlDiagramElement = (UmlDiagramElement) theEObject;
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT:
+		{
+			UmlDiagramElement umlDiagramElement = (UmlDiagramElement)theEObject;
 			T result = caseUmlDiagramElement(umlDiagramElement);
-			if (result == null) {
+			if(result == null) {
 				result = caseDiagramElement(umlDiagramElement);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case UMLDIPackage.UML_STYLE: {
-			UmlStyle umlStyle = (UmlStyle) theEObject;
+		case UMLDIPackage.UML_STYLE:
+		{
+			UmlStyle umlStyle = (UmlStyle)theEObject;
 			T result = caseUmlStyle(umlStyle);
-			if (result == null) {
+			if(result == null) {
 				result = caseStyle(umlStyle);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case UMLDIPackage.UML_EDGE: {
-			UmlEdge umlEdge = (UmlEdge) theEObject;
+		case UMLDIPackage.UML_EDGE:
+		{
+			UmlEdge umlEdge = (UmlEdge)theEObject;
 			T result = caseUmlEdge(umlEdge);
-			if (result == null) {
+			if(result == null) {
 				result = caseUmlDiagramElement(umlEdge);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseEdge(umlEdge);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDiagramElement(umlEdge);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case UMLDIPackage.UML_COMPARTMENT: {
-			UmlCompartment umlCompartment = (UmlCompartment) theEObject;
-			T result = caseUmlCompartment(umlCompartment);
-			if (result == null) {
-				result = caseUmlShape(umlCompartment);
+		case UMLDIPackage.UML_SHAPE:
+		{
+			UmlShape umlShape = (UmlShape)theEObject;
+			T result = caseUmlShape(umlShape);
+			if(result == null) {
+				result = caseUmlDiagramElement(umlShape);
+			}
+			if(result == null) {
+				result = caseShape(umlShape);
 			}
-			if (result == null) {
+			if(result == null) {
+				result = caseDiagramElement(umlShape);
+			}
+			if(result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case UMLDIPackage.UML_COMPARTMENT:
+		{
+			UmlCompartment umlCompartment = (UmlCompartment)theEObject;
+			T result = caseUmlCompartment(umlCompartment);
+			if(result == null) {
 				result = caseUmlDiagramElement(umlCompartment);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseShape(umlCompartment);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDiagramElement(umlCompartment);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
 		}
-		case UMLDIPackage.UML_LABEL: {
-			UmlLabel umlLabel = (UmlLabel) theEObject;
+		case UMLDIPackage.UML_LABEL:
+		{
+			UmlLabel umlLabel = (UmlLabel)theEObject;
 			T result = caseUmlLabel(umlLabel);
-			if (result == null) {
-				result = caseUmlShape(umlLabel);
-			}
-			if (result == null) {
+			if(result == null) {
 				result = caseUmlDiagramElement(umlLabel);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseShape(umlLabel);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = caseDiagramElement(umlLabel);
 			}
-			if (result == null) {
+			if(result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
@@ -222,7 +216,7 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Uml Diagram</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -239,7 +233,7 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Uml Diagram Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -256,7 +250,7 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Uml Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -273,7 +267,7 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Uml Edge</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -290,7 +284,7 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Uml Compartment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -307,7 +301,7 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Uml Label</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -324,7 +318,7 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Uml Shape</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -341,7 +335,7 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Diagram Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -358,7 +352,7 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Shape</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -375,7 +369,7 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Diagram</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -392,7 +386,7 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -409,7 +403,7 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Edge</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -426,7 +420,7 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -435,4 +429,4 @@ public class UMLDISwitch<T> extends Switch<T> {
 	public T defaultCase(EObject object) {
 		return null;
 	}
-} // UMLDISwitch
+} //UMLDISwitch
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIValidator.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIValidator.java
index 0ec8b700008..00c22ef1757 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIValidator.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIValidator.java
@@ -15,21 +15,15 @@ import java.util.Map;
 
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.emf.ecore.util.EObjectValidator;
-import org.eclipse.papyrus.umldi.UMLDIPackage;
-import org.eclipse.papyrus.umldi.UmlCompartment;
-import org.eclipse.papyrus.umldi.UmlCompartmentKind;
-import org.eclipse.papyrus.umldi.UmlDiagram;
-import org.eclipse.papyrus.umldi.UmlDiagramElement;
-import org.eclipse.papyrus.umldi.UmlEdge;
-import org.eclipse.papyrus.umldi.UmlLabel;
-import org.eclipse.papyrus.umldi.UmlLabelKind;
-import org.eclipse.papyrus.umldi.UmlShape;
-import org.eclipse.papyrus.umldi.UmlStyle;
+
+import org.eclipse.papyrus.umldi.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -51,7 +45,8 @@ public class UMLDIValidator extends EObjectValidator {
 	public static final UMLDIValidator INSTANCE = new UMLDIValidator();
 
 	/**
-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic
+	 * {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -131,25 +126,27 @@ public class UMLDIValidator extends EObjectValidator {
 	 */
 	@Override
 	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		switch (classifierID) {
+		switch(classifierID) {
 		case UMLDIPackage.UML_DIAGRAM:
-			return validateUmlDiagram((UmlDiagram) value, diagnostics, context);
-		case UMLDIPackage.UML_SHAPE:
-			return validateUmlShape((UmlShape) value, diagnostics, context);
+			return validateUmlDiagram((UmlDiagram)value, diagnostics, context);
 		case UMLDIPackage.UML_DIAGRAM_ELEMENT:
-			return validateUmlDiagramElement((UmlDiagramElement) value, diagnostics, context);
+			return validateUmlDiagramElement((UmlDiagramElement)value, diagnostics, context);
 		case UMLDIPackage.UML_STYLE:
-			return validateUmlStyle((UmlStyle) value, diagnostics, context);
+			return validateUmlStyle((UmlStyle)value, diagnostics, context);
 		case UMLDIPackage.UML_EDGE:
-			return validateUmlEdge((UmlEdge) value, diagnostics, context);
+			return validateUmlEdge((UmlEdge)value, diagnostics, context);
+		case UMLDIPackage.UML_SHAPE:
+			return validateUmlShape((UmlShape)value, diagnostics, context);
 		case UMLDIPackage.UML_COMPARTMENT:
-			return validateUmlCompartment((UmlCompartment) value, diagnostics, context);
+			return validateUmlCompartment((UmlCompartment)value, diagnostics, context);
 		case UMLDIPackage.UML_LABEL:
-			return validateUmlLabel((UmlLabel) value, diagnostics, context);
+			return validateUmlLabel((UmlLabel)value, diagnostics, context);
+		case UMLDIPackage.UML_DIAGRAM_KIND:
+			return validateUmlDiagramKind((UmlDiagramKind)value, diagnostics, context);
 		case UMLDIPackage.UML_COMPARTMENT_KIND:
-			return validateUmlCompartmentKind((UmlCompartmentKind) value, diagnostics, context);
+			return validateUmlCompartmentKind((UmlCompartmentKind)value, diagnostics, context);
 		case UMLDIPackage.UML_LABEL_KIND:
-			return validateUmlLabelKind((UmlLabelKind) value, diagnostics, context);
+			return validateUmlLabelKind((UmlLabelKind)value, diagnostics, context);
 		default:
 			return true;
 		}
@@ -182,32 +179,32 @@ public class UMLDIValidator extends EObjectValidator {
 	 * @generated
 	 */
 	public boolean validateUmlStyle(UmlStyle umlStyle, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(umlStyle, diagnostics, context)) {
+		if(!validate_NoCircularContainment(umlStyle, diagnostics, context)) {
 			return false;
 		}
 		boolean result = validate_EveryMultiplicityConforms(umlStyle, diagnostics, context);
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryDataValueConforms(umlStyle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryReferenceIsContained(umlStyle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryBidirectionalReferenceIsPaired(umlStyle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryProxyResolves(umlStyle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_UniqueID(umlStyle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryKeyUnique(umlStyle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validate_EveryMapEntryUnique(umlStyle, diagnostics, context);
 		}
-		if (result || diagnostics != null) {
+		if(result || diagnostics != null) {
 			result &= validateUmlStyle_fontsizePositive(umlStyle, diagnostics, context);
 		}
 		return result;
@@ -260,6 +257,16 @@ public class UMLDIValidator extends EObjectValidator {
 	 *
 	 * @generated
 	 */
+	public boolean validateUmlDiagramKind(UmlDiagramKind umlDiagramKind, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return true;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
 	public boolean validateUmlCompartmentKind(UmlCompartmentKind umlCompartmentKind, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return true;
 	}
@@ -298,4 +305,4 @@ public class UMLDIValidator extends EObjectValidator {
 		// Ensure that you remove @generated or mark it @generated NOT
 		return super.getResourceLocator();
 	}
-} // UMLDIValidator
+} //UMLDIValidator
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIXMLProcessor.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIXMLProcessor.java
index e9ae3f19e67..8cd99a18060 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIXMLProcessor.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIXMLProcessor.java
@@ -14,8 +14,11 @@ package org.eclipse.papyrus.umldi.util;
 import java.util.Map;
 
 import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.emf.ecore.resource.Resource;
+
 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
+
 import org.eclipse.papyrus.umldi.UMLDIPackage;
 
 /**
@@ -48,11 +51,11 @@ public class UMLDIXMLProcessor extends XMLProcessor {
 	 */
 	@Override
 	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
+		if(registrations == null) {
 			super.getRegistrations();
 			registrations.put(XML_EXTENSION, new UMLDIResourceFactoryImpl());
 			registrations.put(STAR_EXTENSION, new UMLDIResourceFactoryImpl());
 		}
 		return registrations;
 	}
-} // UMLDIXMLProcessor
+} //UMLDIXMLProcessor
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/.project b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/.project
index d2cc3465165..1525d44b8ee 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/.project
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/.project
@@ -6,11 +6,6 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
 			<name>org.eclipse.pde.ManifestBuilder</name>
 			<arguments>
 			</arguments>
@@ -33,6 +28,5 @@
 	<natures>
 		<nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/META-INF/MANIFEST.MF b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/META-INF/MANIFEST.MF
index bc1e93e4d76..2787598a015 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/META-INF/MANIFEST.MF
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/META-INF/MANIFEST.MF
@@ -1,12 +1,6 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.m2m.qvt.oml,

- org.eclipse.papyrus.dd;bundle-version="1.0.1"

-Bundle-Vendor: %providerName

-Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

-

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.umldi2dg
+Bundle-Version: 1.0.0
+Bundle-Vendor: %providerName
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/build.properties b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/build.properties
index b3959486182..ffbdafbe090 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/build.properties
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/build.properties
@@ -1,18 +1,2 @@
-# Copyright (c) 2014 CEA LIST.
-#  
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#  
-# Contributors:
-#  CEA LIST - Initial API and implementation
-
-bin.includes = .,\
-			   META-INF/,\
-               transforms/,\
-               plugin.xml,\
-               plugin.properties
-source.. = src/
-output.. = bin
-               
\ No newline at end of file
+bin.includes = META-INF/,\
+               transforms/
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/plugin.properties b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/plugin.properties
index 9daf172639b..4a6bb387f75 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/plugin.properties
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/plugin.properties
@@ -9,5 +9,5 @@
 # Contributors:
 #     Borland Software Corporation - initial API and implementation
 ###############################################################################
-pluginName=UMLDI to DG Plugin
+pluginName=UMLDI To DG Plugin
 providerName=CEA LIST
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/scripts/umllayouts.js b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/scripts/UmlLayouts.js
index 500c4ac3c95..815da7643fd 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/scripts/umllayouts.js
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/scripts/UmlLayouts.js
@@ -73,11 +73,11 @@ function getPreferredSize_stackLayout(parent) {
 	return prefSize;
 }
 
-function flowLayout(parent, horizontal, insets) {
-	var x = +parent.getAttribute("x")+insets;
-	var y = +parent.getAttribute("y")+insets;
-	var width = +parent.getAttribute("width")-2*insets;
-	var height = +parent.getAttribute("height")-2*insets;
+function flowLayout(parent, horizontal) {
+	var x = +parent.getAttribute("x");
+	var y = +parent.getAttribute("y");
+	var width = +parent.getAttribute("width");
+	var height = +parent.getAttribute("height");
 
 	if (parent.tagName == "svg") {
 		x = 0;
@@ -115,115 +115,3 @@ function getPreferredSize_flowLayout(parent, horizontal) {
 	}
 	return prefSize;
 }
-
-function Rectangle(x, y, width, height) {
-	this.x = x;
-	this.y = y;
-	this.width = width;
-	this.height = height;
-}
-
-function Point(x, y) {
-	this.x = x;
-	this.y = y;
-}
-
-function Dimension(width, height) {
-	this.width = width;
-	this.height = height;
-}
-
-function getChildren(parent) {
-	var children = [];
-	var elements = parent.childNodes;
-	for (var i=0; i<elements.length; i++) {
-		var element = elements.item(i);
-		if (element.tagName != "script" && element.tagName != "defs" && element.nodeType != 3)
-			children.push(element);
-	}
-	return children;
-}
-
-function validate(parent) {
-	layout(parent);
-	var children = getChildren(parent);
-	for (var i=0; i<children.length; i++)
-		validate(children[i]);
-}
-
-function layout(parent) {
-	var lm = parent.getAttribute("layout");
-	if (lm != null && lm.length>0)
-		eval(lm);
-}
-
-function getPreferredSize(parent) {
-	var lm = parent.getAttribute("layout");
-	if (lm != null && lm.length>0) {
-		var prefSize = eval("getPreferredSize_"+lm);
-		return prefSize;
-	} 
-	var bbox = parent.getBBox();
-	return new Dimension(bbox.width, bbox.height);
-}
-
-function getBounds(element) {
-	var bbox = element.getBBox();
-	return new Rectangle(bbox.x, bbox.y, bbox.width, bbox.height);
-}
-
-function setBounds(element, x, y, width, height) {
-	
-	if (element.tagName == "rect")
-		setRectBounds(element, x, y, width, height);
-	else if (element.tagName == "svg")
-		setSvgBounds(element, x, y, width, height);
-	else if (element.tagName == "g")
-		setGBounds(element, x, y, width, height);
-	else if (element.tagName == "circle")
-		setCircleBounds(element, x, y, width, height);
-	else if (element.tagName == "text")
-		setTextBounds(element, x, y, width, height);
-}
-
-function setSvgBounds(element, x, y, width, height) {
-	element.setAttribute("x", x);
-	element.setAttribute("y", y);
-	element.setAttribute("width", width);
-	element.setAttribute("height", height);
-}
-
-function setGBounds(element, x, y, width, height) {
-	element.setAttribute("x", x);
-	element.setAttribute("y", y);
-	element.setAttribute("width", width);
-	element.setAttribute("height", height);
-}
-
-function setRectBounds(element, x, y, width, height) {
-	element.setAttribute("x", x+1);
-	element.setAttribute("y", y+1);
-	element.setAttribute("width", width-2);
-	element.setAttribute("height", height-2);
-}
-
-function setCircleBounds(element, x, y, width, height) {
-	element.setAttribute("cx", x+width/2);
-	element.setAttribute("cy", y+height/2);
-	if (width <= height)
-		element.setAttribute("r", width/2);
-	else
-		element.setAttribute("r", height/2);
-}
-
-function setTextBounds(element, x, y, width, height) {
-	var anchor = element.getAttribute("text-anchor");
-	if (anchor == "middle")
-		element.setAttribute("x", x+width/2);
-	else if (anchor == "end")
-		element.setAttribute("x", x+width);
-	else
-		element.setAttribute("x", x);
-	var bbox = element.getBBox();
-	element.setAttribute("y", y+bbox.height);
-}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/ClassDiagramToDG.qvto b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/ClassDiagramToDG.qvto
new file mode 100644
index 00000000000..f24039118b1
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/ClassDiagramToDG.qvto
@@ -0,0 +1,154 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+import UmlDiagramToDG;
+
+modeltype DC uses "http://www.omg.org/spec/DD/20110901/DC";
+modeltype DG uses "http://www.omg.org/spec/DD/20110901/DG";
+modeltype DI uses "http://www.omg.org/spec/DD/20110901/DI";
+modeltype UMLDI uses "http://www.omg.org/spec/UML/20131001/UMLDI";
+modeltype UML uses "http://www.eclipse.org/uml2/4.0.0/UML";
+	
+library ClassDiagram2DG;
+
+/**************** Shapes *****************/
+
+mapping UML::Classifier::shapeToGraphicalElement(shape : UMLDI::UmlShape) : DG::GraphicalElement {
+	init {
+		result := object DG::Rectangle {
+			bounds := object DC::Bounds { 
+				x := 0; y := 0; 
+				width := shape.bounds.width;
+				height := shape.bounds.height 
+			};
+		};
+	}
+}
+
+/**************** Labels *****************/
+
+mapping UML::NamedElement::labelToText(label : UMLDI::UmlLabel) : DG::Text {
+	if (label.kind = UMLDI::UmlLabelKind::name) then {
+		data := self.name;
+		if (not label.owningUmlDiagramElement.oclIsTypeOf(UMLDI::UmlCompartment)) then {
+			anchor := DG::TextAnchor::middle;
+		} endif;
+	} endif;
+}
+
+mapping UML::Property::labelToText(label : UMLDI::UmlLabel) : DG::Text  
+	inherits UML::NamedElement::labelToText
+{
+	if (label.kind = UMLDI::UmlLabelKind::name) then {
+		var name := self.visibility() + self.name;
+		if (label.owningUmlDiagramElement.oclIsTypeOf(UMLDI::UmlCompartment)) then {
+			name := name + self.type() + self.multiplicity();
+		} endif;
+		data := name;
+	} endif;
+}
+
+mapping UML::Interface::labelToText(label : UMLDI::UmlLabel) : DG::Text 
+	inherits UML::NamedElement::labelToText
+{
+	if (label.kind = UMLDI::UmlLabelKind::name) then {
+		data := '«Interface»\\n'+self.name;
+	} endif;
+}
+
+/**************** Edges *****************/
+
+mapping UML::Generalization::edgeToPath(edge : UMLDI::UmlEdge) : DG::Path {
+	endMarker := endHollowClosedArrow;		
+}
+
+mapping UML::InterfaceRealization::edgeToPath(edge : UMLDI::UmlEdge) : DG::Path {
+	_class := "interfaceRealization";
+	endMarker := endHollowClosedArrow;		
+}
+
+mapping UML::Association::edgeToPath(edge : UMLDI::UmlEdge) : DG::Path {
+	var end1 := self.memberEnd->at(1);
+	var end2 := self.memberEnd->at(2);
+	
+	if (end1.owner != self) then {
+		if (end2.aggregation = UML::AggregationKind::composite) then {
+			startMarker := startSolidCircleSolidDiamondOpenArrow;
+		} else if (end2.aggregation = UML::AggregationKind::shared) then {
+			startMarker := startSolidCircleHollowDiamondOpenArrow;
+		} else {
+			startMarker := startSolidCircleOpenArrow;
+		} endif endif;
+	} else if (end1.isNavigable()) then {
+		if (end2.aggregation = UML::AggregationKind::composite) then {
+			startMarker := startSolidDiamondOpenArrow;
+		} else if (end2.aggregation = UML::AggregationKind::shared) then {
+			startMarker := startHollowDiamondOpenArrow;
+		} else {
+			startMarker := startOpenArrow;
+		} endif endif;
+	} else {
+		if (end2.aggregation = UML::AggregationKind::composite) then {
+			startMarker := startSolidDiamond;
+		} else if (end2.aggregation = UML::AggregationKind::shared) then {
+			startMarker := startHollowDiamond;
+		} endif endif;
+	} endif endif;
+	
+	if (end2.owner != self) then {
+		if (end1.aggregation = UML::AggregationKind::composite) then {
+			endMarker := endSolidCircleSolidDiamondOpenArrow;
+		} else if (end1.aggregation = UML::AggregationKind::shared) then {
+			endMarker := endSolidCircleHollowDiamondOpenArrow;
+		} else {
+			endMarker := endSolidCircleOpenArrow;
+		} endif endif;
+	} else if (end2.isNavigable()) then {
+		if (end1.aggregation = UML::AggregationKind::composite) then {
+			endMarker := endSolidDiamondOpenArrow;
+		} else if (end1.aggregation = UML::AggregationKind::shared) then {
+			endMarker := endHollowDiamondOpenArrow;
+		} else {
+			endMarker := endOpenArrow;
+		} endif endif;
+	} else {
+		if (end1.aggregation = UML::AggregationKind::composite) then {
+			endMarker := endSolidDiamond;
+		} else if (end1.aggregation = UML::AggregationKind::shared) then {
+			endMarker := endHollowDiamond;
+		} endif endif;
+	} endif endif;
+}
+
+/**************** Queries *****************/
+
+query UML::NamedElement::visibility() : String {
+	return switch {
+		case (self.visibility = UML::VisibilityKind::package) '~ ';
+		case (self.visibility = UML::VisibilityKind::protected) '# ';
+		case (self.visibility = UML::VisibilityKind::private) '- ';
+		else '+ ';
+	};
+}
+
+query UML::TypedElement::type() : String {
+	return if (self.type->notEmpty()) then ' : '+self.type.name else '' endif;
+}
+
+query UML::MultiplicityElement::multiplicity() : String {
+	var lower = self.lower.toString();
+	var upper = if (self.upper = -1) then '*' else self.upper.toString() endif;
+	return switch {
+		case (lower = '1' and upper = '1') '';
+		case (lower = '0' and upper = '*') ' [*]';
+		else ' ['+lower+'..'+upper+']';
+	};
+}
\ No newline at end of file
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/UMLDIToDG.qvto b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/UMLDIToDG.qvto
new file mode 100644
index 00000000000..d71535cb082
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/UMLDIToDG.qvto
@@ -0,0 +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:
+ *  CEA LIST - Initial API and implementation
+ */
+import ClassDiagramToDG;
+
+modeltype DC uses "http://www.omg.org/spec/DD/20110901/DC";
+modeltype DG uses "http://www.omg.org/spec/DD/20110901/DG";
+modeltype DI uses "http://www.omg.org/spec/DD/20110901/DI";
+modeltype UMLDI uses "http://www.omg.org/spec/UML/20131001/UMLDI";
+modeltype UML uses "http://www.eclipse.org/uml2/4.0.0/UML";
+	
+transformation UMLToDG(in umldi : UMLDI, out DG);
+
+main() {
+	umldi.rootObjects()[UMLDI::UmlDiagram]->map rootDiagramToGraphicalElement();
+}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/UmlDefinitions.qvto b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/UmlDefinitions.qvto
new file mode 100644
index 00000000000..c76cc3efd4d
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/UmlDefinitions.qvto
@@ -0,0 +1,373 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+import org.eclipse.papyrus.dd.qvt.UtilitiesLibrary;
+
+modeltype DC uses "http://www.omg.org/spec/DD/20110901/DC";
+modeltype DG uses "http://www.omg.org/spec/DD/20110901/DG";
+modeltype DI uses "http://www.omg.org/spec/DD/20110901/DI";
+modeltype UMLDI uses "http://www.omg.org/spec/UML/20131001/UMLDI";
+modeltype UML uses "http://www.eclipse.org/uml2/4.0.0/UML";
+
+library UmlDefinitions;
+
+property black = createColor('#000000');
+ 
+property white = createColor('#FFFFFF');
+
+property endHollowClosedArrow : DG::Marker = object DG::Marker {
+	id := "endHollowClosedArrow";
+	size := object DC::Dimension { width := 12; height := 12; };
+	reference := object DC::Point { x := 12; y := 6; };
+	member += object DG::Polygon {
+		point += object DC::Point { x := 1; y := 1; };
+		point += object DC::Point { x := 12; y := 6; };
+		point += object DC::Point { x := 1; y := 11; };
+		style := object DG::Style { fill := object DG::Paint { color := white } };
+	}
+};	
+
+property endSolidClosedArrow : DG::Marker = object DG::Marker {
+	id := "endSolidClosedArrow";
+	size := object DC::Dimension { width := 12; height := 12; };
+	reference := object DC::Point { x := 12; y := 6; };
+	member += object DG::Polygon {
+		point += object DC::Point { x := 1; y := 1; };
+		point += object DC::Point { x := 12; y := 6; };
+		point += object DC::Point { x := 1; y := 11; };
+		style := object DG::Style { fill := object DG::Paint { color := black } };
+	}
+};	
+
+property endOpenArrow : DG::Marker = object DG::Marker {
+	id := "endOpenArrow";
+	size := object DC::Dimension { width := 12; height := 12; };
+	reference := object DC::Point { x := 12; y := 6; };
+	member += object DG::Polyline {
+		point += object DC::Point { x := 1; y := 1; };
+		point += object DC::Point { x := 12; y := 6; };
+		point += object DC::Point { x := 1; y := 11; };
+	}
+};	
+
+property endSolidCircleOpenArrow : DG::Marker = object DG::Marker {
+	id := "endSolidCircleOpenArrow";
+	size := object DC::Dimension { width := 20; height := 12; };
+	reference := object DC::Point { x := 20; y := 6; };
+	member += object DG::Circle {
+		center := object DC::Point { x := 16; y := 6; };
+		radius := 3;
+		style := object DG::Style { fill := object DG::Paint { color := black } };
+	};
+	member += object DG::Polyline {
+		point += object DC::Point { x := 1; y := 1; };
+		point += object DC::Point { x := 12; y := 6; };
+		point += object DC::Point { x := 1; y := 11; };
+	};
+};	
+
+property endSolidDiamond : DG::Marker = object DG::Marker {
+	id := "endSolidDiamond";
+	size := object DC::Dimension { width := 16; height := 12; };
+	reference := object DC::Point { x := 16; y := 6; };
+	member += object DG::Polygon {
+		point += object DC::Point { x := 0; y := 6; };
+		point += object DC::Point { x := 8; y := 1; };
+		point += object DC::Point { x := 16; y := 6; };
+		point += object DC::Point { x := 8; y := 11; };
+		style := object DG::Style { fill := object DG::Paint { color := black } };
+	};
+};	
+
+property endHollowDiamond : DG::Marker = object DG::Marker {
+	id := "endHollowDiamond";
+	size := object DC::Dimension { width := 16; height := 12; };
+	reference := object DC::Point { x := 16; y := 6; };
+	member += object DG::Polygon {
+		point += object DC::Point { x := 0; y := 6; };
+		point += object DC::Point { x := 8; y := 1; };
+		point += object DC::Point { x := 16; y := 6; };
+		point += object DC::Point { x := 8; y := 11; };
+		style := object DG::Style { fill := object DG::Paint { color := white } };
+	};
+};	
+
+property endSolidDiamondOpenArrow : DG::Marker = object DG::Marker {
+	id := "endSolidDiamondOpenArrow";
+	size := object DC::Dimension { width := 28; height := 12; };
+	reference := object DC::Point { x := 28; y := 6; };
+	member += object DG::Polygon {
+		point += object DC::Point { x := 12; y := 6; };
+		point += object DC::Point { x := 20; y := 1; };
+		point += object DC::Point { x := 28; y := 6; };
+		point += object DC::Point { x := 20; y := 11; };
+		style := object DG::Style { fill := object DG::Paint { color := black } };
+	};
+	member += object DG::Polyline {
+		point += object DC::Point { x := 1; y := 1; };
+		point += object DC::Point { x := 12; y := 6; };
+		point += object DC::Point { x := 1; y := 11; };
+	};
+};	
+
+property endHollowDiamondOpenArrow : DG::Marker = object DG::Marker {
+	id := "endHollowDiamondOpenArrow";
+	size := object DC::Dimension { width := 28; height := 12; };
+	reference := object DC::Point { x := 28; y := 6; };
+	member += object DG::Polygon {
+		point += object DC::Point { x := 12; y := 6; };
+		point += object DC::Point { x := 20; y := 1; };
+		point += object DC::Point { x := 28; y := 6; };
+		point += object DC::Point { x := 20; y := 11; };
+		style := object DG::Style { fill := object DG::Paint { color := white } };
+	};
+	member += object DG::Polyline {
+		point += object DC::Point { x := 1; y := 1; };
+		point += object DC::Point { x := 12; y := 6; };
+		point += object DC::Point { x := 1; y := 11; };
+	};
+};	
+
+property endSolidCircleSolidDiamondOpenArrow : DG::Marker = object DG::Marker {
+	id := "endSolidCircleSolidDiamondOpenArrow";
+	size := object DC::Dimension { width := 36; height := 12; };
+	reference := object DC::Point { x := 36; y := 6; };
+	member += object DG::Circle {
+		center := object DC::Point { x := 32; y := 6; };
+		radius := 3;
+		style := object DG::Style { fill := object DG::Paint { color := black } };
+	};
+	member += object DG::Polygon {
+		point += object DC::Point { x := 12; y := 6; };
+		point += object DC::Point { x := 20; y := 1; };
+		point += object DC::Point { x := 28; y := 6; };
+		point += object DC::Point { x := 20; y := 11; };
+		style := object DG::Style { fill := object DG::Paint { color := black } };
+	};
+	member += object DG::Polyline {
+		point += object DC::Point { x := 1; y := 1; };
+		point += object DC::Point { x := 12; y := 6; };
+		point += object DC::Point { x := 1; y := 11; };
+	};
+};	
+
+property endSolidCircleHollowDiamondOpenArrow : DG::Marker = object DG::Marker {
+	id := "endSolidCircleHollowDiamondOpenArrow";
+	size := object DC::Dimension { width := 36; height := 12; };
+	reference := object DC::Point { x := 36; y := 6; };
+	member += object DG::Circle {
+		center := object DC::Point { x := 32; y := 6; };
+		radius := 3;
+		style := object DG::Style { fill := object DG::Paint { color := black } };
+	};
+	member += object DG::Polygon {
+		point += object DC::Point { x := 12; y := 6; };
+		point += object DC::Point { x := 20; y := 1; };
+		point += object DC::Point { x := 28; y := 6; };
+		point += object DC::Point { x := 20; y := 11; };
+		style := object DG::Style { fill := object DG::Paint { color := white } };
+	};
+	member += object DG::Polyline {
+		point += object DC::Point { x := 1; y := 1; };
+		point += object DC::Point { x := 12; y := 6; };
+		point += object DC::Point { x := 1; y := 11; };
+	};
+};	
+
+property startOpenArrow : DG::Marker = object DG::Marker {
+	id := "startOpenArrow";
+	size := object DC::Dimension { width := 12; height := 12; };
+	reference := object DC::Point { x := 0; y := 6; };
+	member += object DG::Polyline {
+		point += object DC::Point { x := 11; y := 1; };
+		point += object DC::Point { x := 1; y := 6; };
+		point += object DC::Point { x := 11; y := 11; };
+	}
+};	
+
+property startSolidCircleOpenArrow : DG::Marker = object DG::Marker {
+	id := "startSolidCircleOpenArrow";
+	size := object DC::Dimension { width := 20; height := 12; };
+	reference := object DC::Point { x := 0; y := 6; };
+	member += object DG::Circle {
+		center := object DC::Point { x := 4; y := 6; };
+		radius := 3;
+		style := object DG::Style { fill := object DG::Paint { color := black } };
+	};
+	member += object DG::Polyline {
+		point += object DC::Point { x := 19; y := 1; };
+		point += object DC::Point { x := 8; y := 6; };
+		point += object DC::Point { x := 19; y := 11; };
+	};
+};	
+
+property startSolidDiamond : DG::Marker = object DG::Marker {
+	id := "startSolidDiamond";
+	size := object DC::Dimension { width := 16; height := 12; };
+	reference := object DC::Point { x := 0; y := 6; };
+	member += object DG::Polygon {
+		point += object DC::Point { x := 0; y := 6; };
+		point += object DC::Point { x := 8; y := 1; };
+		point += object DC::Point { x := 16; y := 6; };
+		point += object DC::Point { x := 8; y := 11; };
+		style := object DG::Style { fill := object DG::Paint { color := black } };
+	};
+};	
+
+property startHollowDiamond : DG::Marker = object DG::Marker {
+	id := "startHollowDiamond";
+	size := object DC::Dimension { width := 16; height := 12; };
+	reference := object DC::Point { x := 0; y := 6; };
+	member += object DG::Polygon {
+		point += object DC::Point { x := 0; y := 6; };
+		point += object DC::Point { x := 8; y := 1; };
+		point += object DC::Point { x := 16; y := 6; };
+		point += object DC::Point { x := 8; y := 11; };
+		style := object DG::Style { fill := object DG::Paint { color := white } };
+	};
+};	
+
+property startSolidDiamondOpenArrow : DG::Marker = object DG::Marker {
+	id := "startSolidDiamondOpenArrow";
+	size := object DC::Dimension { width := 28; height := 12; };
+	reference := object DC::Point { x := 0; y := 6; };
+	member += object DG::Polygon {
+		point += object DC::Point { x := 0; y := 6; };
+		point += object DC::Point { x := 8; y := 1; };
+		point += object DC::Point { x := 16; y := 6; };
+		point += object DC::Point { x := 8; y := 11; };
+		style := object DG::Style { fill := object DG::Paint { color := black } };
+	};
+	member += object DG::Polyline {
+		point += object DC::Point { x := 27; y := 1; };
+		point += object DC::Point { x := 16; y := 6; };
+		point += object DC::Point { x := 27; y := 11; };
+	};
+};	
+
+property startHollowDiamondOpenArrow : DG::Marker = object DG::Marker {
+	id := "startHollowDiamondOpenArrow";
+	size := object DC::Dimension { width := 28; height := 12; };
+	reference := object DC::Point { x := 0; y := 6; };
+	member += object DG::Polygon {
+		point += object DC::Point { x := 0; y := 6; };
+		point += object DC::Point { x := 8; y := 1; };
+		point += object DC::Point { x := 16; y := 6; };
+		point += object DC::Point { x := 8; y := 11; };
+		style := object DG::Style { fill := object DG::Paint { color := white } };
+	};
+	member += object DG::Polyline {
+		point += object DC::Point { x := 27; y := 1; };
+		point += object DC::Point { x := 16; y := 6; };
+		point += object DC::Point { x := 27; y := 11; };
+	};
+};	
+
+property startSolidCircleSolidDiamondOpenArrow : DG::Marker = object DG::Marker {
+	id := "startSolidCircleSolidDiamondOpenArrow";
+	size := object DC::Dimension { width := 36; height := 12; };
+	reference := object DC::Point { x := 0; y := 6; };
+	member += object DG::Circle {
+		center := object DC::Point { x := 4; y := 6; };
+		radius := 3;
+		style := object DG::Style { fill := object DG::Paint { color := black } };
+	};
+	member += object DG::Polygon {
+		point += object DC::Point { x := 8; y := 6; };
+		point += object DC::Point { x := 16; y := 1; };
+		point += object DC::Point { x := 24; y := 6; };
+		point += object DC::Point { x := 16; y := 11; };
+		style := object DG::Style { fill := object DG::Paint { color := black } };
+	};
+	member += object DG::Polyline {
+		point += object DC::Point { x := 35; y := 1; };
+		point += object DC::Point { x := 24; y := 6; };
+		point += object DC::Point { x := 35; y := 11; };
+	};
+};	
+
+property startSolidCircleHollowDiamondOpenArrow : DG::Marker = object DG::Marker {
+	id := "startSolidCircleHollowDiamondOpenArrow";
+	size := object DC::Dimension { width := 36; height := 12; };
+	reference := object DC::Point { x := 0; y := 6; };
+	member += object DG::Circle {
+		center := object DC::Point { x := 4; y := 6; };
+		radius := 3;
+		style := object DG::Style { fill := object DG::Paint { color := black } };
+	};
+	member += object DG::Polygon {
+		point += object DC::Point { x := 8; y := 6; };
+		point += object DC::Point { x := 16; y := 1; };
+		point += object DC::Point { x := 24; y := 6; };
+		point += object DC::Point { x := 16; y := 11; };
+		style := object DG::Style { fill := object DG::Paint { color := white } };
+	};
+	member += object DG::Polyline {
+		point += object DC::Point { x := 35; y := 1; };
+		point += object DC::Point { x := 24; y := 6; };
+		point += object DC::Point { x := 35; y := 11; };
+	};
+};	
+
+property umlDefinitions : DG::Definitions = object DG::Definitions {
+	styleSheet := object DG::StyleSheet {
+		rule += object DG::StyleRule {
+			selector := object DG::StyleSelector {
+				kind := DG::ElementKind::canvas;
+			};
+			style := object DG::Style {
+				fill := null;
+				stroke := object DG::Paint {
+					color := black;
+				};
+			};
+		};
+		rule += object DG::StyleRule {
+			selector := object DG::StyleSelector {
+				kind := DG::ElementKind::text;
+			};
+			style := object DG::Style {
+				stroke := null;
+				fill := object DG::Paint {
+					color := black;
+				};
+			};
+		};
+		rule += object DG::StyleRule {
+			selector := object DG::StyleSelector {
+				_class := "interfaceRealization";
+			};
+			style := object DG::Style {
+				strokeDashLength := Sequence{5, 5};
+			};
+		};
+	};
+	
+	definition += endHollowClosedArrow;
+	definition += endSolidClosedArrow;
+	definition += endOpenArrow;
+	definition += endSolidCircleOpenArrow;
+	definition += endSolidDiamond;
+	definition += endHollowDiamond;
+	definition += endSolidDiamondOpenArrow;
+	definition += endHollowDiamondOpenArrow;
+	definition += endSolidCircleSolidDiamondOpenArrow;
+	definition += endSolidCircleHollowDiamondOpenArrow;
+	
+	definition += startOpenArrow;
+	definition += startSolidCircleOpenArrow;
+	definition += startSolidDiamond;
+	definition += startHollowDiamond;
+	definition += startSolidDiamondOpenArrow;
+	definition += startHollowDiamondOpenArrow;
+	definition += startSolidCircleSolidDiamondOpenArrow;
+	definition += startSolidCircleHollowDiamondOpenArrow;
+};
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/UmlDiagramToDG.qvto b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/UmlDiagramToDG.qvto
new file mode 100644
index 00000000000..c64000efbd3
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/UmlDiagramToDG.qvto
@@ -0,0 +1,131 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+import UmlDefinitions;
+
+modeltype DC uses "http://www.omg.org/spec/DD/20110901/DC";
+modeltype DG uses "http://www.omg.org/spec/DD/20110901/DG";
+modeltype DI uses "http://www.omg.org/spec/DD/20110901/DI";
+modeltype UMLDI uses "http://www.omg.org/spec/UML/20131001/UMLDI";
+modeltype UML uses "http://www.eclipse.org/uml2/4.0.0/UML";
+	
+library UmlDiagramToDG;
+
+abstract mapping UMLDI::UmlDiagramElement::diagramElementToGraphicalElement() : DG::GraphicalElement {
+	style := self.localUmlStyle.map styleToStyle();
+}
+
+mapping UMLDI::UmlDiagram::rootDiagramToGraphicalElement() : DG::RootCanvas 
+	inherits UMLDI::UmlDiagramElement::diagramElementToGraphicalElement
+{
+	script += "platform:/plugin/org.eclipse.papyrus.umldi2dg/scripts/UmlLayouts.js";
+	definitions := umlDefinitions;
+	member += self.ownedUmlDiagramElement->map ownedElementToGraphicalElement();
+}
+
+mapping UMLDI::UmlDiagramElement::ownedElementToGraphicalElement() : DG::GraphicalElement 
+	disjuncts UMLDI::UmlLabel::labelToText,
+			  UMLDI::UmlCompartment::compartmentToCanvas,
+			  UMLDI::UmlShape::shapeToCanvas,
+			  UMLDI::UmlEdge::edgeToGroup; 
+
+mapping UMLDI::UmlLabel::labelToText() : DG::Text 
+	inherits UMLDI::UmlDiagramElement::diagramElementToGraphicalElement
+{
+	init {
+		if (self.umlModelElement->size() = 1) then {
+			result := self.umlModelElement->at(1).oclAsType(UML::Element).map labelToText(self);
+		} endif;
+	}
+	bounds := self.bounds.clone().oclAsType(DC::Bounds);
+}
+
+mapping UMLDI::UmlCompartment::compartmentToCanvas() : DG::Canvas 
+	inherits UMLDI::UmlDiagramElement::diagramElementToGraphicalElement
+{
+	bounds := object DC::Bounds { x := self.bounds.x; y := self.bounds.y; };
+	member += self.map compartmentToLine();
+	member += self.ownedUmlDiagramElement->map ownedElementToGraphicalElement();
+}
+
+mapping UMLDI::UmlCompartment::compartmentToLine() : DG::Line { 
+	init {
+		if (self.umlModelElement->size() = 1) then {
+			result := self.umlModelElement->at(1).oclAsType(UML::Element).map compartmentToLine(self);
+		} endif;
+	}
+}
+
+mapping UMLDI::UmlShape::shapeToCanvas() : DG::Canvas 
+	inherits UMLDI::UmlDiagramElement::diagramElementToGraphicalElement
+{
+	bounds := object DC::Bounds { x := self.bounds.x; y := self.bounds.y; };
+	member += self.map shapeToGraphicalElement();
+	member += self.ownedUmlDiagramElement->map ownedElementToGraphicalElement();
+}
+
+mapping UMLDI::UmlShape::shapeToGraphicalElement() : DG::GraphicalElement { 
+	init {
+		if (self.umlModelElement->size() = 1) then {
+			result := self.umlModelElement->at(1).oclAsType(UML::Element).map shapeToGraphicalElement(self);
+		} endif;
+	}
+}
+
+mapping UMLDI::UmlEdge::edgeToGroup() : DG::Group  
+	inherits UMLDI::UmlDiagramElement::diagramElementToGraphicalElement
+{
+	member += self.map edgeToPath();
+	member += self.ownedUmlDiagramElement->map ownedElementToGraphicalElement();
+}
+
+mapping UMLDI::UmlEdge::edgeToPath() : DG::Path {  
+	init {
+		if (self.umlModelElement->size() = 1) then {
+			result := self.umlModelElement->at(1).oclAsType(UML::Element).map edgeToPath(self);
+		} endif;
+	}
+	command += object DG::MoveTo { point := self.waypoint->first().clone().oclAsType(DC::Point) };
+	self.waypoint->excluding(self.waypoint->first())->forEach(p) {
+		command +=  object DG::LineTo { point := p.clone().oclAsType(DC::Point) };
+	};
+}
+
+mapping UMLDI::UmlStyle::styleToStyle() : DG::Style {
+	fontName := self.fontName;
+	fontSize := self.fontSize;
+}
+
+mapping UML::Element::labelToText(label : UMLDI::UmlLabel) : DG::Text {
+	data := "NoRef";
+}
+
+mapping UML::Element::compartmentToLine(compartment : UMLDI::UmlCompartment) : DG::Line {
+	start := object DC::Point { x := 0; y := 0; };
+	_end := object DC::Point { x := compartment.bounds.width; y := 0; }
+}
+
+mapping UML::Element::shapeToGraphicalElement(shape : UMLDI::UmlShape) : DG::GraphicalElement {
+	init {
+		result := object DG::Rectangle {
+			bounds := object DC::Bounds { 
+				x := 0; 
+				y := 0; 
+				width := shape.bounds.width;
+				height := shape.bounds.height 
+			};
+		};
+	}
+}
+
+mapping UML::Element::edgeToPath(edge : UMLDI::UmlEdge) : DG::Path {
+}
+
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/umldefinitions.qvto b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/umldefinitions.qvto
deleted file mode 100644
index 585330867da..00000000000
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/umldefinitions.qvto
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *  
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-import org.eclipse.papyrus.umldi2dg.UtilitiesLibrary;
-
-modeltype DC uses "http://www.omg.org/spec/DD/20110901/DC";
-modeltype DG uses "http://www.omg.org/spec/DD/20110901/DG";
-modeltype DI uses "http://www.omg.org/spec/DD/20110901/DI";
-modeltype UMLDI uses "http://www.omg.org/spec/UML/20131001/UMLDI";
-modeltype UML uses "http://www.eclipse.org/uml2/4.0.0/UML";
-
-library umldefinitions;
-
-property openArrow : DG::Marker = object DG::Marker {
-	id := "openArrow";
-	size := object DC::Dimension { width := 12; height := 10; };
-	reference := object DC::Point { x := 12; y := 5; };
-	member := object DG::Polyline {
-		point += object DC::Point { x := 0; y := 0; };
-		point += object DC::Point { x := 12; y := 5; };
-		point += object DC::Point { x := 0; y := 10; };
-	}
-};	
-
-property closedArrow : DG::Marker = object DG::Marker {
-	id := "closedArrow";
-	size := object DC::Dimension { width := 12; height := 10; };
-	reference := object DC::Point { x := 12; y := 5; };
-	member := object DG::Polygon {
-		point += object DC::Point { x := 1; y := 1; };
-		point += object DC::Point { x := 11; y := 5; };
-		point += object DC::Point { x := 1; y := 9; };
-		style := object DG::Style { fill := object DG::Paint { color := createColor('#FFFFFF') } };
-	}
-};	
-
-property umlDefinitions : DG::Definitions = object DG::Definitions {
-	styleSheet := object DG::StyleSheet {
-		rule += object DG::StyleRule {
-			selector := object DG::StyleSelector {
-				kind := DG::ElementKind::canvas;
-			};
-			style := object DG::Style {
-				fill := null;
-				stroke := object DG::Paint {
-					color := createColor('#000000');
-				};
-			};
-		};
-		rule += object DG::StyleRule {
-			selector := object DG::StyleSelector {
-				kind := DG::ElementKind::text;
-			};
-			style := object DG::Style {
-				stroke := null;
-				fill := object DG::Paint {
-					color := createColor('#000000');
-				};
-			};
-		};
-	};
-	defnition += openArrow;
-	defnition += closedArrow;
-};
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/umldi2dg.qvto b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/umldi2dg.qvto
deleted file mode 100644
index 0b94d69e3c0..00000000000
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/umldi2dg.qvto
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *  
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-import umldefinitions;
-
-modeltype DC uses "http://www.omg.org/spec/DD/20110901/DC";
-modeltype DG uses "http://www.omg.org/spec/DD/20110901/DG";
-modeltype DI uses "http://www.omg.org/spec/DD/20110901/DI";
-modeltype UMLDI uses "http://www.omg.org/spec/UML/20131001/UMLDI";
-modeltype UML uses "http://www.eclipse.org/uml2/4.0.0/UML";
-	
-transformation umldi2dg(in umldi : UMLDI, out DG);
-
-main() {
-	umldi.rootObjects()[UMLDI::UmlDiagram]->map diagram2Canvas();
-}
-
-abstract mapping UMLDI::UmlDiagramElement::diagramElement2GraphicalElement() : DG::GraphicalElement {
-	style := self.localUmlStyle.umlStyle2Style();
-}
-
-mapping UMLDI::UmlDiagram::diagram2Canvas() : DG::RootCanvas 
-	inherits UMLDI::UmlDiagramElement::diagramElement2GraphicalElement
-{
-	definitions := umlDefinitions;
-	
-	script += "platform:/plugin/org.eclipse.papyrus.umldi2dg/scripts/umllayouts.js";
-	
-	layout := "xyLayout(parent)";
-	member += self.ownedDiagramElement[UMLDI::UmlShape]->map allUmlShape2Canvas();
-	member += self.ownedDiagramElement[UMLDI::UmlEdge]->map allUmlEdge2Group();
-}
-
-mapping UMLDI::UmlShape::allUmlShape2Canvas() : DG::Canvas
-	disjuncts UMLDI::UmlShape::classShape2Canvas
-{
-}
-
-mapping UMLDI::UmlEdge::allUmlEdge2Group() : DG::Group
-	disjuncts UMLDI::UmlEdge::generalizationEdge2Group
-{	
-}
-
-abstract mapping UMLDI::UmlShape::umlShape2Canvas() : DG::Canvas 
-	inherits UMLDI::UmlDiagramElement::diagramElement2GraphicalElement
-{
-	bounds := self.bounds.clone().oclAsType(DC::Bounds);
-}
-
-mapping UMLDI::UmlShape::classShape2Canvas() : DG::Canvas
-	inherits UMLDI::UmlShape::umlShape2Canvas
-	when { self.umlModelElement->at(1).oclIsKindOf(UML::Class) }
-{
-	layout := "stackLayout(parent)";	
-	member += object DG::Rectangle {};
-	member += object DG::Group {
-		layout := "flowLayout(parent, false, 0)";
-		member += self.ownedUmlDiagramElement[UMLDI::UmlLabel]->map umlLabel2Text();
-		member += self.ownedUmlDiagramElement[UMLDI::UmlCompartment]->map umlCompartment2Group();
-	}
-}
-
-abstract mapping UMLDI::UmlEdge::umlEdge2Group() : DG::Group 
-	inherits UMLDI::UmlDiagramElement::diagramElement2GraphicalElement
-{
-	member += object DG::Path {
-		command += object DG::MoveTo { point := self.waypoint->first().clone().oclAsType(DC::Point) };
-		self.waypoint->excluding(self.waypoint->first())->forEach(p) {
-			command +=  object DG::LineTo { point := p.clone().oclAsType(DC::Point) };
-		};
-	};
-}
-
-mapping UMLDI::UmlEdge::generalizationEdge2Group() : DG::Group
-	inherits UMLDI::UmlEdge::umlEdge2Group
-	when { self.umlModelElement->at(1).oclIsKindOf(UML::Generalization) }
-{
-	var path : DG::Path = member->any(oclIsKindOf(DG::Path)).oclAsType(DG::Path);
-	path.endMarker := closedArrow;		
-}
-
-mapping UMLDI::UmlLabel::umlLabel2Text() : DG::Text
-	inherits UMLDI::UmlDiagramElement::diagramElement2GraphicalElement
-{
-	init {
-		var umlElement = self.umlModelElement->at(1).oclAsType(UML::Element);
-		result := umlElement.map umlLabel2Text(self);
-	}
-	position := object Point { x := self.bounds.x; y := self.bounds.y; };
-}
-
-mapping UMLDI::UmlCompartment::umlCompartment2Group() : DG::Group
-	inherits UMLDI::UmlDiagramElement::diagramElement2GraphicalElement
-{
-	var umlElement = self.umlModelElement->at(1).oclAsType(UML::Element);
-	layout := "stackLayout(parent)";	
-	member += object DG::Rectangle {};
-	member += umlElement.map umlCompartment2Group(self);
-}
-
-helper UMLDI::UmlStyle::umlStyle2Style() : DG::Style {
-	return object DG::Style {
-		fontName := self.fontName;
-		fontSize := self.fontSize;
-	}
-}
-
-abstract mapping UML::Element::umlLabel2Text(label : UMLDI::UmlLabel) : DG::Text;
-
-mapping UML::NamedElement::umlLabel2Text(label : UMLDI::UmlLabel) : DG::Text 
-	inherits UML::Element::umlLabel2Text
-{
-	if 	(label.kind = UmlLabelKind::name) then {
-		data := self.name;
-		anchor := TextAnchor::middle; 
-	} endif;
-}
-
-abstract mapping UML::Element::umlCompartment2Group(compartment : UMLDI::UmlCompartment) : DG::Group;
-
-mapping UML::StructuredClassifier::umlCompartment2Group(compartment : UMLDI::UmlCompartment) : DG::Group
-	inherits UML::Element::umlCompartment2Group
-{
-	if 	(compartment.kind = UmlCompartmentKind::attributes) then {
-		layout := "flowLayout(parent, false, 0)";
-		member += compartment.ownedUmlDiagramElement[UMLDI::UmlLabel]->map umlLabel2Text(); 
-	} endif;
-}
diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/META-INF/MANIFEST.MF b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/META-INF/MANIFEST.MF
index d8d8c8de192..2ebf72ea7b3 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/META-INF/MANIFEST.MF
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0

 Bundle-Vendor: %Bundle-Vendor

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.diagramtemplate.doc;singleton

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/META-INF/MANIFEST.MF b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/META-INF/MANIFEST.MF
index f8d3e37bb91..5c3f8696ee6 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/META-INF/MANIFEST.MF
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0

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

- org.eclipse.papyrus.diagramtemplate;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.diagramtemplate;bundle-version="1.1.0";visibility:=reexport,

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

 Export-Package: org.eclipse.papyrus.diagramtemplate.provider

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.diagramtemplate.provider.Diagram

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/pom.xml b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/pom.xml
index fba2121c224..43f4f145854 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/pom.xml
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.diagramtemplate.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/META-INF/MANIFEST.MF b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/META-INF/MANIFEST.MF
index fbbe607dd31..f236eb9f96c 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/META-INF/MANIFEST.MF
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/META-INF/MANIFEST.MF
@@ -1,27 +1,27 @@
 Manifest-Version: 1.0

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

  org.eclipse.core.resources,

- org.eclipse.papyrus.diagramtemplate.edit;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.diagramtemplate.edit;bundle-version="1.1.0";visibility:=reexport,

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

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

  org.eclipse.ui.ide,

  org.eclipse.uml2.uml;bundle-version="3.1.0",

  org.eclipse.uml2.uml.edit;bundle-version="3.1.0",

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

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

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

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

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

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

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

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

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

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

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

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

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.diagramtemplate.editor,

  org.eclipse.papyrus.diagramtemplate.launcher

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.diagramtemplate.editor.DiagramTe

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/pom.xml b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/pom.xml
index 78e52b279c9..bedfae1977b 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/pom.xml
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.diagramtemplate.editor</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate/META-INF/MANIFEST.MF b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate/META-INF/MANIFEST.MF
index 6819a1e3302..27250f05992 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate/META-INF/MANIFEST.MF
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Export-Package: org.eclipse.papyrus.diagramtemplate,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate/pom.xml b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate/pom.xml
index 7afdf6f3c4a..54693dfca62 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate/pom.xml
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.diagramtemplate</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/META-INF/MANIFEST.MF b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/META-INF/MANIFEST.MF
index 0e745758561..3e983b05d07 100644
--- a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/META-INF/MANIFEST.MF
+++ b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/META-INF/MANIFEST.MF
@@ -1,30 +1,30 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

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

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

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

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

  org.eclipse.gmf.runtime.diagram.ui.providers,

  org.eclipse.gmf.runtime.diagram.ui.resources.editor,

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

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

  org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",

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

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

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

  org.eclipse.uml2.uml;bundle-version="4.0.0",

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

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

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",

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

  org.eclipse.emf.common.ui;bundle-version="2.7.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

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

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

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

  org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",

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

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1"

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

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.core.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.core.prefs
index fa8a5dde578..dce4e38498b 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,291 @@
 eclipse.preferences.version=1

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF
index ffb3fc6c5a4..82508138224 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF
@@ -8,12 +8,12 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.acceleo.common;bundle-version="3.1.1",

  org.eclipse.acceleo.engine;bundle-version="3.1.1",

  org.eclipse.emf.validation;bundle-version="1.4.0",

- org.eclipse.papyrus.dsml.validation.model;bundle-version="1.0.1"

+ org.eclipse.papyrus.dsml.validation.model;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.dsml.validation.generator.main

 Bundle-Vendor: %pluginProvider

 Eclipse-LazyStart: true

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.dsml.validation.generator.Activa

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/pom.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/pom.xml
index dc6635b6c59..f4cf595835c 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/pom.xml
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.dsml.validation.generator</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/main/generate.emtl b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/main/generate.emtl
index 1a383421add..a26cc4ff465 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/main/generate.emtl
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/main/generate.emtl
@@ -402,14 +402,14 @@
     </ownedModuleElement>
     <ownedModuleElement xsi:type="mtl:Template" name="generateValidationContext" visibility="Public" main="true">
       <body xsi:type="mtl:FileBlock" openMode="OverWrite">
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="package "/>
+        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="/**&#xA; * Created by the Papyrus DSML plugin generator&#xA; */&#xA;&#xA;package "/>
         <body xsi:type="mtl:QueryInvocation" definition="/0/getPluginID">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
           <argument xsi:type="ocl.ecore:VariableExp" name="stereotype" referredVariable="/0/generateValidationContext/stereotype">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Stereotype"/>
           </argument>
         </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".selectors;&#xA;&#xA;import org.eclipse.emf.ecore.EObject;&#xA;import org.eclipse.emf.validation.model.IClientSelector;&#xA;import org.eclipse.uml2.uml.Class;&#xA;import org.eclipse.uml2.uml.Element;&#xA;import org.eclipse.uml2.uml.Stereotype;&#xA;import org.eclipse.uml2.uml.util.UMLUtil;&#xA;&#xA;&#xA;public class "/>
+        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".selectors;&#xA;&#xA;import org.eclipse.emf.validation.model.IClientSelector;&#xA;import org.eclipse.papyrus.uml.service.validation.StereotypeUtil;&#xA;&#xA;/**&#xA; * This class filters (selects) passed stereotype applications. It returns true, if the&#xA; * associated stereotype (or one of its super-stereotypes) has the name '"/>
         <body xsi:type="ocl.ecore:PropertyCallExp">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
           <source xsi:type="ocl.ecore:VariableExp" name="stereotype" referredVariable="/0/generateValidationContext/stereotype">
@@ -417,7 +417,7 @@
           </source>
           <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
         </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="ClientSelector implements IClientSelector {&#xA;&#xA;&#x9;public boolean selects(Object object) {&#xA;&#x9;&#x9;if(!(object instanceof EObject)) {&#xA;&#x9;&#x9;&#x9;return false;&#xA;&#x9;&#x9;}&#xA;&#xA;&#x9;&#x9;if(object instanceof Element) {&#xA;&#x9;&#x9;&#x9;return false;&#xA;&#x9;&#x9;}&#xA;&#xA;&#x9;&#x9;EObject stereotypeApplication = ((EObject)object);&#xA;&#x9;&#x9;Stereotype stereotype = UMLUtil.getStereotype(stereotypeApplication);&#xA;&#x9;&#x9;if(stereotype == null) {&#xA;&#x9;&#x9;&#x9;return false;&#xA;&#x9;&#x9;}&#xA;&#xA;&#x9;&#x9;return checkStereotype(stereotype, &quot;"/>
+        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="'.&#xA; *&#xA; * @generated&#xA; */&#xA;public class "/>
         <body xsi:type="ocl.ecore:PropertyCallExp">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
           <source xsi:type="ocl.ecore:VariableExp" name="stereotype" referredVariable="/0/generateValidationContext/stereotype">
@@ -425,7 +425,15 @@
           </source>
           <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
         </body>
-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&quot;); //$NON-NLS-1$&#xA;&#x9;}&#xA;&#xA;&#x9;public boolean checkStereotype(Stereotype stereotype, String stereoName) {&#xA;&#x9;&#x9;if(stereoName.equals(stereotype.getName())) {&#xA;&#x9;&#x9;&#x9;return true;&#xA;&#x9;&#x9;}&#xA;&#x9;&#x9;for (Class superStereo : stereotype.getSuperClasses()) {&#xA;&#x9;&#x9;&#x9;if (superStereo instanceof Stereotype) {&#xA;&#x9;&#x9;&#x9;&#x9;if (checkStereotype((Stereotype) superStereo, stereoName)) {&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return true;&#xA;&#x9;&#x9;&#x9;&#x9;}&#xA;&#x9;&#x9;&#x9;}&#xA;&#x9;&#x9;}&#xA;&#x9;&#x9;return false;&#xA;&#x9;}&#xA;}&#xA;&#xA;"/>
+        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="ClientSelector implements IClientSelector {&#xA;&#xA;&#x9;public boolean selects(Object stereoApplicationObj) {&#xA;&#x9;&#x9;return StereotypeUtil.checkStereoApplication(stereoApplicationObj, &quot;"/>
+        <body xsi:type="ocl.ecore:PropertyCallExp">
+          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+          <source xsi:type="ocl.ecore:VariableExp" name="stereotype" referredVariable="/0/generateValidationContext/stereotype">
+            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Stereotype"/>
+          </source>
+          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+        </body>
+        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&quot;); //$NON-NLS-1$&#xA;&#x9;}&#xA;}&#xA;"/>
         <fileUrl xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
           <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
@@ -789,6 +797,9 @@
     <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Stereotype"/>
   </ocl.ecore:Variable>
   <ocl.ecore:Variable name="self">
+    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Stereotype"/>
+  </ocl.ecore:Variable>
+  <ocl.ecore:Variable name="self">
     <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
   </ocl.ecore:Variable>
   <ecore:EAnnotation source="positions">
@@ -1514,125 +1525,140 @@
     </eAnnotations>
     <eAnnotations source="positions.144" references="/0/generateValidationContext">
       <details key="start" value="3583"/>
-      <details key="end" value="4957"/>
+      <details key="end" value="4485"/>
       <details key="line" value="86"/>
     </eAnnotations>
     <eAnnotations source="positions.145" references="/0/generateValidationContext/%">
       <details key="start" value="3652"/>
-      <details key="end" value="4945"/>
+      <details key="end" value="4473"/>
       <details key="line" value="87"/>
     </eAnnotations>
     <eAnnotations source="positions.146" references="/0/generateValidationContext/%/%">
       <details key="start" value="3789"/>
-      <details key="end" value="3797"/>
+      <details key="end" value="3854"/>
       <details key="line" value="89"/>
     </eAnnotations>
     <eAnnotations source="positions.147" references="/0/generateValidationContext/%/%.1">
-      <details key="start" value="3798"/>
-      <details key="end" value="3821"/>
+      <details key="start" value="3855"/>
+      <details key="end" value="3878"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.148" references="/0/generateValidationContext/%/%.1/stereotype">
-      <details key="start" value="3810"/>
-      <details key="end" value="3820"/>
+      <details key="start" value="3867"/>
+      <details key="end" value="3877"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.149" references="/0/generateValidationContext/%/%.2">
-      <details key="start" value="3823"/>
-      <details key="end" value="4100"/>
-      <details key="line" value="89"/>
+      <details key="start" value="3880"/>
+      <details key="end" value="4182"/>
+      <details key="line" value="93"/>
     </eAnnotations>
     <eAnnotations source="positions.150" references="/0/generateValidationContext/%/%.3">
-      <details key="start" value="4101"/>
-      <details key="end" value="4116"/>
+      <details key="start" value="4183"/>
+      <details key="end" value="4198"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.151" references="/0/generateValidationContext/%/%.3/stereotype">
-      <details key="start" value="4101"/>
-      <details key="end" value="4111"/>
+      <details key="start" value="4183"/>
+      <details key="end" value="4193"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.152" references="/0/generateValidationContext/%/%.4">
-      <details key="start" value="4118"/>
-      <details key="end" value="4531"/>
-      <details key="line" value="99"/>
+      <details key="start" value="4200"/>
+      <details key="end" value="4237"/>
+      <details key="line" value="100"/>
     </eAnnotations>
     <eAnnotations source="positions.153" references="/0/generateValidationContext/%/%.5">
-      <details key="start" value="4532"/>
-      <details key="end" value="4547"/>
+      <details key="start" value="4238"/>
+      <details key="end" value="4253"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.154" references="/0/generateValidationContext/%/%.5/stereotype">
-      <details key="start" value="4532"/>
-      <details key="end" value="4542"/>
+      <details key="start" value="4238"/>
+      <details key="end" value="4248"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.155" references="/0/generateValidationContext/%/%.6">
-      <details key="start" value="4549"/>
-      <details key="end" value="4938"/>
-      <details key="line" value="116"/>
+      <details key="start" value="4255"/>
+      <details key="end" value="4425"/>
+      <details key="line" value="104"/>
     </eAnnotations>
     <eAnnotations source="positions.156" references="/0/generateValidationContext/%/%.7">
+      <details key="start" value="4426"/>
+      <details key="end" value="4441"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.157" references="/0/generateValidationContext/%/%.7/stereotype">
+      <details key="start" value="4426"/>
+      <details key="end" value="4436"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.158" references="/0/generateValidationContext/%/%.8">
+      <details key="start" value="4443"/>
+      <details key="end" value="4466"/>
+      <details key="line" value="107"/>
+    </eAnnotations>
+    <eAnnotations source="positions.159" references="/0/generateValidationContext/%/%.9">
       <details key="start" value="3659"/>
       <details key="end" value="3762"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.157" references="/0/generateValidationContext/%/%.7/%">
+    <eAnnotations source="positions.160" references="/0/generateValidationContext/%/%.9/%">
       <details key="start" value="3659"/>
       <details key="end" value="3739"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.158" references="/0/generateValidationContext/%/%.7/%/%">
+    <eAnnotations source="positions.161" references="/0/generateValidationContext/%/%.9/%/%">
       <details key="start" value="3659"/>
       <details key="end" value="3721"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.159" references="/0/generateValidationContext/%/%.7/%/%/%">
+    <eAnnotations source="positions.162" references="/0/generateValidationContext/%/%.9/%/%/%">
       <details key="start" value="3659"/>
       <details key="end" value="3705"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.160" references="/0/generateValidationContext/%/%.7/%/%/%/%">
+    <eAnnotations source="positions.163" references="/0/generateValidationContext/%/%.9/%/%/%/%">
       <details key="start" value="3659"/>
       <details key="end" value="3682"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.161" references="/0/generateValidationContext/%/%.7/%/%/%/%/stereotype">
+    <eAnnotations source="positions.164" references="/0/generateValidationContext/%/%.9/%/%/%/%/stereotype">
       <details key="start" value="3671"/>
       <details key="end" value="3681"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.162" references="/0/generateValidationContext/%/%.7/%/%/%/%.1">
+    <eAnnotations source="positions.165" references="/0/generateValidationContext/%/%.9/%/%/%/%.1">
       <details key="start" value="3694"/>
       <details key="end" value="3699"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.163" references="/0/generateValidationContext/%/%.7/%/%/%/%.2">
+    <eAnnotations source="positions.166" references="/0/generateValidationContext/%/%.9/%/%/%/%.2">
       <details key="start" value="3701"/>
       <details key="end" value="3704"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.164" references="/0/generateValidationContext/%/%.7/%/%/%.1">
+    <eAnnotations source="positions.167" references="/0/generateValidationContext/%/%.9/%/%/%.1">
       <details key="start" value="3708"/>
       <details key="end" value="3721"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.165" references="/0/generateValidationContext/%/%.7/%/%.1">
+    <eAnnotations source="positions.168" references="/0/generateValidationContext/%/%.9/%/%.1">
       <details key="start" value="3724"/>
       <details key="end" value="3739"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.166" references="/0/generateValidationContext/%/%.7/%/%.1/stereotype">
+    <eAnnotations source="positions.169" references="/0/generateValidationContext/%/%.9/%/%.1/stereotype">
       <details key="start" value="3724"/>
       <details key="end" value="3734"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.167" references="/0/generateValidationContext/%/%.7/%.1">
+    <eAnnotations source="positions.170" references="/0/generateValidationContext/%/%.9/%.1">
       <details key="start" value="3741"/>
       <details key="end" value="3762"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.168" references="/0/generateValidationContext/stereotype">
+    <eAnnotations source="positions.171" references="/0/generateValidationContext/stereotype">
       <details key="start" value="3626"/>
       <details key="end" value="3649"/>
       <details key="line" value="86"/>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/main/generate.mtl b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/main/generate.mtl
index b88c5ce7c1d..de4e6bb9cbb 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/main/generate.mtl
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/main/generate.mtl
@@ -86,50 +86,26 @@ public class [constraint.name.toUpperFirst() + 'Constraint'/] extends AbstractMo
 [template public generateValidationContext(stereotype : Stereotype)]
 [file (getPluginID(stereotype).replaceAll('\\.', '/') + '/selectors/' + stereotype.name +'ClientSelector.java', false)]
 [comment @main/]
+/**
+ * Created by the Papyrus DSML plugin generator
+ */
+
 package [getPluginID(stereotype)/].selectors;
 
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.validation.model.IClientSelector;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-
+import org.eclipse.papyrus.uml.service.validation.StereotypeUtil;
+
+/**
+ * This class filters (selects) passed stereotype applications. It returns true, if the
+ * associated stereotype (or one of its super-stereotypes) has the name '[stereotype.name/]'.
+ *
+ * @generated
+ */
 public class [stereotype.name/]ClientSelector implements IClientSelector {
 
-	public boolean selects(Object object) {
-		if(!(object instanceof EObject)) {
-			return false;
-		}
-
-		if(object instanceof Element) {
-			return false;
-		}
-
-		EObject stereotypeApplication = ((EObject)object);
-		Stereotype stereotype = UMLUtil.getStereotype(stereotypeApplication);
-		if(stereotype == null) {
-			return false;
-		}
-
-		return checkStereotype(stereotype, "[stereotype.name/]"); //$NON-NLS-1$
-	}
-
-	public boolean checkStereotype(Stereotype stereotype, String stereoName) {
-		if(stereoName.equals(stereotype.getName())) {
-			return true;
-		}
-		for (Class superStereo : stereotype.getSuperClasses()) {
-			if (superStereo instanceof Stereotype) {
-				if (checkStereotype((Stereotype) superStereo, stereoName)) {
-					return true;
-				}
-			}
-		}
-		return false;
+	public boolean selects(Object stereoApplicationObj) {
+		return StereotypeUtil.checkStereoApplication(stereoApplicationObj, "[stereotype.name/]"); //$NON-NLS-1$
 	}
 }
-
 [/file]
 [/template]
\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.core.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.core.prefs
index e2fba575589..4759947300a 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,3 @@
-#Mon Oct 10 12:54:57 CEST 2011

 eclipse.preferences.version=1

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

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

@@ -6,3 +5,287 @@ 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/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF
index ff53dc90519..72dcb7599cd 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF
@@ -3,17 +3,17 @@ Export-Package: org.eclipse.papyrus.dsml.validation.generation.ui
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.papyrus.dsml.validation.wizard;bundle-version="1.0.1",

- org.eclipse.papyrus.dsml.validation.model;bundle-version="1.0.1",

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

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

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

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

+ org.eclipse.papyrus.dsml.validation.wizard;bundle-version="1.1.0",

+ org.eclipse.papyrus.dsml.validation.model;bundle-version="1.1.0",

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

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

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

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

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

- org.eclipse.papyrus.dsml.validation.generator;bundle-version="1.0.1"

+ org.eclipse.papyrus.dsml.validation.generator;bundle-version="1.1.0"

 Bundle-Vendor: %pluginProvider

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.dsml.validation.generation.ui.Ac

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/pom.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/pom.xml
index 235a9ad1c23..728d57d1e92 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/pom.xml
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.dsml.validation.model.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.core.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.core.prefs
index f41463d139a..4759947300a 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,3 @@
-#Mon Oct 10 13:23:36 CEST 2011

 eclipse.preferences.version=1

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

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

@@ -6,3 +5,287 @@ 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/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/META-INF/MANIFEST.MF b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/META-INF/MANIFEST.MF
index ff38b0741e9..c037fdf0c82 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/META-INF/MANIFEST.MF
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/META-INF/MANIFEST.MF
@@ -8,11 +8,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.uml2.uml;bundle-version="3.2.100",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

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

- org.eclipse.papyrus.dsml.validation;bundle-version="1.0.1"

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

+ org.eclipse.papyrus.dsml.validation;bundle-version="1.1.0"

 Bundle-Vendor: %pluginProvider

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.dsml.validation.model.Activator

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/pom.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/pom.xml
index 442a3f1f9e3..9752901921d 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/pom.xml
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.dsml.validation.model</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.core.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.core.prefs
index 44217f8c068..4759947300a 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.core.prefs
@@ -5,3 +5,287 @@ 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/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/META-INF/MANIFEST.MF b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/META-INF/MANIFEST.MF
index 6f59b5f46f7..75cceaf724e 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/META-INF/MANIFEST.MF
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1"

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/pom.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/pom.xml
index d2aecb9042e..a08c6ad6434 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/pom.xml
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.dsml.validation.properties</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.core.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.core.prefs
index 6cf479bfb4a..4759947300a 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,3 @@
-#Mon Oct 10 13:22:15 CEST 2011

 eclipse.preferences.version=1

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

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

@@ -6,3 +5,287 @@ 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/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/META-INF/MANIFEST.MF b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/META-INF/MANIFEST.MF
index db7e017df6f..408123aeafb 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/META-INF/MANIFEST.MF
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/META-INF/MANIFEST.MF
@@ -7,16 +7,16 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.pde.ui;bundle-version="3.6.100",

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

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

- org.eclipse.papyrus.eclipse.project.editors;bundle-version="1.0.1",

- org.eclipse.papyrus.dsml.validation.model;bundle-version="1.0.1",

+ org.eclipse.papyrus.eclipse.project.editors;bundle-version="1.1.0",

+ org.eclipse.papyrus.dsml.validation.model;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="3.2.100",

- org.eclipse.papyrus.dsml.validation.generator;bundle-version="1.0.1",

+ org.eclipse.papyrus.dsml.validation.generator;bundle-version="1.1.0",

  org.eclipse.acceleo.engine;bundle-version="3.1.1",

- org.eclipse.papyrus.customization;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.customization;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: %pluginProvider

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.dsml.validation.wizard.Activator

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/pom.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/pom.xml
index ceeae539e81..d981141697a 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/pom.xml
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.dsml.validation.wizard</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/JavaContentGenerator.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/JavaContentGenerator.java
index 2c1a5151809..006a31aa7fc 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/JavaContentGenerator.java
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/JavaContentGenerator.java
@@ -45,6 +45,13 @@ public class JavaContentGenerator {
 	private IProject project;

 

 	/**

+	 * The source folder for the generated file. Ideally, it should be changed from "src" to "src-gen", but the

+	 * PluginGenerator currently does not support setting up the class path within the generated plugin

+	 * appropriately.

+	 */

+	public static final String srcFolder = "src"; //$NON-NLS-1$

+	

+	/**

 	 *

 	 * Constructor.

 	 *

@@ -68,7 +75,7 @@ public class JavaContentGenerator {
 				URI modelURI = umlProfile.eResource().getURI();

 

 				try {

-					IContainer target = project.getFolder("src");

+					IContainer target = project.getFolder(srcFolder); 

 					Utils.setPluginID(project.getName());

 					ClassesGenerator generator = new ClassesGenerator(modelURI, target, getArguments());

 					generator.doGenerate(monitor);

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java
index c43ef6b028f..e3416e856fe 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java
@@ -59,7 +59,11 @@ public class ValidationPluginGenerator {
 

 	private static final String JAVA_LANGUAGE = "Java"; //$NON-NLS-1$

 

-	private static final String OCL_LANGUAGE = "OCL"; //$NON-NLS-1$

+	/**

+	 * Do not use the standard tag OCL but OCLpivot to enforce validation with the pivot variant of OCL.

+	 * OCLpivot constraint validation is provided by the org.eclipse.papyrus.dsml.validation plugin

+	 */

+	private static final String OCL_LANGUAGE = "OCLpivot"; //$NON-NLS-1$

 

 	private static final String XML_CONSTRAINT_MODE = "mode"; //$NON-NLS-1$

 

@@ -84,6 +88,8 @@ public class ValidationPluginGenerator {
 	private static final String UML_PLUGIN = "org.eclipse.uml2.uml"; //$NON-NLS-1$

 

 	private static final String EMF_VALIDATION_PLUGIN = "org.eclipse.emf.validation"; //$NON-NLS-1$

+	

+	private static final String UML_VALIDATION_PLUGIN = "org.eclipse.papyrus.uml.service.validation"; //$NON-NLS-1$

 

 	private static final String UML_URL = "http://www.eclipse.org/uml2/5.0.0/UML"; //$NON-NLS-1$

 

@@ -119,6 +125,7 @@ public class ValidationPluginGenerator {
 

 		// prepare the plugin

 		editor = new PluginEditor(project);

+		editor.registerSourceFolder(JavaContentGenerator.srcFolder);

 		// it's possible that editor.getManifestEditor() logs an exception due to resource out of sync.

 		String pluginID = editor.getSymbolicBundleName();

 		if (editor.getBundleName() == null) {

@@ -132,6 +139,7 @@ public class ValidationPluginGenerator {
 		editor.addNatures(natures);

 

 		editor.getManifestEditor().addDependency(EMF_VALIDATION_PLUGIN);

+		editor.getManifestEditor().addDependency(UML_VALIDATION_PLUGIN);

 		editor.getManifestEditor().addDependency(UML_PLUGIN);

 

 		Element constraintProviderExtension =

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/interfaces/IValidationPluginGenerator.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/interfaces/IValidationPluginGenerator.java
index 45349f7ed7a..c7453251a51 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/interfaces/IValidationPluginGenerator.java
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/interfaces/IValidationPluginGenerator.java
@@ -17,7 +17,7 @@ import org.eclipse.pde.internal.ui.wizards.plugin.NewPluginProjectWizard;
 

 public interface IValidationPluginGenerator {

 

-	final static String PLUGIN_NATURE_ID = "org.eclipse.pde.PluginNature";

+	final static String PLUGIN_NATURE_ID = "org.eclipse.pde.PluginNature"; //$NON-NLS-1$

 

 	public void generate(IProject project, NewPluginProjectWizard wizard, IConstraintsManager constraintsManager);

 

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.core.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.core.prefs
index 44217f8c068..4759947300a 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.core.prefs
@@ -5,3 +5,287 @@ 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/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF
index 2a3446ca5d9..ef5bb806280 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF
@@ -9,11 +9,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,

  org.eclipse.uml2.types;visibility:=reexport,

  org.eclipse.uml2.uml;bundle-version="5.0.0",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0"

 Bundle-Vendor: %pluginProvider

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.dsml.validation.Activator

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.xml
index c50f482a286..4e36d434130 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.xml
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.xml
@@ -32,5 +32,4 @@
             provider="Eclipse Modeling Project">

       </profile>

    </extension>

-
 </plugin>

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/pom.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/pom.xml
index a2ba00c065a..54cb7d8677d 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/pom.xml
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.dsml.validation</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/IDSMLValidation.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/IDSMLValidation.java
index e8ee1c9ef57..f7bf0f05fe5 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/IDSMLValidation.java
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/IDSMLValidation.java
@@ -19,37 +19,53 @@ package org.eclipse.papyrus.dsml.validation;
  */

 public interface IDSMLValidation {

 	/** Qualified name of the stereotype ValidationRule */

-	public static final String VALIDATIONRULE_STEREOTYPE = "PapyrusDSMLValidationRule::ValidationRule";

+	public static final String VALIDATIONRULE_STEREOTYPE = "PapyrusDSMLValidationRule::ValidationRule"; //$NON-NLS-1$

+	

 	/** name of property severity of the stereotype ValidationRule */

-	public static final String VALIDATIONRULE_SEVERITY_ATT = "severity";

+	public static final String VALIDATIONRULE_SEVERITY_ATT = "severity"; //$NON-NLS-1$

+	

 	/** name of property mode of the stereotype ValidationRule */

-	public static final String VALIDATIONRULE_MODE_ATT = "mode";

+	public static final String VALIDATIONRULE_MODE_ATT = "mode"; //$NON-NLS-1$

+	

 	/** name of property isEnabledByDefault of the stereotype ValidationRule */

-	public static final String VALIDATIONRULE_ISENABLEDBYDEFAULT_ATT = "isEnabledByDefault";

+	public static final String VALIDATIONRULE_ISENABLEDBYDEFAULT_ATT = "isEnabledByDefault"; //$NON-NLS-1$

+	

 	/** name of property base_Constraint of the stereotype ValidationRule */

-	public static final String VALIDATIONRULE_BASE_CONSTRAINT_ATT = "base_Constraint";

+	public static final String VALIDATIONRULE_BASE_CONSTRAINT_ATT = "base_Constraint"; //$NON-NLS-1$

+	

 	/** name of property statusCode of the stereotype ValidationRule */

-	public static final String VALIDATIONRULE_STATUSCODE_ATT = "statusCode";

+	public static final String VALIDATIONRULE_STATUSCODE_ATT = "statusCode"; //$NON-NLS-1$

+	

 	/** name of property message of the stereotype ValidationRule */

-	public static final String VALIDATIONRULE_MESSAGE_ATT = "message";

+	public static final String VALIDATIONRULE_MESSAGE_ATT = "message"; //$NON-NLS-1$

+	

 	/** name of property description of the stereotype ValidationRule */

-	public static final String VALIDATIONRULE_DESCRIPTION_ATT = "description";

+	public static final String VALIDATIONRULE_DESCRIPTION_ATT = "description"; //$NON-NLS-1$

+	

 	/** name of property target of the stereotype ValidationRule */

-	public static final String VALIDATIONRULE_TARGET_ATT = "target";

+	public static final String VALIDATIONRULE_TARGET_ATT = "target"; //$NON-NLS-1$

+	

 	/** name of property class of the stereotype ValidationRule */

-	public static final String VALIDATIONRULE_CLASS_ATT = "class";

+	public static final String VALIDATIONRULE_CLASS_ATT = "class"; //$NON-NLS-1$

+	

 	/** name of property id of the stereotype ValidationRule */

-	public static final String VALIDATIONRULE_ID_ATT = "id";

+	public static final String VALIDATIONRULE_ID_ATT = "id"; //$NON-NLS-1$

+	

 	/** name of literal ERROR of the Enumeration Severity */

-	public static final String SEVERITY_ERROR_ENUM = "ERROR";

+	public static final String SEVERITY_ERROR_ENUM = "ERROR"; //$NON-NLS-1$

+	

 	/** name of literal WARNING of the Enumeration Severity */

-	public static final String SEVERITY_WARNING_ENUM = "WARNING";

+	public static final String SEVERITY_WARNING_ENUM = "WARNING"; //$NON-NLS-1$

+	

 	/** name of literal INFO of the Enumeration Severity */

-	public static final String SEVERITY_INFO_ENUM = "INFO";

+	public static final String SEVERITY_INFO_ENUM = "INFO"; //$NON-NLS-1$

+	

 	/** name of literal CANCEL of the Enumeration Severity */

-	public static final String SEVERITY_CANCEL_ENUM = "CANCEL";

+	public static final String SEVERITY_CANCEL_ENUM = "CANCEL"; //$NON-NLS-1$

+	

 	/** name of literal Batch of the Enumeration Mode */

-	public static final String MODE_BATCH_ENUM = "Batch";

+	public static final String MODE_BATCH_ENUM = "Batch"; //$NON-NLS-1$

 	/** name of literal Live of the Enumeration Mode */

-	public static final String MODE_LIVE_ENUM = "Live";

+	

+	public static final String MODE_LIVE_ENUM = "Live"; //$NON-NLS-1$

 }

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/META-INF/MANIFEST.MF b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/META-INF/MANIFEST.MF
index 00debd8ba95..0bfdae0cc03 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/META-INF/MANIFEST.MF
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

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

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.1.1",

- org.eclipse.papyrus.eastadl;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1",

- org.eclipse.papyrus.eastadl.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

+ org.eclipse.papyrus.eastadl;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.eastadl.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

  org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",

  org.eclipse.core.expressions;bundle-version="3.4.500",

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

- org.eclipse.papyrus.eastadl.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.eastadl.nattable.menu;bundle-version="1.0.1"

+ org.eclipse.papyrus.eastadl.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.eastadl.nattable.menu;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/pom.xml b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/pom.xml
index f4a18c211d5..7b29ab2484b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/pom.xml
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.eastadl.nattable.allocation.config</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/META-INF/MANIFEST.MF b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/META-INF/MANIFEST.MF
index 7df6f7883ca..45a402990c4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/META-INF/MANIFEST.MF
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.eastadl.nattable.allocation.config;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1"

+ org.eclipse.papyrus.eastadl.nattable.allocation.config;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/pom.xml b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/pom.xml
index cd4dbad8c34..75f39e769e2 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/pom.xml
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.eastadl.nattable.allocation</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/META-INF/MANIFEST.MF b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/META-INF/MANIFEST.MF
index 89c25983945..d41e8456ec7 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/META-INF/MANIFEST.MF
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/META-INF/MANIFEST.MF
@@ -1,28 +1,28 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

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

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

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

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

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

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

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

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

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

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

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

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

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

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

  org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",

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

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.1.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

  org.eclipse.core.expressions;bundle-version="3.4.500",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1",

- org.eclipse.papyrus.eastadl.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.eastadl.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.eastadl.nattable.menu.handlers

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/pom.xml b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/pom.xml
index d700c1c09fc..c9ef68a39a3 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/pom.xml
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.eastadl.nattable.menu</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/META-INF/MANIFEST.MF b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/META-INF/MANIFEST.MF
index 6c9e5380d52..b37ed9cc01b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/META-INF/MANIFEST.MF
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/META-INF/MANIFEST.MF
@@ -1,28 +1,28 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.eastadl;bundle-version="1.0.1",

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

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

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

+ org.eclipse.papyrus.eastadl;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.1.0",

  org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",

  org.eclipse.uml2.uml;bundle-version="4.1.1",

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

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

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

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

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

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

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

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

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

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

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

- org.eclipse.papyrus.eastadl.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1"

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

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

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

+ org.eclipse.papyrus.eastadl.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.eastadl.nattable.manager.axis

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/pom.xml b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/pom.xml
index 932554463b3..01df7467161 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/pom.xml
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.eastadl.nattable</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/META-INF/MANIFEST.MF b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/META-INF/MANIFEST.MF
index 892596ba4ce..e3ebc7d8ce7 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/META-INF/MANIFEST.MF
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.eastadl;bundle-version="1.0.1",

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

+ org.eclipse.papyrus.eastadl;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

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

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

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

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

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

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

  org.eclipse.uml2.uml.profile.standard;bundle-version="1.0.0",

  org.eclipse.core.expressions;bundle-version="3.4.500",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

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

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.eastadl.service.types,

  org.eclipse.papyrus.eastadl.service.types.elements,

  org.eclipse.papyrus.eastadl.service.types.filter,

@@ -19,7 +19,7 @@ Export-Package: org.eclipse.papyrus.eastadl.service.types,
  org.eclipse.papyrus.eastadl.service.types.menu

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/pom.xml b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/pom.xml
index 60dfcda06ab..617fc12d6b0 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/pom.xml
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.eastadl.service.types</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/META-INF/MANIFEST.MF b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/META-INF/MANIFEST.MF
index 1c3b1442612..256071c5f07 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/META-INF/MANIFEST.MF
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/META-INF/MANIFEST.MF
@@ -104,16 +104,16 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,

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

  org.eclipse.uml2.types;visibility:=reexport,

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

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

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

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

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

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.sysml;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml;bundle-version="1.1.0",

  org.eclipse.uml2.uml.profile.standard;bundle-version="1.0.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/pom.xml b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/pom.xml
index a357be51876..dce5a92242b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/pom.xml
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.eastadl</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/META-INF/MANIFEST.MF b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/META-INF/MANIFEST.MF
index d828750fcea..e31896cb431 100644
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/META-INF/MANIFEST.MF
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/META-INF/MANIFEST.MF
@@ -9,14 +9,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.codegen.ecore,

  org.eclipse.acceleo.engine,

  org.eclipse.emf.eef.codegen.ecore;bundle-version="1.2.0",

- org.eclipse.papyrus.facade;bundle-version="1.0.1",

+ org.eclipse.papyrus.facade;bundle-version="1.1.0",

  org.eclipse.uml2.codegen.ecore;bundle-version="1.9.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.facade.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.facade.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: %vendorName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.facade.codegen.FacadeCodeGenPlug

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/META-INF/MANIFEST.MF b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/META-INF/MANIFEST.MF
index e186f09171b..fff9b59e0e8 100644
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/META-INF/MANIFEST.MF
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/META-INF/MANIFEST.MF
@@ -5,13 +5,13 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.editors,

  org.eclipse.uml2;bundle-version="3.2.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

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

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

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

- org.eclipse.papyrus.facade.utils;bundle-version="1.0.1",

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

+ org.eclipse.papyrus.facade.editor;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.facade.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0"

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: FacadeSepcificEditor

 Bundle-Activator: org.eclipse.papyrus.facadeSpecificEditor.FacadeDefin

  itionEditorActivator

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/META-INF/MANIFEST.MF b/extraplugins/facade/org.eclipse.papyrus.facade.edit/META-INF/MANIFEST.MF
index 9f957523c05..daaf96c50a8 100644
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/META-INF/MANIFEST.MF
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0

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

- org.eclipse.papyrus.facade;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.facade;bundle-version="1.1.0";visibility:=reexport,

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

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

  org.eclipse.emf.ecore.edit;visibility:=reexport,

@@ -14,7 +14,7 @@ Export-Package: org.eclipse.papyrus.facade.extensiondefinition.provider,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.facade.provider.FacadeEditPlugin

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/META-INF/MANIFEST.MF b/extraplugins/facade/org.eclipse.papyrus.facade.editor/META-INF/MANIFEST.MF
index 74be0e80596..ac0aa248c89 100644
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/META-INF/MANIFEST.MF
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

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

  org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.facade.edit;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.facade.edit;bundle-version="1.1.0";visibility:=reexport,

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

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

  org.eclipse.ui.ide;visibility:=reexport,

@@ -14,7 +14,7 @@ Export-Package: org.eclipse.papyrus.facade.extensiondefinition.presentation,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.facade.presentation.FacadeEditor

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/META-INF/MANIFEST.MF b/extraplugins/facade/org.eclipse.papyrus.facade.utils/META-INF/MANIFEST.MF
index 0c5783a01cb..9d21c8593e0 100644
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/META-INF/MANIFEST.MF
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.utils/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.uml2.uml;bundle-version="4.1.0",

  org.eclipse.emf.common

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Utils

 Bundle-Activator: org.eclipse.papyrus.facade.utils.FacadeUtilsActivato

  r

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/META-INF/MANIFEST.MF b/extraplugins/facade/org.eclipse.papyrus.facade/META-INF/MANIFEST.MF
index 36bdfd46b45..0c4e7722d0b 100644
--- a/extraplugins/facade/org.eclipse.papyrus.facade/META-INF/MANIFEST.MF
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/META-INF/MANIFEST.MF
@@ -18,13 +18,13 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.uml2.uml;bundle-version="4.1.0",

  org.eclipse.uml2.types;visibility:=reexport,

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

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

- org.eclipse.papyrus.infra.onefile;bundle-version="1.0.1",

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

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.onefile;bundle-version="1.1.0",

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

 Bundle-Vendor: %vendorName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.facade.FacadeActivator

diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/META-INF/MANIFEST.MF b/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/META-INF/MANIFEST.MF
index c141f7bd950..0f0101481d2 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/META-INF/MANIFEST.MF
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.uml2.uml,

  org.eclipse.m2m.qvt.oml,

- org.eclipse.papyrus.java.generator.metamodel.jdt;bundle-version="1.0.1",

+ org.eclipse.papyrus.java.generator.metamodel.jdt;bundle-version="1.1.0",

  org.eclipse.core.runtime,

- org.eclipse.papyrus.java.generator.transfo.umltojdt;bundle-version="1.0.1",

+ org.eclipse.papyrus.java.generator.transfo.umltojdt;bundle-version="1.1.0",

  org.eclipse.jdt.core,

  org.eclipse.jface.text,

  org.eclipse.jdt.launching,

@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.uml2.uml,
 Export-Package: org.eclipse.papyrus.java.generator.jdtsynchronizer

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/pom.xml b/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/pom.xml
index 49bd9e7f8b1..046096287fb 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/pom.xml
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.generator.jdtsynchronizer</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/META-INF/MANIFEST.MF b/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/META-INF/MANIFEST.MF
index ef69af12d9d..0d2cf02277f 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/META-INF/MANIFEST.MF
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.java.generator.metamodel.jdt.generatoroptionsmm.provider,

  org.eclipse.papyrus.java.generator.metamodel.jdt.jdtmm.provider

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

- org.eclipse.papyrus.java.generator.metamodel.jdt;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.java.generator.metamodel.jdt;bundle-version="1.1.0";visibility:=reexport,

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

  org.eclipse.uml2.types;visibility:=reexport,

  org.eclipse.uml2.common.edit;visibility:=reexport

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/pom.xml b/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/pom.xml
index a037f227260..18b4796a3a7 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/pom.xml
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.generator.metamodel.jdt.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/META-INF/MANIFEST.MF b/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/META-INF/MANIFEST.MF
index b8de5c2919c..3b707d3540d 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/META-INF/MANIFEST.MF
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/META-INF/MANIFEST.MF
@@ -3,14 +3,14 @@ Export-Package: org.eclipse.papyrus.java.generator.metamodel.jdt.gener
  atoroptionsmm.presentation

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

  org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.java.generator.metamodel.jdt.edit;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.java.generator.metamodel.jdt.edit;bundle-version="1.1.0";visibility:=reexport,

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

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

  org.eclipse.ui.ide;visibility:=reexport

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/pom.xml b/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/pom.xml
index 4d1b708ec54..91ab70955a0 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/pom.xml
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.generator.metamodel.jdt.editor</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/META-INF/MANIFEST.MF b/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/META-INF/MANIFEST.MF
index a839fb4f725..a0d81333999 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/META-INF/MANIFEST.MF
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Export-Package: org.eclipse.papyrus.java.generator.metamodel.jdt.generatoroption
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/pom.xml b/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/pom.xml
index 51d36c8515f..2ecbcf0628b 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/pom.xml
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.generator.metamodel.jdt</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/META-INF/MANIFEST.MF b/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/META-INF/MANIFEST.MF
index 43dcc4dcc74..727ceefe142 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/META-INF/MANIFEST.MF
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.java.generator.transfo.umltojdt

 Require-Bundle: org.eclipse.core.runtime

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/pom.xml b/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/pom.xml
index d95d0153e5a..fe199a947f9 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/pom.xml
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.generator.transfo.umltojdt</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/META-INF/MANIFEST.MF b/extraplugins/java/org.eclipse.papyrus.java.generator.ui/META-INF/MANIFEST.MF
index acaeb533aef..aebd3002390 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.ui/META-INF/MANIFEST.MF
@@ -6,13 +6,13 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.uml2.uml,

  org.eclipse.ui.ide,

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

- org.eclipse.papyrus.java.generator.metamodel.jdt;bundle-version="1.0.1",

+ org.eclipse.papyrus.java.generator.metamodel.jdt;bundle-version="1.1.0",

  org.eclipse.jdt.core,

  org.eclipse.jdt.ui,

- org.eclipse.papyrus.java.generator.jdtsynchronizer;bundle-version="1.0.1"

+ org.eclipse.papyrus.java.generator.jdtsynchronizer;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.java.generator.ui.Activator

diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/pom.xml b/extraplugins/java/org.eclipse.papyrus.java.generator.ui/pom.xml
index 2b507754fcc..a8772237ada 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/pom.xml
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.generator.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/META-INF/MANIFEST.MF b/extraplugins/java/org.eclipse.papyrus.java.profile.edit/META-INF/MANIFEST.MF
index 3bd86d07e0d..ebb3b314c98 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/META-INF/MANIFEST.MF
+++ b/extraplugins/java/org.eclipse.papyrus.java.profile.edit/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.java.profile;bundle-version="1.0.1";visibility:=reexport,

+Require-Bundle: org.eclipse.papyrus.java.profile;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.uml2.uml.edit;visibility:=reexport,

  org.eclipse.core.runtime

 Export-Package: org.eclipse.papyrus.java.profile.java.provider

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.java.profile.java.provider.JavaE

diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/pom.xml b/extraplugins/java/org.eclipse.papyrus.java.profile.edit/pom.xml
index 2601a18c132..33e5444f74f 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.edit/pom.xml
+++ b/extraplugins/java/org.eclipse.papyrus.java.profile.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.profile.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/META-INF/MANIFEST.MF b/extraplugins/java/org.eclipse.papyrus.java.profile.editor/META-INF/MANIFEST.MF
index 0a1c452ae6a..af810229541 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/META-INF/MANIFEST.MF
+++ b/extraplugins/java/org.eclipse.papyrus.java.profile.editor/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0

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

- org.eclipse.papyrus.java.profile.edit;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.java.profile.edit;bundle-version="1.1.0";visibility:=reexport,

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

  org.eclipse.ui.ide;visibility:=reexport,

  org.eclipse.core.resources

@@ -8,7 +8,7 @@ Export-Package: org.eclipse.papyrus.java.profile.java.presentation
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.java.profile.java.presentation.J

diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/pom.xml b/extraplugins/java/org.eclipse.papyrus.java.profile.editor/pom.xml
index 5ba2c6d38ba..3c0cd438356 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile.editor/pom.xml
+++ b/extraplugins/java/org.eclipse.papyrus.java.profile.editor/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.profile.editor</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/META-INF/MANIFEST.MF b/extraplugins/java/org.eclipse.papyrus.java.profile/META-INF/MANIFEST.MF
index 6957d9ea94a..1fcf9688b16 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/META-INF/MANIFEST.MF
+++ b/extraplugins/java/org.eclipse.papyrus.java.profile/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Export-Package: org.eclipse.papyrus.java.profile.java,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/java/org.eclipse.papyrus.java.profile/pom.xml b/extraplugins/java/org.eclipse.papyrus.java.profile/pom.xml
index c48c36b09c2..d0c0fa935d0 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.profile/pom.xml
+++ b/extraplugins/java/org.eclipse.papyrus.java.profile/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.profile</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/META-INF/MANIFEST.MF b/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/META-INF/MANIFEST.MF
index 3bd6a784704..105335420fe 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/META-INF/MANIFEST.MF
@@ -3,21 +3,21 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.transaction;bundle-version="1.2.0",

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

  org.eclipse.jdt.core;bundle-version="3.4.0",

- org.eclipse.papyrus.java.reverse;bundle-version="1.0.1",

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

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.gmf.runtime.diagram.core

+ org.eclipse.papyrus.java.reverse;bundle-version="1.1.0",

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

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.gmf.runtime.diagram.core,

+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.java.reverse.ui.Activator

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.java.reverse.ui;singleton:=tr

  ue

-Import-Package: org.eclipse.gmf.runtime.notation,

- org.eclipse.papyrus.infra.gmfdiag.dnd.strategy,

- org.eclipse.papyrus.uml.diagram.common.util

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/pom.xml b/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/pom.xml
index 82525c282d6..c34d918a638 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/pom.xml
+++ b/extraplugins/java/org.eclipse.papyrus.java.reverse.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.reverse.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/META-INF/MANIFEST.MF b/extraplugins/java/org.eclipse.papyrus.java.reverse/META-INF/MANIFEST.MF
index 01ccb818ad8..6a498ff9d63 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/META-INF/MANIFEST.MF
+++ b/extraplugins/java/org.eclipse.papyrus.java.reverse/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Export-Package: japa.parser,
  org.eclipse.papyrus.java.reverse.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.java.reverse.Activator

diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/pom.xml b/extraplugins/java/org.eclipse.papyrus.java.reverse/pom.xml
index 1a4dabcc46b..28204fd29e0 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/pom.xml
+++ b/extraplugins/java/org.eclipse.papyrus.java.reverse/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.reverse</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/java/org.eclipse.papyrus.java.template/META-INF/MANIFEST.MF b/extraplugins/java/org.eclipse.papyrus.java.template/META-INF/MANIFEST.MF
index c00d068475e..71b02d5f5e7 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.template/META-INF/MANIFEST.MF
+++ b/extraplugins/java/org.eclipse.papyrus.java.template/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui

 Bundle-Vendor: Atos Origin

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Java Template

 Bundle-Activator: org.eclipse.papyrus.java.template.Activator

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/META-INF/MANIFEST.MF b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/META-INF/MANIFEST.MF
index ecf8671858b..83339f8a482 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.layers.dev.ui.Activator

diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.integrationtests/META-INF/MANIFEST.MF b/extraplugins/layers/org.eclipse.papyrus.layers.integrationtests/META-INF/MANIFEST.MF
index 057047229f9..a5a2014cebf 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.integrationtests/META-INF/MANIFEST.MF
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.integrationtests/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
 Manifest-Version: 1.0

 Export-Package: org.eclipse.papyrus.layers.integrationtests

-Require-Bundle: org.eclipse.papyrus.layers.runtime;bundle-version="1.0.1",

- org.eclipse.papyrus.layers.stackmodel;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.layers.runtime;bundle-version="1.1.0",

+ org.eclipse.papyrus.layers.stackmodel;bundle-version="1.1.0",

  org.junit,

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

  org.eclipse.emf.common;bundle-version="2.9.1",

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

+ org.eclipse.papyrus.integrationtests.editor;bundle-version="1.1.0",

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

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

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

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

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.layers.integrationtests

diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/META-INF/MANIFEST.MF b/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/META-INF/MANIFEST.MF
index 7651d2089e7..02ee56daabd 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/META-INF/MANIFEST.MF
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui,
 Export-Package: org.eclipse.papyrus.layers.notationmodel.edit

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/pom.xml b/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/pom.xml
index cba0cfbe251..a26332d80bb 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/pom.xml
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.layers.notationmodel.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.runtime/META-INF/MANIFEST.MF b/extraplugins/layers/org.eclipse.papyrus.layers.runtime/META-INF/MANIFEST.MF
index a41a8d8a84c..b45f55e16a0 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.runtime/META-INF/MANIFEST.MF
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.runtime/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
 Manifest-Version: 1.0

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

- org.eclipse.papyrus.layers.stackmodel;bundle-version="1.0.1",

+ org.eclipse.papyrus.layers.stackmodel;bundle-version="1.1.0",

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

  org.junit,

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

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

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

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

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

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

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.layers.runtime,

  org.eclipse.papyrus.layers.runtime.model,

  org.eclipse.papyrus.layers.runtime.service,

  org.eclipse.papyrus.layers.runtime.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.runtime/pom.xml b/extraplugins/layers/org.eclipse.papyrus.layers.runtime/pom.xml
index 838d1bdaa73..c385ca0bd99 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.runtime/pom.xml
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.runtime/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.layers.runtime</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram/META-INF/MANIFEST.MF b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram/META-INF/MANIFEST.MF
index 4a5eb655909..5c91adcfade 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram/META-INF/MANIFEST.MF
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

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

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

- org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.0.1",

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

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

+ org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.1.0",

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

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

- org.eclipse.papyrus.layers.stackmodel.editor;bundle-version="1.0.1",

+ org.eclipse.papyrus.layers.stackmodel.editor;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

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

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.core.expressions,

  org.eclipse.gmf.runtime.diagram.ui.resources.editor,

- org.eclipse.papyrus.layers.runtime;bundle-version="1.0.1",

+ org.eclipse.papyrus.layers.runtime;bundle-version="1.1.0",

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

  org.eclipse.ui.ide;bundle-version="3.10.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram/pom.xml b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram/pom.xml
index b283ecbeb5d..4e7fa8d5e7e 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram/pom.xml
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.layers.stackmodel.diagram</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit/META-INF/MANIFEST.MF b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit/META-INF/MANIFEST.MF
index ba9f63bbcd5..1d022b8f7de 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit/META-INF/MANIFEST.MF
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Export-Package: org.eclipse.papyrus.layers.configmodel.layersconfig.provider,
  org.eclipse.papyrus.layers.stackmodel.layers.provider,

  org.eclipse.papyrus.layers.stackmodel.layers.provider.custom

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

- org.eclipse.papyrus.layers.stackmodel;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.layers.stackmodel;bundle-version="1.1.0";visibility:=reexport,

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

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

  org.eclipse.emf.ecore.edit;visibility:=reexport,

@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit/pom.xml b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit/pom.xml
index d5dd0d16651..4bd4bbb2b62 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit/pom.xml
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.layers.stackmodel.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/META-INF/MANIFEST.MF b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/META-INF/MANIFEST.MF
index 90b8bf943b8..16e42c62d54 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/META-INF/MANIFEST.MF
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Export-Package: org.eclipse.papyrus.layers.configmodel.layersconfig.presentation
  org.eclipse.papyrus.layers.stackmodel.layers.presentation

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

  org.eclipse.core.resources,

- org.eclipse.papyrus.layers.stackmodel.edit;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.layers.stackmodel.edit;bundle-version="1.1.0";visibility:=reexport,

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

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

  org.eclipse.ui.ide,

@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/pom.xml b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/pom.xml
index 48eccaffece..24777691b9d 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/pom.xml
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.layers.stackmodel.editor</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.tests/META-INF/MANIFEST.MF b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.tests/META-INF/MANIFEST.MF
index 652a4cc3fc5..e4e9a386eee 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.tests/META-INF/MANIFEST.MF
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Export-Package: org.eclipse.papyrus.layers.stackmodel.layers.tests

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

- org.eclipse.papyrus.layers.stackmodel;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.layers.stackmodel;bundle-version="1.1.0";visibility:=reexport,

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

  org.eclipse.gmf.runtime.notation;visibility:=reexport,

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

@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/META-INF/MANIFEST.MF b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/META-INF/MANIFEST.MF
index 1f3735019d4..f36fd81a82e 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/META-INF/MANIFEST.MF
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ocl.ecore;bundle-version="3.3.0",

  org.eclipse.emf.query.ocl;bundle-version="2.0.0",

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

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.layers.configmodel.layersconfig,

  org.eclipse.papyrus.layers.configmodel.layersconfig.impl,

  org.eclipse.papyrus.layers.configmodel.layersconfig.util,

@@ -21,7 +21,7 @@ Export-Package: org.eclipse.papyrus.layers.configmodel.layersconfig,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/pom.xml b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/pom.xml
index 2dea4f4cc5d..110ddb0a6f7 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/pom.xml
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.layers.stackmodel</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.ui/META-INF/MANIFEST.MF b/extraplugins/layers/org.eclipse.papyrus.layers.ui/META-INF/MANIFEST.MF
index f16af68c5f2..547201023f6 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.ui/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

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

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.eclipse.ui.forms;bundle-version="3.5.200",

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

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

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

- org.eclipse.papyrus.layers.runtime;bundle-version="1.0.1",

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

+ org.eclipse.papyrus.layers.runtime;bundle-version="1.1.0",

  org.eclipse.core.databinding,

  org.eclipse.core.databinding.beans,

  org.eclipse.core.databinding.observable,

@@ -18,23 +18,23 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface.databinding;bundle-version="1.6.200",

  org.eclipse.gmf.runtime.diagram.ui.properties,

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

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

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

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.7.0",

  org.eclipse.core.expressions;bundle-version="3.4.500",

- org.eclipse.papyrus.layers.stackmodel;bundle-version="1.0.1",

- org.eclipse.papyrus.layers.notationmodel.edit;bundle-version="1.0.1",

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

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

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

+ org.eclipse.papyrus.layers.stackmodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.layers.notationmodel.edit;bundle-version="1.1.0",

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

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

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

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

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

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

- org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="1.0.1",

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

- org.eclipse.papyrus.layers.stackmodel.edit;bundle-version="1.0.1"

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

+ org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.layers.stackmodel.edit;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.ui/pom.xml b/extraplugins/layers/org.eclipse.papyrus.layers.ui/pom.xml
index 9264bad6be8..fbd69b3212b 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.ui/pom.xml
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.layers.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/META-INF/MANIFEST.MF
index 812426b784c..ab8ea3cc9cb 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.zest.layouts,

- org.eclipse.papyrus.layout;bundle-version="1.0.1"

+ org.eclipse.papyrus.layout;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/META-INF/MANIFEST.MF
index 07c972b3613..4b037f285c2 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.zest.layouts,

- org.eclipse.papyrus.layout;bundle-version="1.0.1"

+ org.eclipse.papyrus.layout;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/META-INF/MANIFEST.MF
index 8cc2b09fcf5..771a2194ba3 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.layout;bundle-version="1.0.1",

+ org.eclipse.papyrus.layout;bundle-version="1.1.0",

  org.eclipse.zest.layouts

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/META-INF/MANIFEST.MF
index 6af0214f83f..f1523f5a625 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.layout;bundle-version="1.0.1",

+ org.eclipse.papyrus.layout;bundle-version="1.1.0",

  org.eclipse.zest.layouts

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/META-INF/MANIFEST.MF
index f7b49b262f6..e55ac53a670 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.zest.layouts,

- org.eclipse.papyrus.layout;bundle-version="1.0.1"

+ org.eclipse.papyrus.layout;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/META-INF/MANIFEST.MF
index bd8a4d49769..4fbba1c2151 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.zest.layouts,

- org.eclipse.papyrus.layout;bundle-version="1.0.1"

+ org.eclipse.papyrus.layout;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/META-INF/MANIFEST.MF
index 2055f6823d9..6147e3a3728 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.layout;bundle-version="1.0.1",

+ org.eclipse.papyrus.layout;bundle-version="1.1.0",

  org.eclipse.zest.layouts

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/META-INF/MANIFEST.MF
index 43307695289..1a664f5071f 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.zest.layouts,

- org.eclipse.papyrus.layout;bundle-version="1.0.1"

+ org.eclipse.papyrus.layout;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/META-INF/MANIFEST.MF
index cabf1253202..ec973f854b8 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.layout;bundle-version="1.0.1",

+ org.eclipse.papyrus.layout;bundle-version="1.1.0",

  org.eclipse.zest.layouts

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.subeditor.gmf/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout.subeditor.gmf/META-INF/MANIFEST.MF
index d8186cb8a37..9165e4c9bd2 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.subeditor.gmf/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.subeditor.gmf/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui,

- org.eclipse.papyrus.layout;bundle-version="1.0.1"

+ org.eclipse.papyrus.layout;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/layout/org.eclipse.papyrus.layout/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout/META-INF/MANIFEST.MF
index d0bcc69d192..c187ec8d71a 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.expressions

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

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

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/META-INF/MANIFEST.MF b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/META-INF/MANIFEST.MF
index 0bb62e865d0..f7041c15b58 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/META-INF/MANIFEST.MF
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/META-INF/MANIFEST.MF
@@ -115,15 +115,15 @@ Export-Package: org.eclipse.papyrus.MARTE,
 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore,

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

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="3.1.0",

  org.eclipse.uml2.types;visibility:=reexport,

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

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

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/pom.xml b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/pom.xml
index 47c163282a0..66cc0cb619c 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/pom.xml
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.marte.static.profile</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui/META-INF/MANIFEST.MF b/extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui/META-INF/MANIFEST.MF
index f8ae455e710..580e8038e39 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.marte.vsl;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.marte.vsl;bundle-version="1.1.0",

  org.eclipse.xtext.ui,

  org.eclipse.ui.editors;bundle-version="3.5.0",

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

@@ -8,15 +8,15 @@ Require-Bundle: org.eclipse.papyrus.marte.vsl;bundle-version="1.0.1",
  org.eclipse.xtext.builder,

  org.antlr.runtime,

  org.eclipse.uml2.uml;bundle-version="3.1.0",

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

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

  org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.marte.vsl.ui.contentassist,

  org.eclipse.papyrus.marte.vsl.ui.contentassist.antlr

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.marte.vsl.ui.internal.VSLActivat

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui/pom.xml b/extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui/pom.xml
index 642bd054db6..9089b4ea258 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui/pom.xml
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.marte.vsl.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.vsl/META-INF/MANIFEST.MF b/extraplugins/marte/org.eclipse.papyrus.marte.vsl/META-INF/MANIFEST.MF
index 1a3eb033c96..bd22ed86df5 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.vsl/META-INF/MANIFEST.MF
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.vsl/META-INF/MANIFEST.MF
@@ -31,7 +31,7 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

  org.apache.log4j;bundle-version="1.2.15"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Import-Package: org.apache.log4j

 Bundle-SymbolicName: org.eclipse.papyrus.marte.vsl;singleton:=true

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.vsl/pom.xml b/extraplugins/marte/org.eclipse.papyrus.marte.vsl/pom.xml
index cfafd87025d..9efcb01e4cf 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.vsl/pom.xml
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.vsl/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.marte.vsl</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/marte/org.eclipse.papyrus.parsers/META-INF/MANIFEST.MF b/extraplugins/marte/org.eclipse.papyrus.parsers/META-INF/MANIFEST.MF
index 52f40d5110c..eab0f36e5b7 100644
--- a/extraplugins/marte/org.eclipse.papyrus.parsers/META-INF/MANIFEST.MF
+++ b/extraplugins/marte/org.eclipse.papyrus.parsers/META-INF/MANIFEST.MF
@@ -15,12 +15,12 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.uml2.uml,

  org.eclipse.jface.text,

  org.eclipse.ui.editors,

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

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

  org.antlr.runtime;bundle-version="[3.0.0,4.0.0)"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.parsers.PapyrusParsersPlugin

diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/META-INF/MANIFEST.MF b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/META-INF/MANIFEST.MF
index 68b87bfee51..c36672e7a13 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/META-INF/MANIFEST.MF
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.properties;bundle-version="1.0.1"

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.properties;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Marte properties (Incubation)

 Bundle-Activator: org.eclipse.papyrus.marte.properties.Activator

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/pom.xml b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/pom.xml
index 88f86128f56..d1c0c7694da 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/pom.xml
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.marte.properties</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/META-INF/MANIFEST.MF b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/META-INF/MANIFEST.MF
index f755772e15f..0ef131ebd38 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-ClassPath: .
 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext;bundle-version="1.0.1";visibility:=reexport,

+Require-Bundle: org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.xtext.ui,

  org.eclipse.ui.editors;bundle-version="3.5.0",

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

@@ -14,18 +14,18 @@ Require-Bundle: org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext;bundl
  org.eclipse.ui,

  org.eclipse.xtext.builder,

  org.antlr.runtime,

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

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

  org.eclipse.uml2.uml;bundle-version="3.1.0",

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

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

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

- org.eclipse.papyrus.marte.vsl;bundle-version="1.0.1",

- org.eclipse.papyrus.marte.vsl.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.1",

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

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

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

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

+ org.eclipse.papyrus.marte.vsl;bundle-version="1.1.0",

+ org.eclipse.papyrus.marte.vsl.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.marte.textedit.constraintwithvsl

  .xtext.ui.internal.ConstraintWithVSLlActivator

diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/pom.xml b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/pom.xml
index faba0f3bd7d..55d665cda0e 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/pom.xml
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/META-INF/MANIFEST.MF b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/META-INF/MANIFEST.MF
index 7fc912745ac..fc849b3626c 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/META-INF/MANIFEST.MF
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/META-INF/MANIFEST.MF
@@ -25,10 +25,10 @@ Require-Bundle: org.eclipse.xtext,
  org.antlr.runtime,

  org.eclipse.uml2.uml;bundle-version="4.0.0",

  org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

- org.eclipse.papyrus.marte.vsl;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.marte.vsl;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Import-Package: org.apache.log4j

 Bundle-SymbolicName: org.eclipse.papyrus.marte.textedit.constraintwith

diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/pom.xml b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/pom.xml
index 56d39600e59..e17b0116650 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/pom.xml
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/META-INF/MANIFEST.MF b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/META-INF/MANIFEST.MF
index 8524153fd4f..5a1c6a368d9 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-ClassPath: .
 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext;bundle-version="1.0.1";visibility:=reexport,

+Require-Bundle: org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.xtext.ui,

  org.eclipse.ui.editors;bundle-version="3.5.0",

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

@@ -16,15 +16,15 @@ Require-Bundle: org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.
  org.antlr.runtime,

  org.eclipse.uml2.uml;bundle-version="3.1.0",

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

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

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

  org.eclipse.core.expressions;bundle-version="3.4.200",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

- org.eclipse.papyrus.marte.vsl;bundle-version="1.0.1",

- org.eclipse.papyrus.marte.vsl.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.1",

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

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

+ org.eclipse.papyrus.marte.vsl;bundle-version="1.1.0",

+ org.eclipse.papyrus.marte.vsl.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.marte.textedit.stereotypeapplica

  tionwithvsl.xtext.ui.internal.StereotypeApplicationWithVSLActivator

diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/pom.xml b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/pom.xml
index 52a3add6ab4..8f67f45b0f2 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/pom.xml
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext/META-INF/MANIFEST.MF b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext/META-INF/MANIFEST.MF
index 177d9378019..fa8c257c206 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext/META-INF/MANIFEST.MF
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext/META-INF/MANIFEST.MF
@@ -27,10 +27,10 @@ Require-Bundle: org.eclipse.xtext,
  org.antlr.runtime,

  org.eclipse.uml2.uml;bundle-version="4.0.0",

  org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

- org.eclipse.papyrus.marte.vsl;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.marte.vsl;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Import-Package: org.apache.log4j

 Bundle-SymbolicName: org.eclipse.papyrus.marte.textedit.stereotypeappl

diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext/pom.xml b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext/pom.xml
index c4e13f53337..92c964dc771 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext/pom.xml
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/.classpath b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/.classpath
new file mode 100644
index 00000000000..ad32c83a788
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/.project b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/.project
new file mode 100644
index 00000000000..103c3fec55c
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.m2m.qvto</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/.settings/org.eclipse.jdt.core.prefs b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..c537b63063c
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/META-INF/MANIFEST.MF b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..bdafead1f59
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.ui,

+ org.eclipse.core.runtime,

+ org.eclipse.m2m.qvt.oml;bundle-version="3.4.0",

+ org.eclipse.m2m.qvt.oml.runtime,

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

+Export-Package: org.eclipse.papyrus.m2m.qvto

+Bundle-Vendor: Eclipse Modeling Project

+Bundle-ActivationPolicy: lazy

+Bundle-Version: 1.1.0.qualifier

+Bundle-Name: Qvto Library

+Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.m2m.qvto.Activator

+Bundle-SymbolicName: org.eclipse.papyrus.m2m.qvto;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+

diff --git a/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/about.html b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/about.html
new file mode 100644
index 00000000000..d35d5aed64c
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/build.properties b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/build.properties
new file mode 100644
index 00000000000..b5d9b96bcbb
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/build.properties
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               libraries/,\
+               about.html
+src.includes = about.html
diff --git a/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/libraries/EclipseUI.qvto b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/libraries/EclipseUI.qvto
new file mode 100644
index 00000000000..91847104ec7
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/libraries/EclipseUI.qvto
@@ -0,0 +1,35 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+library EclipseUI;
+
+/** The IStatus#INFO code */
+query info() : Integer {
+	return 1
+}
+
+/** The IStatus#WARNING code */
+query warning() : Integer{
+	return 2
+}
+
+/** The IStatus#ERROR code */
+query error() : Integer {
+	return 4
+}
+
+query warning(message: String){
+	log(message, null, warning())
+}
+
+query error(message: String){
+	log(message, null, error())
+}
diff --git a/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/plugin.xml b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/plugin.xml
new file mode 100644
index 00000000000..d58f53e2fc6
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/plugin.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.m2m.qvt.oml.javaBlackboxUnits">
+      <unit
+            description="Provides an Eclipse UI/QVTo integration for transformations"
+            name="UI"
+            namespace="org.eclipse.papyrus.m2m.qvto">
+         <library
+               class="org.eclipse.papyrus.m2m.qvto.TransformationUI">
+            <metamodel
+                  nsURI="http://www.eclipse.org/emf/2002/Ecore">
+            </metamodel>
+         </library>
+      </unit>
+      <unit
+            description="Provides some EMF Resource manipulation helpers"
+            name="EMFResource"
+            namespace="org.eclipse.papyrus.m2m.qvto">
+         <library
+               class="org.eclipse.papyrus.m2m.qvto.EMFResourceUtils">
+            <metamodel
+                  nsURI="http://www.eclipse.org/emf/2002/Ecore">
+            </metamodel>
+         </library>
+      </unit>
+      <unit
+            description="Java helpers to manipulate Notation DataTypes (Gradient, Bendpoints...)"
+            name="NotationTypes"
+            namespace="org.eclipse.papyrus.m2m.qvto">
+         <library
+               class="org.eclipse.papyrus.m2m.qvto.NotationTypes">
+            <metamodel
+                  nsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">
+            </metamodel>
+         </library>
+      </unit>
+      <unit
+            description="Provides an access to Config Properties"
+            name="Properties"
+            namespace="org.eclipse.papyrus.m2m.qvto">
+         <library
+               class="org.eclipse.papyrus.m2m.qvto.PropertiesUtil">
+            <metamodel
+                  nsURI="http://www.eclipse.org/emf/2002/Ecore">
+            </metamodel>
+         </library>
+      </unit>
+   </extension>
+   <extension
+         point="org.eclipse.m2m.qvt.oml.runtime.qvtTransformation">
+      <library
+            file="libraries/EclipseUI.qvto"
+            id="libraries.EclipseUI">
+      </library>
+   </extension>
+
+</plugin>
diff --git a/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/pom.xml b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/pom.xml
new file mode 100644
index 00000000000..ffbcaa644e3
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>1.1.0-SNAPSHOT</version>
+		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.m2m.qvto</artifactId>
+	<groupId>org.eclipse.papyrus</groupId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/src/org/eclipse/papyrus/m2m/qvto/Activator.java b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/src/org/eclipse/papyrus/m2m/qvto/Activator.java
new file mode 100644
index 00000000000..17b30dcd26e
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/src/org/eclipse/papyrus/m2m/qvto/Activator.java
@@ -0,0 +1,65 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.m2m.qvto;
+
+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.m2m.qvto"; //$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/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/src/org/eclipse/papyrus/m2m/qvto/EMFResourceUtils.java b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/src/org/eclipse/papyrus/m2m/qvto/EMFResourceUtils.java
new file mode 100644
index 00000000000..75203016ee4
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/src/org/eclipse/papyrus/m2m/qvto/EMFResourceUtils.java
@@ -0,0 +1,29 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.m2m.qvto;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.m2m.qvt.oml.blackbox.java.Operation;
+import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;
+
+
+public class EMFResourceUtils {
+
+	@Operation(contextual = true, kind = Kind.QUERY)
+	public String getURI(EObject target) {
+		if(target == null) {
+			return "";
+		}
+		return EcoreUtil.getURI(target).toString();
+	}
+}
diff --git a/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/src/org/eclipse/papyrus/m2m/qvto/NotationTypes.java b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/src/org/eclipse/papyrus/m2m/qvto/NotationTypes.java
new file mode 100644
index 00000000000..c3cb40b3f6e
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/src/org/eclipse/papyrus/m2m/qvto/NotationTypes.java
@@ -0,0 +1,64 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.m2m.qvto;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.notation.RelativeBendpoints;
+import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
+import org.eclipse.m2m.qvt.oml.blackbox.java.Operation;
+import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;
+
+
+public class NotationTypes {
+
+	@Operation(contextual = true, kind = Kind.HELPER)
+	public static void copyBendpoints(final RelativeBendpoints source, RelativeBendpoints target, boolean convertToPixels) {
+		List<RelativeBendpoint> result = new LinkedList<RelativeBendpoint>();
+
+		for(Object point : source.getPoints()) {
+			if(point instanceof RelativeBendpoint) {
+				RelativeBendpoint pointCopy = new RelativeBendpoint(((RelativeBendpoint)point).convertToString());
+				result.add(pointCopy);
+			}
+		}
+
+		if(convertToPixels) {
+
+			List<RelativeBendpoint> convertedResult = new LinkedList<RelativeBendpoint>();
+
+			for(RelativeBendpoint point : result) {
+				convertedResult.add(convertToPixels(point));
+			}
+
+			result = convertedResult;
+		}
+
+		target.setPoints(result);
+	}
+
+	private static RelativeBendpoint convertToPixels(RelativeBendpoint bendpoint) {
+		int newSourceX, newSourceY, newTargetX, newTargetY;
+
+		newSourceX = convertToPixels(bendpoint.getSourceX());
+		newSourceY = convertToPixels(bendpoint.getSourceY());
+		newTargetX = convertToPixels(bendpoint.getTargetX());
+		newTargetY = convertToPixels(bendpoint.getTargetY());
+
+		return new RelativeBendpoint(newSourceX, newSourceY, newTargetX, newTargetY);
+	}
+
+	private static int convertToPixels(int source) {
+		return source / 25;
+	}
+}
diff --git a/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/src/org/eclipse/papyrus/m2m/qvto/PropertiesUtil.java b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/src/org/eclipse/papyrus/m2m/qvto/PropertiesUtil.java
new file mode 100644
index 00000000000..a2e87ff29dc
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/src/org/eclipse/papyrus/m2m/qvto/PropertiesUtil.java
@@ -0,0 +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:

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

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

+package org.eclipse.papyrus.m2m.qvto;

+

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

+import org.eclipse.m2m.qvt.oml.blackbox.java.Operation;

+import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;

+import org.eclipse.m2m.qvt.oml.util.IContext;

+

+

+public class PropertiesUtil {

+

+	@Operation(withExecutionContext = true, kind = Kind.HELPER)

+	public String getStringProperty(IContext context, String property) {

+		return (String)context.getConfigProperty(property);

+	}

+

+	@Operation(withExecutionContext = true, kind = Kind.HELPER)

+	public boolean getBooleanProperty(IContext context, String property) {

+		return Boolean.parseBoolean(context.getConfigProperty(property).toString());

+	}

+

+	@Operation(withExecutionContext = true, kind = Kind.HELPER)

+	public int getIntegerProperty(IContext context, String property) {

+		return Integer.parseInt(context.getConfigProperty(property).toString());

+	}

+

+	@Operation(withExecutionContext = true, kind = Kind.HELPER)

+	public EObject getEObjectProperty(IContext context, String property) {

+		Object value = context.getConfigProperties().get(property);

+		if(value instanceof EObject) {

+			return (EObject)value;

+		}

+		return null;

+	}

+

+}

diff --git a/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/src/org/eclipse/papyrus/m2m/qvto/TransformationUI.java b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/src/org/eclipse/papyrus/m2m/qvto/TransformationUI.java
new file mode 100644
index 00000000000..06d94d2398b
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.m2m.qvto/src/org/eclipse/papyrus/m2m/qvto/TransformationUI.java
@@ -0,0 +1,55 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.m2m.qvto;
+
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.m2m.qvt.oml.blackbox.java.Operation;
+import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;
+import org.eclipse.m2m.qvt.oml.util.IContext;
+
+
+public class TransformationUI {
+
+	public static final String MONITOR = "monitor";
+
+	@Operation(withExecutionContext = true, kind = Kind.HELPER)
+	public void beginTask(IContext context, String name, int totalWork) {
+		getMonitor(context).beginTask(name, totalWork);
+	}
+
+	@Operation(withExecutionContext = true, kind = Kind.HELPER)
+	public void worked(IContext context, int worked) {
+		getMonitor(context).worked(worked);
+	}
+
+	@Operation(withExecutionContext = true, kind = Kind.HELPER)
+	public boolean isCanceled(IContext context) {
+		return getMonitor(context).isCanceled();
+	}
+
+
+
+
+
+	private IProgressMonitor getMonitor(IContext context) {
+		Object monitor = context.getConfigProperty(MONITOR);
+
+		if(monitor instanceof IProgressMonitor) {
+			return (IProgressMonitor)monitor;
+		}
+
+		return new NullProgressMonitor();
+	}
+
+}
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.properties.model/META-INF/MANIFEST.MF b/extraplugins/migration/org.eclipse.papyrus.migration.properties.model/META-INF/MANIFEST.MF
index b1bcff5c2cb..4b96ff250a4 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.properties.model/META-INF/MANIFEST.MF
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.properties.model/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ 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.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.migration.properties.model.Activ

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.properties.model/pom.xml b/extraplugins/migration/org.eclipse.papyrus.migration.properties.model/pom.xml
index 75f7d3951a1..8cd8ccf231f 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.properties.model/pom.xml
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.properties.model/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.migration.properties.model</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/.classpath b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/.classpath
new file mode 100644
index 00000000000..486b1b8b096
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

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

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

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

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

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

+</classpath>

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/.project b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/.project
new file mode 100644
index 00000000000..59cf298d7bf
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/.project
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.migration.rsa</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.m2m.qvt.oml.project.QVTONature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/.settings/org.eclipse.jdt.core.prefs b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..c537b63063c
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap
new file mode 100644
index 00000000000..0e456dfc766
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ASCII"?>

+<uriMap:MappingContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:uriMap="http:///www.eclipse.org/m2m/qvt/oml/MModelUriMap/1.0.0">

+  <mapping sourceURI="http://www.eclipse.org/papyrus/umlnotation" targetURI="platform:/resource/org.eclipse.papyrus.migration.rsa/model/PapyrusUMLNotation.ecore"/>

+  <mapping sourceURI="http://www.eclipse.org/papyrus/0.7.0/sashdi" targetURI="platform:/resource/org.eclipse.papyrus.infra.core.sasheditor.di/model/di.ecore"/>

+  <mapping sourceURI="http:///RSAToPapyrusParameters.ecore" targetURI="platform:/resource/org.eclipse.papyrus.migration.rsa/model/ui/RSAToPapyrusParameters.ecore"/>  

+</uriMap:MappingContainer>

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/META-INF/MANIFEST.MF b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..9003a0bfe10
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/META-INF/MANIFEST.MF
@@ -0,0 +1,50 @@
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.ui,

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

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

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

+ org.eclipse.m2m.qvt.oml;bundle-version="3.4.0",

+ org.eclipse.m2m.qvt.oml.common;bundle-version="3.4.0",

+ org.eclipse.m2m.qvt.oml.project;bundle-version="3.3.0",

+ org.eclipse.uml2.uml;bundle-version="5.0.1",

+ org.eclipse.uml2.uml.edit;bundle-version="5.0.0",

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

+ org.eclipse.core.runtime,

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

+ org.eclipse.emf.ecore.xmi;bundle-version="2.10.1",

+ org.eclipse.uml2.types,

+ org.eclipse.uml2.uml.resources;bundle-version="5.0.0",

+ org.eclipse.papyrus.m2m.qvto;bundle-version="1.1.0",

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

+ org.eclipse.papyrus.umlrt;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

+ org.eclipse.papyrus.dsml.validation;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.documentation.profile;bundle-version="1.1.0",

+ org.eclipse.team.core,

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

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

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0"

+Export-Package: org.eclipse.papyrus.migration.rsa,

+ org.eclipse.papyrus.migration.rsa.handler,

+ org.eclipse.papyrus.migration.rsa.transformation,

+ org.eclipse.papyrus.migration.rsa.umlrt,

+ org.eclipse.papyrus.migration.rsa.umlrt.impl,

+ org.eclipse.papyrus.migration.rsa.umlrt.util,

+ org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters,

+ org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl,

+ org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.util,

+ org.eclipse.papyrus.migration.rsa.default_,

+ org.eclipse.papyrus.migration.rsa.default_.impl,

+ org.eclipse.papyrus.migration.rsa.default_.util

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-ClassPath: .

+Bundle-Version: 1.1.0.qualifier

+Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-Activator: org.eclipse.papyrus.migration.rsa.Activator

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.migration.rsa;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/about.html b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/about.html
new file mode 100644
index 00000000000..209103075a7
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

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

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

+<head>

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

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

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

+<h3>License</h3>

+

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

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

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

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

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

+

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

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

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

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

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

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

+

+</body>

+</html>
\ No newline at end of file
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/build.properties b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/build.properties
new file mode 100644
index 00000000000..fdf262b00bf
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/build.properties
@@ -0,0 +1,12 @@
+source.. = src/,\
+           src-gen/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               model/,\
+               transform/,\
+               plugin.properties,\
+               about.html,\
+               dialog/
+src.includes = about.html
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/dialog/RSAToPapyrusParameters.ctx b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/dialog/RSAToPapyrusParameters.ctx
new file mode 100644
index 00000000000..258b1f89f96
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/dialog/RSAToPapyrusParameters.ctx
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="ASCII"?>

+<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" name="RSAToPapyrusParameters">

+  <tabs label="RSAToPapyrusParameters" id="rsatopapyrusparameters" priority="100">

+    <sections name="Single Config" sectionFile="ui/SingleConfig.xwt">

+      <widget href="ui/SingleConfig.xwt#/"/>

+    </sections>

+    <sections name="Multiple Config" sectionFile="ui/MultipleConfig.xwt">

+      <widget href="ui/MultipleConfig.xwt#/"/>

+    </sections>

+  </tabs>

+  <views name="Single Config" sections="//@tabs.0/@sections.0" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleConfig">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http:///RSAToPapyrusParameters.ecore"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Config"/>

+    </constraints>

+  </views>

+  <views elementMultiplicity="-1" name="Multiple Config" sections="//@tabs.0/@sections.1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleConfig">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="Config"/>

+      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http:///RSAToPapyrusParameters.ecore"/>

+    </constraints>

+  </views>

+  <dataContexts name="RSAToPapyrusParameters" label="RSAToPapyrusParameters">

+    <elements name="Config">

+      <properties name="convertOpaqueExpressionToLiteralString" type="Boolean" description="If true, the Opaque Expressions with a single body and no language (or a single empty language) will be converted to LiteralString"/>

+      <properties name="removeUnmappedProfilesAndStereotypes" type="Boolean" description="If true, the unsupported RSA profiles and stereotypes will be deleted. This includes the Deployment profile and a few stereotypes"/>

+      <properties name="removeUnmappedAnnotations" type="Boolean" description="If true, the unmapped RSA EAnnotations will be deleted from the imported model"/>

+      <properties name="removeUnmappedDiagrams" label="" type="Boolean" description="If true, the diagrams which were not migrated will be removed. Otherwise, only the successfully imported diagrams will be removed"/>

+    </elements>

+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@modelElementFactories.0"/>

+  </dataContexts>

+</contexts:Context>

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/dialog/ui/MultipleConfig.xwt b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/dialog/ui/MultipleConfig.xwt
new file mode 100644
index 00000000000..9581e0c070c
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/dialog/ui/MultipleConfig.xwt
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:j="clr-namespace:java.lang"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+	<ppe:BooleanCheckbox input="{Binding}"

+		property="RSAToPapyrusParameters:Config:convertOpaqueExpressionToLiteralString"></ppe:BooleanCheckbox>

+	<ppe:BooleanCheckbox input="{Binding}"

+		property="RSAToPapyrusParameters:Config:removeUnmappedProfilesAndStereotypes"></ppe:BooleanCheckbox>

+</Composite>
\ No newline at end of file
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/dialog/ui/SingleConfig.xwt b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/dialog/ui/SingleConfig.xwt
new file mode 100644
index 00000000000..29113ff0d6d
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/dialog/ui/SingleConfig.xwt
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+	<ppe:BooleanCheckbox input="{Binding}"

+		property="RSAToPapyrusParameters:Config:convertOpaqueExpressionToLiteralString"></ppe:BooleanCheckbox>

+	<ppe:BooleanCheckbox input="{Binding}"

+		property="RSAToPapyrusParameters:Config:removeUnmappedProfilesAndStereotypes"></ppe:BooleanCheckbox>

+</Composite>
\ No newline at end of file
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusDefault.ecore b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusDefault.ecore
new file mode 100644
index 00000000000..51608f524b3
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusDefault.ecore
@@ -0,0 +1,51 @@
+<?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="default" nsURI="http://www.eclipse.org/papyrus/profile/default"

+    nsPrefix="default">

+  <eClassifiers xsi:type="ecore:EClass" name="Documentation">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Comment" lowerBound="1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Comment"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="URL">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Comment" lowerBound="1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Comment"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" lowerBound="1"

+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EByteArray"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Link" eSuperTypes="#//URL"/>

+  <eClassifiers xsi:type="ecore:EClass" name="AbstractConstraint" abstract="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Constraint" lowerBound="1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Constraint"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="evaluationMode" lowerBound="1"

+        eType="#//Mode" defaultValueLiteral="batch"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="severity" lowerBound="1"

+        eType="#//Severity" defaultValueLiteral="error"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="MetaConstraint" eSuperTypes="#//AbstractConstraint">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="message" lowerBound="1"

+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="MarkingModel">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Package" lowerBound="1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Package"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="MarkingImport">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_ElementImport" lowerBound="1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ElementImport"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="Mode">

+    <eLiterals name="batch"/>

+    <eLiterals name="live" value="1"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="Severity">

+    <eLiterals name="error"/>

+    <eLiterals name="warning" value="1"/>

+    <eLiterals name="info" value="2"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="DefaultLanguage">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Package" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Package"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultLanguage" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+  </eClassifiers>

+</ecore:EPackage>

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusDefault.genmodel b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusDefault.genmodel
new file mode 100644
index 00000000000..41eb23de042
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusDefault.genmodel
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" * Copyright (c) 2013, 2014 CEA LIST.&#xD;&#xA; *&#xD;&#xA; * All rights reserved. This program and the accompanying materials&#xD;&#xA; * are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA; * which accompanies this distribution, and is available at&#xD;&#xA; * http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; *&#xD;&#xA; * Contributors:&#xD;&#xA; *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation"

+    modelDirectory="/org.eclipse.papyrus.migration.rsa/src-gen" editDirectory="/org.eclipse.papyrus.migration.rsa.edit/src-gen"

+    editorDirectory="/org.eclipse.papyrus.migration.rsa.editor/src-gen" modelPluginID="org.eclipse.papyrus.migration.rsa"

+    modelName="PapyrusDefault" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

+    testsDirectory="/org.eclipse.papyrus.migration.rsa.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"

+    complianceLevel="6.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml"

+    operationReflection="true" importOrganizing="true">

+  <foreignModel>PapyrusDefault.ecore</foreignModel>

+  <genPackages prefix="Default" basePackage="org.eclipse.papyrus.migration.rsa" resource="XML"

+      disposableProviderFactory="true" ecorePackage="PapyrusDefault.ecore#/">

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="PapyrusDefault.ecore#//Mode">

+      <genEnumLiterals ecoreEnumLiteral="PapyrusDefault.ecore#//Mode/batch"/>

+      <genEnumLiterals ecoreEnumLiteral="PapyrusDefault.ecore#//Mode/live"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="PapyrusDefault.ecore#//Severity">

+      <genEnumLiterals ecoreEnumLiteral="PapyrusDefault.ecore#//Severity/error"/>

+      <genEnumLiterals ecoreEnumLiteral="PapyrusDefault.ecore#//Severity/warning"/>

+      <genEnumLiterals ecoreEnumLiteral="PapyrusDefault.ecore#//Severity/info"/>

+    </genEnums>

+    <genClasses ecoreClass="PapyrusDefault.ecore#//Documentation">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusDefault.ecore#//Documentation/base_Comment"/>

+    </genClasses>

+    <genClasses ecoreClass="PapyrusDefault.ecore#//URL">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusDefault.ecore#//URL/base_Comment"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusDefault.ecore#//URL/type"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusDefault.ecore#//URL/displayName"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusDefault.ecore#//URL/icon"/>

+    </genClasses>

+    <genClasses ecoreClass="PapyrusDefault.ecore#//Link"/>

+    <genClasses image="false" ecoreClass="PapyrusDefault.ecore#//AbstractConstraint">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusDefault.ecore#//AbstractConstraint/base_Constraint"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusDefault.ecore#//AbstractConstraint/evaluationMode"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusDefault.ecore#//AbstractConstraint/severity"/>

+    </genClasses>

+    <genClasses ecoreClass="PapyrusDefault.ecore#//MetaConstraint">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusDefault.ecore#//MetaConstraint/message"/>

+    </genClasses>

+    <genClasses ecoreClass="PapyrusDefault.ecore#//MarkingModel">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusDefault.ecore#//MarkingModel/base_Package"/>

+    </genClasses>

+    <genClasses ecoreClass="PapyrusDefault.ecore#//MarkingImport">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusDefault.ecore#//MarkingImport/base_ElementImport"/>

+    </genClasses>

+    <genClasses ecoreClass="PapyrusDefault.ecore#//DefaultLanguage">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusDefault.ecore#//DefaultLanguage/base_Package"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusDefault.ecore#//DefaultLanguage/defaultLanguage"/>

+    </genClasses>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusProfileBase.ecore b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusProfileBase.ecore
new file mode 100644
index 00000000000..4fa8fc76e6e
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusProfileBase.ecore
@@ -0,0 +1,9 @@
+<?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="profilebase" nsURI="http://www.eclipse.org/papyrus/profile/profilebase"

+    nsPrefix="ProfileBase">

+  <eClassifiers xsi:type="ecore:EClass" name="ProfileConstraint" eSuperTypes="PapyrusDefault.ecore#//AbstractConstraint">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="messageKey" lowerBound="1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+</ecore:EPackage>

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusProfileBase.genmodel b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusProfileBase.genmodel
new file mode 100644
index 00000000000..de3c5567055
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusProfileBase.genmodel
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" * Copyright (c) 2013, 2014 CEA LIST.&#xD;&#xA; *&#xD;&#xA; * All rights reserved. This program and the accompanying materials&#xD;&#xA; * are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA; * which accompanies this distribution, and is available at&#xD;&#xA; * http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; *&#xD;&#xA; * Contributors:&#xD;&#xA; *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation"

+    modelDirectory="/org.eclipse.papyrus.migration.rsa/src-gen" editDirectory="/org.eclipse.papyrus.migration.rsa.edit/src-gen"

+    editorDirectory="/org.eclipse.papyrus.migration.rsa.editor/src-gen" modelPluginID="org.eclipse.papyrus.migration.rsa"

+    modelName="PapyrusProfileBase" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

+    testsDirectory="/org.eclipse.papyrus.migration.rsa.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"

+    complianceLevel="6.0" copyrightFields="false" language="" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore PapyrusDefault.genmodel#//default ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml"

+    operationReflection="true" importOrganizing="true">

+  <foreignModel>PapyrusProfileBase.ecore</foreignModel>

+  <genPackages prefix="ProfileBase" basePackage="org.eclipse.papyrus.migration.rsa"

+      resource="XML" disposableProviderFactory="true" ecorePackage="PapyrusProfileBase.ecore#/">

+    <genClasses ecoreClass="PapyrusProfileBase.ecore#//ProfileConstraint">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusProfileBase.ecore#//ProfileConstraint/messageKey"/>

+    </genClasses>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusRT.ecore b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusRT.ecore
new file mode 100644
index 00000000000..9978d666fea
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusRT.ecore
@@ -0,0 +1,68 @@
+<?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="umlrt" nsURI="http://www.eclipse.org/papyrus/profile/umlrt"

+    nsPrefix="UMLRealTime">

+  <eClassifiers xsi:type="ecore:EClass" name="RTStereotype" abstract="true"/>

+  <eClassifiers xsi:type="ecore:EClass" name="AbstractEvent" abstract="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_CallEvent" lowerBound="1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//CallEvent"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Capsule">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" lowerBound="1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Class"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="CapsulePart">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Property" lowerBound="1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Coregion"/>

+  <eClassifiers xsi:type="ecore:EClass" name="InEvent" eSuperTypes="#//AbstractEvent"/>

+  <eClassifiers xsi:type="ecore:EClass" name="OutEvent" eSuperTypes="#//AbstractEvent"/>

+  <eClassifiers xsi:type="ecore:EClass" name="Protocol">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Collaboration" lowerBound="1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Collaboration"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ProtocolContainer">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Package" lowerBound="1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Package"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="RTConnector">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Connector" lowerBound="1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Connector"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="RTHistorystate">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Pseudostate" lowerBound="1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Pseudostate"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="historyKind" eType="#//HistoryKind"

+        defaultValueLiteral="Deep"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="RTPort">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Port" lowerBound="1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Port"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isConjugate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isNotification" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isPublish" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isWired" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"

+        defaultValueLiteral="true"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="registration" eType="#//PortRegistrationType"

+        defaultValueLiteral="Automatic"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="registrationOverride" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="RTRedefinableElement">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_RedefinableElement"

+        lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//RedefinableElement"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Trigger">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Operation" lowerBound="1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Operation"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="PortRegistrationType">

+    <eLiterals name="Automatic" literal="Automatic"/>

+    <eLiterals name="Application" value="1"/>

+    <eLiterals name="Automatic (locked)" value="2" literal="Automatic (locked)"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="HistoryKind">

+    <eLiterals name="Deep"/>

+    <eLiterals name="Shallow" value="1"/>

+  </eClassifiers>

+</ecore:EPackage>

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusRT.genmodel b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusRT.genmodel
new file mode 100644
index 00000000000..ff59a84e9ae
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusRT.genmodel
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" * Copyright (c) 2013, 2014 CEA LIST.&#xD;&#xA; *&#xD;&#xA; * All rights reserved. This program and the accompanying materials&#xD;&#xA; * are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA; * which accompanies this distribution, and is available at&#xD;&#xA; * http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; *&#xD;&#xA; * Contributors:&#xD;&#xA; *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation"

+    modelDirectory="/org.eclipse.papyrus.migration.rsa/src-gen" editDirectory="/org.eclipse.papyrus.migration.rsa.edit/src-gen"

+    editorDirectory="/org.eclipse.papyrus.migration.rsa.editor/src-gen" modelPluginID="org.eclipse.papyrus.migration.rsa"

+    modelName="PapyrusRT" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

+    testsDirectory="/org.eclipse.papyrus.migration.rsa.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"

+    complianceLevel="6.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml"

+    operationReflection="true" importOrganizing="true">

+  <foreignModel>PapyrusRT.ecore</foreignModel>

+  <genPackages prefix="UMLRealTime" basePackage="org.eclipse.papyrus.migration.rsa"

+      resource="XML" disposableProviderFactory="true" ecorePackage="PapyrusRT.ecore#/">

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="PapyrusRT.ecore#//PortRegistrationType">

+      <genEnumLiterals ecoreEnumLiteral="PapyrusRT.ecore#//PortRegistrationType/Automatic"/>

+      <genEnumLiterals ecoreEnumLiteral="PapyrusRT.ecore#//PortRegistrationType/Application"/>

+      <genEnumLiterals ecoreEnumLiteral="PapyrusRT.ecore#//PortRegistrationType/Automatic%20(locked)"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="PapyrusRT.ecore#//HistoryKind">

+      <genEnumLiterals ecoreEnumLiteral="PapyrusRT.ecore#//HistoryKind/Deep"/>

+      <genEnumLiterals ecoreEnumLiteral="PapyrusRT.ecore#//HistoryKind/Shallow"/>

+    </genEnums>

+    <genClasses image="false" ecoreClass="PapyrusRT.ecore#//AbstractEvent">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusRT.ecore#//AbstractEvent/base_CallEvent"/>

+    </genClasses>

+    <genClasses ecoreClass="PapyrusRT.ecore#//Capsule">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusRT.ecore#//Capsule/base_Class"/>

+    </genClasses>

+    <genClasses ecoreClass="PapyrusRT.ecore#//CapsulePart">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusRT.ecore#//CapsulePart/base_Property"/>

+    </genClasses>

+    <genClasses ecoreClass="PapyrusRT.ecore#//Coregion"/>

+    <genClasses ecoreClass="PapyrusRT.ecore#//InEvent"/>

+    <genClasses ecoreClass="PapyrusRT.ecore#//OutEvent"/>

+    <genClasses ecoreClass="PapyrusRT.ecore#//Protocol">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusRT.ecore#//Protocol/base_Collaboration"/>

+    </genClasses>

+    <genClasses ecoreClass="PapyrusRT.ecore#//ProtocolContainer">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusRT.ecore#//ProtocolContainer/base_Package"/>

+    </genClasses>

+    <genClasses ecoreClass="PapyrusRT.ecore#//RTConnector">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusRT.ecore#//RTConnector/base_Connector"/>

+    </genClasses>

+    <genClasses ecoreClass="PapyrusRT.ecore#//RTHistorystate">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusRT.ecore#//RTHistorystate/base_Pseudostate"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusRT.ecore#//RTHistorystate/historyKind"/>

+    </genClasses>

+    <genClasses ecoreClass="PapyrusRT.ecore#//RTPort">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusRT.ecore#//RTPort/base_Port"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusRT.ecore#//RTPort/isConjugate"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusRT.ecore#//RTPort/isNotification"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusRT.ecore#//RTPort/isPublish"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusRT.ecore#//RTPort/isWired"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusRT.ecore#//RTPort/registration"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusRT.ecore#//RTPort/registrationOverride"/>

+    </genClasses>

+    <genClasses ecoreClass="PapyrusRT.ecore#//RTRedefinableElement">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusRT.ecore#//RTRedefinableElement/base_RedefinableElement"/>

+    </genClasses>

+    <genClasses ecoreClass="PapyrusRT.ecore#//Trigger">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusRT.ecore#//Trigger/base_Operation"/>

+    </genClasses>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusUMLNotation.ecore b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusUMLNotation.ecore
new file mode 100644
index 00000000000..20f46ba0af7
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusUMLNotation.ecore
@@ -0,0 +1,29 @@
+<?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="umlnotation" nsURI="http://www.eclipse.org/papyrus/umlnotation"
+    nsPrefix="umlnotationext">
+  <eClassifiers xsi:type="ecore:EClass" name="UMLDiagram" eSuperTypes="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram #//UMLView"/>
+  <eClassifiers xsi:type="ecore:EClass" name="UMLFrame" eSuperTypes="#//UMLShape"/>
+  <eClassifiers xsi:type="ecore:EClass" name="UMLShapeCompartment" eSuperTypes="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Compartment #//UMLView">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="verticalAlignment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="UMLShape" eSuperTypes="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Shape #//UMLView"/>
+  <eClassifiers xsi:type="ecore:EClass" name="UMLConnector" eSuperTypes="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Connector http://www.eclipse.org/gmf/runtime/1.0.2/notation#//FontStyle #//UMLView"/>
+  <eClassifiers xsi:type="ecore:EClass" name="UMLView" abstract="true" eSuperTypes="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="showStereotype" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="showListVisibility" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        defaultValueLiteral="None"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="showListSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alignment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="showStereotypeAttributeCompartment"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="UMLComponent" eSuperTypes="#//UMLShape">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="showWhitebox" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="UMLClassifierShape" eSuperTypes="#//UMLShape">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="useClassifierShape" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusUMLNotation.genmodel b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusUMLNotation.genmodel
new file mode 100644
index 00000000000..589308d19af
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusUMLNotation.genmodel
@@ -0,0 +1,392 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" * Copyright (c) 2013, 2014 CEA LIST.&#xD;&#xA; *&#xD;&#xA; * All rights reserved. This program and the accompanying materials&#xD;&#xA; * are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA; * which accompanies this distribution, and is available at&#xD;&#xA; * http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; *&#xD;&#xA; * Contributors:&#xD;&#xA; *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation"

+    modelDirectory="/org.eclipse.papyrus.migration.rsa/src-gen" modelPluginID="org.eclipse.papyrus.migration.rsa"

+    modelName="PapyrusUMLNotation" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"

+    language="" operationReflection="true" importOrganizing="true">

+  <foreignModel>PapyrusUMLNotation.ecore</foreignModel>

+  <genPackages prefix="PapyrusUMLNotation" basePackage="org.eclipse.papyrus.migration.rsa"

+      disposableProviderFactory="true" fileExtensions="umlnotation" ecorePackage="PapyrusUMLNotation.ecore#/">

+    <genClasses ecoreClass="PapyrusUMLNotation.ecore#//UMLDiagram"/>

+    <genClasses ecoreClass="PapyrusUMLNotation.ecore#//UMLFrame"/>

+    <genClasses ecoreClass="PapyrusUMLNotation.ecore#//UMLShapeCompartment">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusUMLNotation.ecore#//UMLShapeCompartment/verticalAlignment"/>

+    </genClasses>

+    <genClasses ecoreClass="PapyrusUMLNotation.ecore#//UMLShape"/>

+    <genClasses ecoreClass="PapyrusUMLNotation.ecore#//UMLConnector"/>

+    <genClasses image="false" ecoreClass="PapyrusUMLNotation.ecore#//UMLView">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusUMLNotation.ecore#//UMLView/showStereotype"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusUMLNotation.ecore#//UMLView/showListVisibility"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusUMLNotation.ecore#//UMLView/showListSignature"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusUMLNotation.ecore#//UMLView/alignment"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusUMLNotation.ecore#//UMLView/showStereotypeAttributeCompartment"/>

+    </genClasses>

+    <genClasses ecoreClass="PapyrusUMLNotation.ecore#//UMLComponent">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusUMLNotation.ecore#//UMLComponent/showWhitebox"/>

+    </genClasses>

+    <genClasses ecoreClass="PapyrusUMLNotation.ecore#//UMLClassifierShape">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PapyrusUMLNotation.ecore#//UMLClassifierShape/useClassifierShape"/>

+    </genClasses>

+  </genPackages>

+  <genPackages prefix="Notation" ecorePackage="http://www.eclipse.org/gmf/runtime/1.0.2/notation#/">

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Sorting">

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Sorting/None"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Sorting/Manual"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Sorting/Automatic"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Filtering">

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Filtering/None"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Filtering/Manual"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Filtering/Automatic"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Routing">

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Routing/Manual"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Routing/Rectilinear"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Routing/Tree"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Smoothness">

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Smoothness/None"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Smoothness/Normal"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Smoothness/Less"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Smoothness/More"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//JumpLinkStatus">

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//JumpLinkStatus/None"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//JumpLinkStatus/All"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//JumpLinkStatus/Below"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//JumpLinkStatus/Above"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//JumpLinkType">

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//JumpLinkType/Semicircle"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//JumpLinkType/Square"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//JumpLinkType/Chamfered"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Alignment">

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Alignment/Left"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Alignment/Right"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Alignment/Center"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Alignment/Top"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Alignment/Bottom"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//SortingDirection">

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//SortingDirection/Ascending"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//SortingDirection/Descending"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//MeasurementUnit">

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//MeasurementUnit/Himetric"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//MeasurementUnit/Pixel"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//TextAlignment">

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//TextAlignment/Left"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//TextAlignment/Right"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//TextAlignment/Center"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//LineType">

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//LineType/Solid"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//LineType/Dash"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//LineType/Dot"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//LineType/DashDot"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//LineType/DashDotDot"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//LineType/Double"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ArrowType">

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ArrowType/None"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ArrowType/OpenArrow"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ArrowType/SolidArrow"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//GradientStyle">

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//GradientStyle/Vertical"/>

+      <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//GradientStyle/Horizontal"/>

+    </genEnums>

+    <genDataTypes ecoreDataType="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//RelativeBendpointList"/>

+    <genDataTypes ecoreDataType="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//FilterKeyList"/>

+    <genDataTypes ecoreDataType="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//SortKeyMap"/>

+    <genDataTypes ecoreDataType="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//GradientData"/>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Edge">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Edge/source"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Edge/target"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Edge/bendpoints"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Edge/sourceAnchor"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Edge/targetAnchor"/>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Edge/createBendpoints">

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Edge/createBendpoints/eClass"/>

+      </genOperations>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Edge/createSourceAnchor">

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Edge/createSourceAnchor/eClass"/>

+      </genOperations>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Edge/createTargetAnchor">

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Edge/createTargetAnchor/eClass"/>

+      </genOperations>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Node">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Node/layoutConstraint"/>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Node/createLayoutConstraint">

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Node/createLayoutConstraint/eClass"/>

+      </genOperations>

+    </genClasses>

+    <genClasses image="false" ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Style"/>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//FillStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//FillStyle/fillColor"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//FillStyle/transparency"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//FillStyle/gradient"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//LineStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//LineStyle/lineColor"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//LineStyle/lineWidth"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//FontStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//FontStyle/fontColor"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//FontStyle/fontName"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//FontStyle/fontHeight"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//FontStyle/bold"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//FontStyle/italic"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//FontStyle/underline"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//FontStyle/strikeThrough"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//TitleStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//TitleStyle/showTitle"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//SortingStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//SortingStyle/sorting"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//SortingStyle/sortingKeys"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//SortingStyle/sortedObjects"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//DescriptionStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//DescriptionStyle/description"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//LayoutConstraint"/>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Size">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Size/width"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Size/height"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Location">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Location/x"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Location/y"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Bounds"/>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Ratio">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Ratio/value"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Anchor"/>

+    <genClasses image="false" ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Bendpoints"/>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//IdentityAnchor">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//IdentityAnchor/id"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//RoutingStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//RoutingStyle/routing"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//RoutingStyle/smoothness"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//RoutingStyle/avoidObstructions"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//RoutingStyle/closestDistance"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//RoutingStyle/jumpLinkStatus"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//RoutingStyle/jumpLinkType"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//RoutingStyle/jumpLinksReverse"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/visible"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/type"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/mutable"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/sourceEdges"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/targetEdges"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/children"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/styles"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/element"/>

+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/diagram"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/transientChildren"/>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/getStyle">

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/getStyle/eClass"/>

+      </genOperations>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/createChild">

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/createChild/eClass"/>

+      </genOperations>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/createStyle">

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/createStyle/eClass"/>

+      </genOperations>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/getNamedStyle">

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/getNamedStyle/eClass"/>

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/getNamedStyle/name"/>

+      </genOperations>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//RelativeBendpoints">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//RelativeBendpoints/points"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram/measurementUnit"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram/edges"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram/TransientEdges"/>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram/createEdge">

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram/createEdge/eClass"/>

+      </genOperations>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Image">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Image/data"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//CanonicalStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//CanonicalStyle/canonical"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ShapeStyle"/>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ConnectorStyle"/>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PageStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PageStyle/pageX"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PageStyle/pageY"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PageStyle/pageWidth"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PageStyle/pageHeight"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//DrawerStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//DrawerStyle/collapsed"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//GuideStyle">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//GuideStyle/horizontalGuides"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//GuideStyle/verticalGuides"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Guide">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Guide/position"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Guide/nodeMap"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//NodeEntry">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//NodeEntry/value"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//NodeEntry/key"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//FilteringStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//FilteringStyle/filtering"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//FilteringStyle/filteringKeys"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//FilteringStyle/filteredObjects"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//DiagramStyle"/>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ImageStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ImageStyle/antiAlias"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ImageStyle/maintainAspectRatio"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ImageStyle/cropBound"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ImageBufferStyle">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ImageBufferStyle/imageBuffer"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertiesSetStyle">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertiesSetStyle/propertiesMap"/>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertiesSetStyle/getProperty">

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertiesSetStyle/getProperty/propertyName"/>

+      </genOperations>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertiesSetStyle/setProperty">

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertiesSetStyle/setProperty/propertyName"/>

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertiesSetStyle/setProperty/newValue"/>

+      </genOperations>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertiesSetStyle/createProperty">

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertiesSetStyle/createProperty/propertyName"/>

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertiesSetStyle/createProperty/instanceType"/>

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertiesSetStyle/createProperty/initialValue"/>

+      </genOperations>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertiesSetStyle/removeProperty">

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertiesSetStyle/removeProperty/propertyName"/>

+      </genOperations>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertiesSetStyle/hasProperty">

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertiesSetStyle/hasProperty/propertyName"/>

+      </genOperations>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertiesSetStyle/createProperty.1">

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertiesSetStyle/createProperty.1/propertyName"/>

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertiesSetStyle/createProperty.1/initialValue"/>

+      </genOperations>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//StringToPropertyValueMapEntry">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//StringToPropertyValueMapEntry/key"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//StringToPropertyValueMapEntry/value"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertyValue">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertyValue/rawValue"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertyValue/instanceType"/>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertyValue/getValue"/>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertyValue/setValue">

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//PropertyValue/setValue/newValue"/>

+      </genOperations>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//SingleValueStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//SingleValueStyle/rawValue"/>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//SingleValueStyle/getValue"/>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//SingleValueStyle/setValue">

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//SingleValueStyle/setValue/newValue"/>

+      </genOperations>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ListValueStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ListValueStyle/rawValuesList"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//NamedStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//NamedStyle/name"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//StringObjectConverter">

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//StringObjectConverter/getStringFromObject">

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//StringObjectConverter/getStringFromObject/objectValue"/>

+      </genOperations>

+      <genOperations ecoreOperation="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//StringObjectConverter/getObjectFromString">

+        <genParameters ecoreParameter="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//StringObjectConverter/getObjectFromString/stringValue"/>

+      </genOperations>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//DataTypeStyle">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//DataTypeStyle/instanceType"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//IntValueStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//IntValueStyle/intValue"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//IntListValueStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//IntListValueStyle/intListValue"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//BooleanValueStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//BooleanValueStyle/booleanValue"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//DoubleValueStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//DoubleValueStyle/doubleValue"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//DoubleListValueStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//DoubleListValueStyle/doubleListValue"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//StringValueStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//StringValueStyle/stringValue"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//StringListValueStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//StringListValueStyle/stringListValue"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//EObjectValueStyle">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//EObjectValueStyle/eObjectValue"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//EObjectListValueStyle">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//EObjectListValueStyle/eObjectListValue"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ByteArrayValueStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ByteArrayValueStyle/byteArrayValue"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//BooleanListValueStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//BooleanListValueStyle/booleanListValue"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//HintedDiagramLinkStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//HintedDiagramLinkStyle/hint"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//DiagramLinkStyle">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//DiagramLinkStyle/diagramLink"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//MultiDiagramLinkStyle">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference http://www.eclipse.org/gmf/runtime/1.0.2/notation#//MultiDiagramLinkStyle/diagramLinks"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//TextStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//TextStyle/textAlignment"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//LineTypeStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//LineTypeStyle/lineType"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ArrowStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ArrowStyle/arrowSource"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ArrowStyle/arrowTarget"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Shape"/>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Compartment"/>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//ListCompartment"/>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Connector"/>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//StandardDiagram"/>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//DecorationNode"/>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//BasicDecorationNode"/>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//BasicCompartment"/>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//BasicSemanticCompartment"/>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//SemanticListCompartment"/>

+    <genClasses ecoreClass="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//RoundedCornersStyle">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/gmf/runtime/1.0.2/notation#//RoundedCornersStyle/roundedBendpointsRadius"/>

+    </genClasses>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/RSAToPapyrusParameters.ecore b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/RSAToPapyrusParameters.ecore
new file mode 100644
index 00000000000..7b1f73bf809
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/RSAToPapyrusParameters.ecore
@@ -0,0 +1,38 @@
+<?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="RSAToPapyrusParameters" nsURI="http:///RSAToPapyrusParameters.ecore"

+    nsPrefix="RSAToPapyrusParameters">

+  <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+    <details key="documentation" value="If true, the unsupported EAnnotation from RSA will be removed"/>

+  </eAnnotations>

+  <eClassifiers xsi:type="ecore:EClass" name="Config">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="convertOpaqueExpressionToLiteralString"

+        ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//Boolean"

+        defaultValueLiteral="true">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="documentation" value="If true, the Opaque Expressions with a single body and no language (or a single empty language) will be converted to LiteralString"/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="removeUnmappedProfilesAndStereotypes"

+        ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//Boolean"

+        defaultValueLiteral="true">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="documentation" value="If true, the unsupported RSA profiles and stereotypes will be deleted. This includes the Deployment profile and a few stereotypes"/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="removeUnmappedAnnotations"

+        ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//Boolean"

+        defaultValueLiteral="false">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="documentation" value="If true, the unmapped RSA EAnnotations will be deleted from the imported model"/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="removeUnmappedDiagrams"

+        ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//Boolean"

+        defaultValueLiteral="false">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="documentation" value="If true, the diagrams which were not migrated will be removed. Otherwise, only the succesfully imported diagrams will be removed"/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+</ecore:EPackage>

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/rsaToPapyrusParameters.di b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/rsaToPapyrusParameters.di
new file mode 100644
index 00000000000..8634d4c00e0
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/rsaToPapyrusParameters.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/rsaToPapyrusParameters.genmodel b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/rsaToPapyrusParameters.genmodel
new file mode 100644
index 00000000000..82fbd82df71
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/rsaToPapyrusParameters.genmodel
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"

+    copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA; &#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;&#x9;Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation"

+    modelDirectory="/org.eclipse.papyrus.migration.rsa/src-gen" editDirectory="/org.eclipse.papyrus.migration.rsa.edit/src-gen"

+    editorDirectory="/org.eclipse.papyrus.migration.rsa.editor/src-gen" modelPluginID="org.eclipse.papyrus.migration.rsa"

+    modelName="RsaToPapyrusParameters" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

+    testsDirectory="/org.eclipse.papyrus.migration.rsa.tests/src-gen" importerID="org.eclipse.uml2.uml.ecore.importer"

+    complianceLevel="6.0" copyrightFields="false" usedGenPackages="../../../org.eclipse.uml2.types/model/Types.genmodel#//types"

+    operationReflection="true" importOrganizing="true">

+  <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">

+    <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>

+    <details key="UNION_PROPERTIES" value="REPORT"/>

+    <details key="UNTYPED_PROPERTIES" value="REPORT"/>

+    <details key="DUPLICATE_FEATURES" value="DISCARD"/>

+    <details key="SUBSETTING_PROPERTIES" value="REPORT"/>

+    <details key="VALIDATION_DELEGATES" value="IGNORE"/>

+    <details key="OPPOSITE_ROLE_NAMES" value="IGNORE"/>

+    <details key="COMMENTS" value="PROCESS"/>

+    <details key="DUPLICATE_FEATURE_INHERITANCE" value="DISCARD"/>

+    <details key="DUPLICATE_OPERATIONS" value="DISCARD"/>

+    <details key="PROPERTY_DEFAULT_EXPRESSIONS" value="IGNORE"/>

+    <details key="INVARIANT_CONSTRAINTS" value="PROCESS"/>

+    <details key="REDEFINING_PROPERTIES" value="REPORT"/>

+    <details key="ANNOTATION_DETAILS" value="PROCESS"/>

+    <details key="NON_API_INVARIANTS" value="IGNORE"/>

+    <details key="DUPLICATE_OPERATION_INHERITANCE" value="DISCARD"/>

+    <details key="REDEFINING_OPERATIONS" value="REPORT"/>

+    <details key="INVOCATION_DELEGATES" value="IGNORE"/>

+    <details key="DERIVED_FEATURES" value="PROCESS"/>

+    <details key="OPERATION_BODIES" value="IGNORE"/>

+    <details key="CAMEL_CASE_NAMES" value="IGNORE"/>

+    <details key="SUPER_CLASS_ORDER" value="PROCESS"/>

+  </genAnnotations>

+  <foreignModel>rsaToPapyrusParameters.uml</foreignModel>

+  <genPackages xsi:type="genmodel:GenPackage" prefix="RSAToPapyrusParameters" basePackage="org.eclipse.papyrus.migration.rsa"

+      disposableProviderFactory="true" ecorePackage="RSAToPapyrusParameters.ecore#/">

+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="RSAToPapyrusParameters.ecore#//Config">

+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute RSAToPapyrusParameters.ecore#//Config/convertOpaqueExpressionToLiteralString"/>

+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute RSAToPapyrusParameters.ecore#//Config/removeUnmappedProfilesAndStereotypes"/>

+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute RSAToPapyrusParameters.ecore#//Config/removeUnmappedAnnotations"/>

+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute RSAToPapyrusParameters.ecore#//Config/removeUnmappedDiagrams"/>

+    </genClasses>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/rsaToPapyrusParameters.notation b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/rsaToPapyrusParameters.notation
new file mode 100644
index 00000000000..940ff17d064
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/rsaToPapyrusParameters.notation
@@ -0,0 +1,80 @@
+<?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="_ffjeAEL1EeSSlqpbHKLCqA" type="PapyrusUMLClassDiagram" name="Config" measurementUnit="Pixel">

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

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

+    <children xmi:type="notation:BasicCompartment" xmi:id="_tKu0lEL1EeSSlqpbHKLCqA" type="7017">

+      <children xmi:type="notation:Shape" xmi:id="_t5AP0EL1EeSSlqpbHKLCqA" type="3012">

+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_Ko_pYEL2EeSSlqpbHKLCqA" name="maskLabel">

+          <stringListValue>visibility</stringListValue>

+          <stringListValue>name</stringListValue>

+          <stringListValue>derived</stringListValue>

+          <stringListValue>multiplicity</stringListValue>

+          <stringListValue>defaultValue</stringListValue>

+          <stringListValue>type</stringListValue>

+        </styles>

+        <element xmi:type="uml:Property" href="rsaToPapyrusParameters.uml#_t42e0EL1EeSSlqpbHKLCqA"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_t5AP0UL1EeSSlqpbHKLCqA"/>

+      </children>

+      <children xmi:type="notation:Shape" xmi:id="_65zMoEL1EeSSlqpbHKLCqA" type="3012">

+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_KNn8AEL2EeSSlqpbHKLCqA" name="maskLabel">

+          <stringListValue>visibility</stringListValue>

+          <stringListValue>name</stringListValue>

+          <stringListValue>derived</stringListValue>

+          <stringListValue>multiplicity</stringListValue>

+          <stringListValue>defaultValue</stringListValue>

+          <stringListValue>type</stringListValue>

+        </styles>

+        <element xmi:type="uml:Property" href="rsaToPapyrusParameters.uml#_65pboEL1EeSSlqpbHKLCqA"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_65zMoUL1EeSSlqpbHKLCqA"/>

+      </children>

+      <children xmi:type="notation:Shape" xmi:id="_Mv8HwUL2EeSSlqpbHKLCqA" type="3012">

+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_VFcaIEL2EeSSlqpbHKLCqA" name="maskLabel">

+          <stringListValue>visibility</stringListValue>

+          <stringListValue>name</stringListValue>

+          <stringListValue>derived</stringListValue>

+          <stringListValue>multiplicity</stringListValue>

+          <stringListValue>defaultValue</stringListValue>

+          <stringListValue>type</stringListValue>

+        </styles>

+        <element xmi:type="uml:Property" href="rsaToPapyrusParameters.uml#_Mv8HwEL2EeSSlqpbHKLCqA"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Mv8HwkL2EeSSlqpbHKLCqA"/>

+      </children>

+      <children xmi:type="notation:Shape" xmi:id="_WuBhgEL2EeSSlqpbHKLCqA" type="3012">

+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_aEtJcEL2EeSSlqpbHKLCqA" name="maskLabel">

+          <stringListValue>visibility</stringListValue>

+          <stringListValue>name</stringListValue>

+          <stringListValue>derived</stringListValue>

+          <stringListValue>multiplicity</stringListValue>

+          <stringListValue>defaultValue</stringListValue>

+          <stringListValue>type</stringListValue>

+        </styles>

+        <element xmi:type="uml:Property" href="rsaToPapyrusParameters.uml#_Wt4XkEL2EeSSlqpbHKLCqA"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WuBhgUL2EeSSlqpbHKLCqA"/>

+      </children>

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

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

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

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

+    </children>

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

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

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

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

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

+    </children>

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

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

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

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

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

+    </children>

+    <element xmi:type="uml:Class" href="rsaToPapyrusParameters.uml#_tKu0kEL1EeSSlqpbHKLCqA"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tKu0kkL1EeSSlqpbHKLCqA" x="502" y="294"/>

+  </children>

+  <styles xmi:type="notation:StringValueStyle" xmi:id="_ffjeAUL1EeSSlqpbHKLCqA" name="diagram_compatibility_version" stringValue="1.0.0"/>

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

+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_ffjeA0L1EeSSlqpbHKLCqA">

+    <owner xmi:type="uml:Model" href="rsaToPapyrusParameters.uml#_fduSAEL1EeSSlqpbHKLCqA"/>

+  </styles>

+  <element xmi:type="uml:Model" href="rsaToPapyrusParameters.uml#_fduSAEL1EeSSlqpbHKLCqA"/>

+</notation:Diagram>

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/rsaToPapyrusParameters.uml b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/rsaToPapyrusParameters.uml
new file mode 100644
index 00000000000..ceade5ef0e7
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/rsaToPapyrusParameters.uml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_sYse0YZLEeKyw49uR6nx3g">

+  <uml:Model xmi:id="_fduSAEL1EeSSlqpbHKLCqA" name="RSAToPapyrusParameters">

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

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

+    </packageImport>

+    <packagedElement xmi:type="uml:Class" xmi:id="_tKu0kEL1EeSSlqpbHKLCqA" name="Config">

+      <ownedAttribute xmi:type="uml:Property" xmi:id="_t42e0EL1EeSSlqpbHKLCqA" name="convertOpaqueExpressionToLiteralString" visibility="public" isUnique="false">

+        <ownedComment xmi:type="uml:Comment" xmi:id="_sSSQAEL9EeSX267OQHSClQ" annotatedElement="_t42e0EL1EeSSlqpbHKLCqA">

+          <body>If true, the Opaque Expressions with a single body and no language (or a single empty language) will be converted to LiteralString</body>

+        </ownedComment>

+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0H-TgEL1EeSSlqpbHKLCqA" value="1"/>

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0IHdcEL1EeSSlqpbHKLCqA" value="1"/>

+        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_3f1nMEL1EeSSlqpbHKLCqA" value="true"/>

+      </ownedAttribute>

+      <ownedAttribute xmi:type="uml:Property" xmi:id="_65pboEL1EeSSlqpbHKLCqA" name="removeUnmappedProfilesAndStereotypes" visibility="public" isUnique="false">

+        <ownedComment xmi:type="uml:Comment" xmi:id="_zDs5cEL9EeSX267OQHSClQ" annotatedElement="_65pboEL1EeSSlqpbHKLCqA">

+          <body>If true, the unsupported RSA profiles and stereotypes will be deleted. This includes the Deployment profile and a few stereotypes</body>

+        </ownedComment>

+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Gy7WwEL2EeSSlqpbHKLCqA" value="1"/>

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Gy7WwUL2EeSSlqpbHKLCqA" value="1"/>

+        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_H7rHgEL2EeSSlqpbHKLCqA" value="true"/>

+      </ownedAttribute>

+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Mv8HwEL2EeSSlqpbHKLCqA" name="removeUnmappedAnnotations" visibility="public" isUnique="false">

+        <ownedComment xmi:type="uml:Comment" xmi:id="_rogy4EMAEeSX267OQHSClQ" annotatedElement="_Mv8HwEL2EeSSlqpbHKLCqA">

+          <body>If true, the unmapped RSA EAnnotations will be deleted from the imported model</body>

+        </ownedComment>

+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_S39O4EL2EeSSlqpbHKLCqA" value="1"/>

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S39O4UL2EeSSlqpbHKLCqA" value="1"/>

+        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_UQehAEL2EeSSlqpbHKLCqA"/>

+      </ownedAttribute>

+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Wt4XkEL2EeSSlqpbHKLCqA" name="removeUnmappedDiagrams" visibility="public" isUnique="false">

+        <ownedComment xmi:type="uml:Comment" xmi:id="_YchfIEMAEeSX267OQHSClQ" annotatedElement="_Wt4XkEL2EeSSlqpbHKLCqA">

+          <body>If true, the diagrams which were not migrated will be removed. Otherwise, only the successfully imported diagrams will be removed</body>

+        </ownedComment>

+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Yj3BwEL2EeSSlqpbHKLCqA" value="1"/>

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Yj3BwUL2EeSSlqpbHKLCqA" value="1"/>

+        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_Zf9doEL2EeSSlqpbHKLCqA"/>

+      </ownedAttribute>

+    </packagedElement>

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

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

+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_sYse0YZLEeKyw49uR6nx3g"/>

+      </eAnnotations>

+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

+    </profileApplication>

+  </uml:Model>

+  <ActionLanguage:TextualRepresentation xmi:id="_zhuy4EL1EeSSlqpbHKLCqA" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>

+  <ActionLanguage:TextualRepresentation xmi:id="_8D4aIUL1EeSSlqpbHKLCqA" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>

+</xmi:XMI>

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/plugin.properties b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/plugin.properties
new file mode 100644
index 00000000000..941bc8ea969
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/plugin.properties
@@ -0,0 +1,11 @@
+#

+

+pluginName = RSA to Papyrus Import tool

+providerName = Eclipse Modeling Project

+

+_UI_UML_rsa_content_type = UML2 UML File (imported from RSA)

+_UI_UML_2_0_0_rsa_content_type = UML2 2.0.0 UML File (imported from RSA)

+_UI_UML_2_1_0_rsa_content_type = UML2 2.1.0 UML File (imported from RSA)

+_UI_UML_3_0_0_rsa_content_type = UML2 3.0.0 UML File (imported from RSA)

+_UI_UML_4_0_0_rsa_content_type = UML2 4.0.0 UML File (imported from RSA)

+_UI_UML_5_0_0_rsa_content_type = UML2 5.0.0 UML File (imported from RSA)

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/plugin.xml b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/plugin.xml
new file mode 100644
index 00000000000..d7d3d0df3cb
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/plugin.xml
@@ -0,0 +1,432 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+   <extension

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

+      <menuContribution

+            allPopups="false"

+            locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu?after=additions">

+         <command

+               commandId="org.eclipse.papyrus.migration.rsa.import"

+               style="push">

+            <visibleWhen

+                  checkEnabled="false">

+               <with

+                     variable="selection">

+                  <iterate

+                        ifEmpty="false"

+                        operator="or">

+                     <adapt

+                           type="org.eclipse.core.resources.IFile">

+                        <or>

+                           <test

+                                 property="org.eclipse.core.resources.extension"

+                                 value="emx">

+                           </test>

+                           <test

+                                 property="org.eclipse.core.resources.extension"

+                                 value="epx">

+                           </test>

+                        </or>

+                     </adapt>

+                  </iterate>

+               </with>

+            </visibleWhen>

+         </command>

+      </menuContribution>

+   </extension>

+   <extension

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

+      <command

+            defaultHandler="org.eclipse.papyrus.migration.rsa.handler.ImportHandler"

+            id="org.eclipse.papyrus.migration.rsa.import"

+            name="Import RSA Model/Profile">

+      </command>

+   </extension>

+

+   <extension

+         point="org.eclipse.emf.ecore.content_parser">

+      <parser

+            class="org.eclipse.uml2.uml.internal.resource.UML22UMLResourceFactoryImpl"

+            contentTypeIdentifier="org.eclipse.uml2.uml_2_0_0.rsa">

+      </parser>

+      <parser

+            class="org.eclipse.uml2.uml.internal.resource.UML212UMLResourceFactoryImpl"

+            contentTypeIdentifier="org.eclipse.uml2.uml_2_1_0.rsa">

+      </parser>

+      <parser

+            class="org.eclipse.uml2.uml.internal.resource.UML302UMLResourceFactoryImpl"

+            contentTypeIdentifier="org.eclipse.uml2.uml_3_0_0.rsa">

+      </parser>

+      <parser

+            class="org.eclipse.uml2.uml.internal.resource.UML402UMLResourceFactoryImpl"

+            contentTypeIdentifier="org.eclipse.uml2.uml_4_0_0.rsa">

+      </parser>

+      <parser

+            class="org.eclipse.uml2.uml.internal.resource.UMLResourceFactoryImpl"

+            contentTypeIdentifier="org.eclipse.uml2.uml_5_0_0.rsa">

+      </parser>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated PapyrusRSANotation -->

+      <package

+            uri="http://www.eclipse.org/papyrus/umlnotation"

+            class="org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage"

+            genModel="model/PapyrusUMLNotation.genmodel"/>

+      <package

+            class="org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage"

+            genModel="model/PapyrusUMLNotation.genmodel"

+            uri="http://www.ibm.com/xtools/1.5.3/Umlnotation">

+      </package>

+   </extension>

+

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated PapyrusDefault -->

+      <package

+            uri="http://www.eclipse.org/papyrus/profile/default"

+            class="org.eclipse.papyrus.migration.rsa.default_.DefaultPackage"

+            genModel="model/PapyrusDefault.genmodel"/>

+      <package

+            class="org.eclipse.papyrus.migration.rsa.default_.DefaultPackage"

+            genModel="model/PapyrusDefault.genmodel"

+            uri="http:///schemas/Default/1">

+      </package>

+      <package

+            class="org.eclipse.papyrus.migration.rsa.default_.DefaultPackage"

+            genModel="model/PapyrusDefault.genmodel"

+            uri="http:///schemas/Default/_fNm3AAqoEd6-N_NOT9vsCA/2">

+      </package>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated PapyrusProfileBase -->

+      <package

+            uri="http://www.eclipse.org/papyrus/profile/profilebase"

+            class="org.eclipse.papyrus.migration.rsa.profilebase.ProfileBasePackage"

+            genModel="model/PapyrusProfileBase.genmodel"/>

+      <package

+            class="org.eclipse.papyrus.migration.rsa.profilebase.ProfileBasePackage"

+            genModel="model/PapyrusProfileBase.genmodel"

+            uri="http:///schemas/ProfileBase/1">

+      </package>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated PapyrusRT -->

+      <package

+            uri="http://www.eclipse.org/papyrus/profile/umlrt"

+            class="org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage"

+            genModel="model/PapyrusRT.genmodel"/>

+      <package

+            class="org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage"

+            genModel="model/PapyrusRT.genmodel"

+            uri="http:///schemas/UMLRealTime/_3TUzoHq6Ed2hSeAAWZznoA/119">

+      </package>

+   </extension>

+   <extension

+         point="org.eclipse.m2m.qvt.oml.javaBlackboxUnits">

+      <unit

+            description="Java helpers to refactor UML types"

+            name="RTMappings"

+            namespace="org.eclipse.papyrus.migration.rsa">

+         <library

+               class="org.eclipse.papyrus.migration.rsa.blackbox.RTMappings">

+            <metamodel

+                  nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+            </metamodel>

+         </library>

+      </unit>

+      <unit

+            description="Java helpers to manipulate ProfileBase"

+            name="ProfileBaseHelper"

+            namespace="org.eclipse.papyrus.migration.rsa">

+         <library

+               class="org.eclipse.papyrus.migration.rsa.blackbox.ProfileBaseHelper">

+            <metamodel

+                  nsURI="http://www.eclipse.org/papyrus/profile/profilebase">

+            </metamodel>

+         </library>

+      </unit>

+   </extension>

+   <extension

+         point="org.eclipse.team.core.fileTypes">

+      <fileTypes

+            extension="emx"

+            type="text">

+      </fileTypes>

+      <fileTypes

+            extension="epx"

+            type="text">

+      </fileTypes>

+      <fileTypes

+            extension="efx"

+            type="text">

+      </fileTypes>

+   </extension>

+   <extension

+         point="org.eclipse.core.contenttype.contentTypes">

+      <!--content-type

+            base-type="org.eclipse.emf.ecore.xmi"

+            file-extensions="emx,efx,epx,uml"

+            id="org.eclipse.uml2.uml"

+            name="%_UI_UML_content_type"

+            priority="high">

+         <describer

+               class="org.eclipse.papyrus.migration.rsa.contenttype.ExtendedXMLContentHandlerImpl$Describer">

+            <parameter

+                  name="namespacePattern"

+                  value="http://www\.eclipse\.org/uml2/(2\.0\.0|2\.1\.0|3\.0\.0|4\.0\.0|5\.0\.0)/UML">

+            </parameter>

+            <parameter

+                  name="kind"

+                  value="xmi">

+            </parameter>

+         </describer>

+      </content-type>

+      <content-type

+            base-type="org.eclipse.uml2.uml"

+            file-extensions="emx,efx,epx,uml"

+            id="org.eclipse.uml2.uml_2_0_0"

+            name="%_UI_UML_2_0_0_content_type"

+            priority="high">

+         <describer

+               class="org.eclipse.papyrus.migration.rsa.contenttype.ExtendedXMLContentHandlerImpl$Describer">

+            <parameter

+                  name="namespace"

+                  value="http://www.eclipse.org/uml2/2.0.0/UML">

+            </parameter>

+            <parameter

+                  name="kind"

+                  value="xmi">

+            </parameter>

+         </describer>

+      </content-type>

+      <content-type

+            base-type="org.eclipse.uml2.uml"

+            file-extensions="emx,efx,epx,uml"

+            id="org.eclipse.uml2.uml_2_1_0"

+            name="%_UI_UML_2_1_0_content_type"

+            priority="high">

+         <describer

+               class="org.eclipse.papyrus.migration.rsa.contenttype.ExtendedXMLContentHandlerImpl$Describer">

+            <parameter

+                  name="namespace"

+                  value="http://www.eclipse.org/uml2/2.1.0/UML">

+            </parameter>

+            <parameter

+                  name="kind"

+                  value="xmi">

+            </parameter>

+         </describer>

+      </content-type>

+      <content-type

+            base-type="org.eclipse.uml2.uml"

+            file-extensions="emx,efx,epx,uml"

+            id="org.eclipse.uml2.uml_3_0_0"

+            name="%_UI_UML_3_0_0_content_type"

+            priority="high">

+         <describer

+               class="org.eclipse.papyrus.migration.rsa.contenttype.ExtendedXMLContentHandlerImpl$Describer">

+            <parameter

+                  name="namespace"

+                  value="http://www.eclipse.org/uml2/3.0.0/UML">

+            </parameter>

+            <parameter

+                  name="kind"

+                  value="xmi">

+            </parameter>

+         </describer>

+      </content-type>

+      <content-type

+            base-type="org.eclipse.uml2.uml"

+            file-extensions="emx,efx,epx,uml"

+            id="org.eclipse.uml2.uml_4_0_0"

+            name="%_UI_UML_4_0_0_content_type"

+            priority="high">

+         <describer

+               class="org.eclipse.papyrus.migration.rsa.contenttype.ExtendedXMLContentHandlerImpl$Describer">

+            <parameter

+                  name="namespace"

+                  value="http://www.eclipse.org/uml2/4.0.0/UML">

+            </parameter>

+            <parameter

+                  name="kind"

+                  value="xmi">

+            </parameter>

+         </describer>

+      </content-type>

+      <content-type

+            base-type="org.eclipse.uml2.uml"

+            file-extensions="emx,efx,epx,uml"

+            id="org.eclipse.uml2.uml_5_0_0"

+            name="%_UI_UML_5_0_0_content_type"

+            priority="high">

+         <describer

+               class="org.eclipse.papyrus.migration.rsa.contenttype.ExtendedXMLContentHandlerImpl$Describer">

+            <parameter

+                  name="namespace"

+                  value="http://www.eclipse.org/uml2/5.0.0/UML">

+            </parameter>

+            <parameter

+                  name="kind"

+                  value="xmi">

+            </parameter>

+         </describer>

+      </content-type-->

+      <file-association

+            content-type="org.eclipse.uml2.uml.rsa"

+            file-extensions="epx,emx,efx">

+      </file-association>

+      <file-association

+            content-type="org.eclipse.uml2.uml_2_1_0.rsa"

+            file-extensions="epx,emx,efx">

+      </file-association>

+      <file-association

+            content-type="org.eclipse.uml2.uml_3_0_0.rsa"

+            file-extensions="epx,emx,efx">

+      </file-association>

+      <file-association

+            content-type="org.eclipse.uml2.uml_4_0_0.rsa"

+            file-extensions="epx,emx,efx">

+      </file-association>

+      <file-association

+            content-type="org.eclipse.uml2.uml_5_0_0.rsa"

+            file-extensions="epx,emx,efx">

+      </file-association>

+   </extension>

+   <extension

+         point="org.eclipse.core.contenttype.contentTypes">

+      <content-type

+            base-type="org.eclipse.uml2.uml"

+            file-extensions="epx,emx,efx"

+            id="org.eclipse.uml2.uml.rsa"

+            name="%_UI_UML_rsa_content_type"

+            priority="normal">

+         <describer

+               class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">

+            <parameter

+                  name="namespacePattern"

+                  value="http://www\.eclipse\.org/uml2/(2\.0\.0|2\.1\.0|3\.0\.0|4\.0\.0|5\.0\.0)/UML">

+            </parameter>

+            <parameter

+                  name="kind"

+                  value="xmi">

+            </parameter>

+         </describer>

+      </content-type>

+      <content-type

+            base-type="org.eclipse.uml2.uml_2_0_0"

+            file-extensions="epx,emx,efx"

+            id="org.eclipse.uml2.uml_2_0_0.rsa"

+            name="%_UI_UML_2_0_0_rsa_content_type"

+            priority="high">

+         <describer

+               class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">

+            <parameter

+                  name="namespace"

+                  value="http://www.eclipse.org/uml2/2.0.0/UML">

+            </parameter>

+            <parameter

+                  name="kind"

+                  value="xmi">

+            </parameter>

+         </describer>

+      </content-type>

+      <content-type

+            base-type="org.eclipse.uml2.uml_2_1_0"

+            file-extensions="epx,emx,efx"

+            id="org.eclipse.uml2.uml_2_1_0.rsa"

+            name="%_UI_UML_2_1_0_rsa_content_type"

+            priority="high">

+         <describer

+               class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">

+            <parameter

+                  name="namespace"

+                  value="http://www.eclipse.org/uml2/2.1.0/UML">

+            </parameter>

+            <parameter

+                  name="kind"

+                  value="xmi">

+            </parameter>

+         </describer>

+      </content-type>

+      <content-type

+            base-type="org.eclipse.uml2.uml_3_0_0"

+            file-extensions="epx,emx,efx"

+            id="org.eclipse.uml2.uml_3_0_0.rsa"

+            name="%_UI_UML_3_0_0_rsa_content_type"

+            priority="high">

+         <describer

+               class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">

+            <parameter

+                  name="namespace"

+                  value="http://www.eclipse.org/uml2/3.0.0/UML">

+            </parameter>

+            <parameter

+                  name="kind"

+                  value="xmi">

+            </parameter>

+         </describer>

+      </content-type>

+      <content-type

+            base-type="org.eclipse.uml2.uml_4_0_0"

+            file-extensions="epx,emx,efx"

+            id="org.eclipse.uml2.uml_4_0_0.rsa"

+            name="%_UI_UML_4_0_0_rsa_content_type"

+            priority="high">

+         <describer

+               class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">

+            <parameter

+                  name="namespace"

+                  value="http://www.eclipse.org/uml2/4.0.0/UML">

+            </parameter>

+            <parameter

+                  name="kind"

+                  value="xmi">

+            </parameter>

+         </describer>

+      </content-type>

+      <content-type

+            base-type="org.eclipse.uml2.uml_5_0_0"

+            file-extensions="epx,emx,efx"

+            id="org.eclipse.uml2.uml_5_0_0.rsa"

+            name="%_UI_UML_5_0_0_rsa_content_type"

+            priority="high">

+         <describer

+               class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">

+            <parameter

+                  name="namespace"

+                  value="http://www.eclipse.org/uml2/5.0.0/UML">

+            </parameter>

+            <parameter

+                  name="kind"

+                  value="xmi">

+            </parameter>

+         </describer>

+      </content-type>

+   </extension>

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated rsaToPapyrusParameters -->

+      <package

+            uri="http:///RSAToPapyrusParameters.ecore"

+            class="org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage"

+            genModel="model/ui/rsaToPapyrusParameters.genmodel"/>

+   </extension>

+   <extension

+         point="org.eclipse.papyrus.views.properties.context">

+      <context

+            contextModel="dialog/RSAToPapyrusParameters.ctx"

+            isCustomizable="false">

+      </context>

+   </extension>

+   <extension

+         point="org.eclipse.uml2.uml.generated_package">

+      <profile

+            location="platform:/plugin/org.eclipse.papyrus.migration.rsa/model/ui/rsaToPapyrusParameters.uml"

+            uri="http:///RSAToPapyrusParameters.ecore">

+      </profile>

+   </extension>

+

+</plugin>

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/pom.xml b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/pom.xml
new file mode 100644
index 00000000000..6e1caf8dbaa
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>1.1.0-SNAPSHOT</version>
+		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.migration.rsa</artifactId>
+	<groupId>org.eclipse.papyrus</groupId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/Config.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/Config.java
new file mode 100644
index 00000000000..8003870bd1a
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/Config.java
@@ -0,0 +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:

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

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

+package org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters;

+

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

+

+/**

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

+ * A representation of the model object '<em><b>Config</b></em>'.

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

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#isConvertOpaqueExpressionToLiteralString <em>Convert Opaque Expression To Literal String</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#isRemoveUnmappedProfilesAndStereotypes <em>Remove Unmapped Profiles And Stereotypes</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#isRemoveUnmappedAnnotations <em>Remove Unmapped Annotations</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#isRemoveUnmappedDiagrams <em>Remove Unmapped Diagrams</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage#getConfig()

+ * @model

+ * @generated

+ */

+public interface Config extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Convert Opaque Expression To Literal String</b></em>' attribute.

+	 * The default value is <code>"true"</code>.

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

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

+	 * <!-- begin-model-doc -->

+	 * If true, the Opaque Expressions with a single body and no language (or a single empty language) will be converted to LiteralString

+	 * <!-- end-model-doc -->

+	 *

+	 * @return the value of the '<em>Convert Opaque Expression To Literal String</em>' attribute.

+	 * @see #setConvertOpaqueExpressionToLiteralString(boolean)

+	 * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage#getConfig_ConvertOpaqueExpressionToLiteralString()

+	 * @model default="true" unique="false" dataType="org.eclipse.uml2.types.Boolean" required="true" ordered="false"

+	 * @generated

+	 */

+	boolean isConvertOpaqueExpressionToLiteralString();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#isConvertOpaqueExpressionToLiteralString <em>Convert Opaque Expression To Literal String</em>}' attribute.

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

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

+	 *

+	 * @param value

+	 *            the new value of the '<em>Convert Opaque Expression To Literal String</em>' attribute.

+	 * @see #isConvertOpaqueExpressionToLiteralString()

+	 * @generated

+	 */

+	void setConvertOpaqueExpressionToLiteralString(boolean value);

+

+	/**

+	 * Returns the value of the '<em><b>Remove Unmapped Profiles And Stereotypes</b></em>' attribute.

+	 * The default value is <code>"true"</code>.

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

+	 * <p>

+	 * If the meaning of the '<em>Remove Unmapped Profiles And Stereotypes</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

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

+	 * <!-- begin-model-doc -->

+	 * If true, the unsupported RSA profiles and stereotypes will be deleted. This includes the Deployment profile and a few stereotypes

+	 * <!-- end-model-doc -->

+	 *

+	 * @return the value of the '<em>Remove Unmapped Profiles And Stereotypes</em>' attribute.

+	 * @see #setRemoveUnmappedProfilesAndStereotypes(boolean)

+	 * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage#getConfig_RemoveUnmappedProfilesAndStereotypes()

+	 * @model default="true" unique="false" dataType="org.eclipse.uml2.types.Boolean" required="true" ordered="false"

+	 * @generated

+	 */

+	boolean isRemoveUnmappedProfilesAndStereotypes();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#isRemoveUnmappedProfilesAndStereotypes <em>Remove Unmapped Profiles And Stereotypes</em>}' attribute.

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

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

+	 *

+	 * @param value

+	 *            the new value of the '<em>Remove Unmapped Profiles And Stereotypes</em>' attribute.

+	 * @see #isRemoveUnmappedProfilesAndStereotypes()

+	 * @generated

+	 */

+	void setRemoveUnmappedProfilesAndStereotypes(boolean value);

+

+	/**

+	 * Returns the value of the '<em><b>Remove Unmapped Annotations</b></em>' attribute.

+	 * The default value is <code>"false"</code>.

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

+	 * <p>

+	 * If the meaning of the '<em>Remove Unmapped Annotations</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

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

+	 * <!-- begin-model-doc -->

+	 * If true, the unmapped RSA EAnnotations will be deleted from the imported model

+	 * <!-- end-model-doc -->

+	 *

+	 * @return the value of the '<em>Remove Unmapped Annotations</em>' attribute.

+	 * @see #setRemoveUnmappedAnnotations(boolean)

+	 * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage#getConfig_RemoveUnmappedAnnotations()

+	 * @model default="false" unique="false" dataType="org.eclipse.uml2.types.Boolean" required="true" ordered="false"

+	 * @generated

+	 */

+	boolean isRemoveUnmappedAnnotations();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#isRemoveUnmappedAnnotations <em>Remove Unmapped Annotations</em>}' attribute.

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

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

+	 *

+	 * @param value

+	 *            the new value of the '<em>Remove Unmapped Annotations</em>' attribute.

+	 * @see #isRemoveUnmappedAnnotations()

+	 * @generated

+	 */

+	void setRemoveUnmappedAnnotations(boolean value);

+

+	/**

+	 * Returns the value of the '<em><b>Remove Unmapped Diagrams</b></em>' attribute.

+	 * The default value is <code>"false"</code>.

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

+	 * <p>

+	 * If the meaning of the '<em>Remove Unmapped Diagrams</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

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

+	 * <!-- begin-model-doc -->

+	 * If true, the diagrams which were not migrated will be removed. Otherwise, only the succesfully imported diagrams will be removed

+	 * <!-- end-model-doc -->

+	 *

+	 * @return the value of the '<em>Remove Unmapped Diagrams</em>' attribute.

+	 * @see #setRemoveUnmappedDiagrams(boolean)

+	 * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage#getConfig_RemoveUnmappedDiagrams()

+	 * @model default="false" unique="false" dataType="org.eclipse.uml2.types.Boolean" required="true" ordered="false"

+	 * @generated

+	 */

+	boolean isRemoveUnmappedDiagrams();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#isRemoveUnmappedDiagrams <em>Remove Unmapped Diagrams</em>}' attribute.

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

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

+	 *

+	 * @param value

+	 *            the new value of the '<em>Remove Unmapped Diagrams</em>' attribute.

+	 * @see #isRemoveUnmappedDiagrams()

+	 * @generated

+	 */

+	void setRemoveUnmappedDiagrams(boolean value);

+

+} // Config

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/RSAToPapyrusParametersFactory.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/RSAToPapyrusParametersFactory.java
new file mode 100644
index 00000000000..79422dfc148
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/RSAToPapyrusParametersFactory.java
@@ -0,0 +1,55 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *    

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

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

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

+package org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters;

+

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

+

+/**

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

+ * The <b>Factory</b> for the model.

+ * It provides a create method for each non-abstract class of the model.

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

+ *

+ * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage

+ * @generated

+ */

+public interface RSAToPapyrusParametersFactory extends EFactory {

+	/**

+	 * The singleton instance of the factory.

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

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

+	 *

+	 * @generated

+	 */

+	RSAToPapyrusParametersFactory eINSTANCE = org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.RSAToPapyrusParametersFactoryImpl.init();

+

+	/**

+	 * Returns a new object of class '<em>Config</em>'.

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

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

+	 *

+	 * @return a new object of class '<em>Config</em>'.

+	 * @generated

+	 */

+	Config createConfig();

+

+	/**

+	 * Returns the package supported by this factory.

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

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

+	 *

+	 * @return the package supported by this factory.

+	 * @generated

+	 */

+	RSAToPapyrusParametersPackage getRSAToPapyrusParametersPackage();

+

+} // RSAToPapyrusParametersFactory

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/RSAToPapyrusParametersPackage.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/RSAToPapyrusParametersPackage.java
new file mode 100644
index 00000000000..84f1dc70100
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/RSAToPapyrusParametersPackage.java
@@ -0,0 +1,280 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *    

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

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

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

+package org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters;

+

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

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

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

+

+/**

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

+ * The <b>Package</b> for the model.

+ * It contains accessors for the meta objects to represent

+ * <ul>

+ * <li>each class,</li>

+ * <li>each feature of each class,</li>

+ * <li>each operation of each class,</li>

+ * <li>each enum,</li>

+ * <li>and each data type</li>

+ * </ul>

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

+ * <!-- begin-model-doc -->

+ * If true, the unsupported EAnnotation from RSA will be removed

+ * <!-- end-model-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersFactory

+ * @model kind="package"

+ * @generated

+ */

+public interface RSAToPapyrusParametersPackage extends EPackage {

+	/**

+	 * The package name.

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

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

+	 *

+	 * @generated

+	 */

+	String eNAME = "RSAToPapyrusParameters";

+

+	/**

+	 * The package namespace URI.

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

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

+	 *

+	 * @generated

+	 */

+	String eNS_URI = "http:///RSAToPapyrusParameters.ecore";

+

+	/**

+	 * The package namespace name.

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

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

+	 *

+	 * @generated

+	 */

+	String eNS_PREFIX = "RSAToPapyrusParameters";

+

+	/**

+	 * The singleton instance of the package.

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

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

+	 *

+	 * @generated

+	 */

+	RSAToPapyrusParametersPackage eINSTANCE = org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.RSAToPapyrusParametersPackageImpl.init();

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.ConfigImpl <em>Config</em>}' class.

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

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

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.ConfigImpl

+	 * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.RSAToPapyrusParametersPackageImpl#getConfig()

+	 * @generated

+	 */

+	int CONFIG = 0;

+

+	/**

+	 * The feature id for the '<em><b>Convert Opaque Expression To Literal String</b></em>' attribute.

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

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

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CONFIG__CONVERT_OPAQUE_EXPRESSION_TO_LITERAL_STRING = 0;

+

+	/**

+	 * The feature id for the '<em><b>Remove Unmapped Profiles And Stereotypes</b></em>' attribute.

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

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

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CONFIG__REMOVE_UNMAPPED_PROFILES_AND_STEREOTYPES = 1;

+

+	/**

+	 * The feature id for the '<em><b>Remove Unmapped Annotations</b></em>' attribute.

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

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

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CONFIG__REMOVE_UNMAPPED_ANNOTATIONS = 2;

+

+	/**

+	 * The feature id for the '<em><b>Remove Unmapped Diagrams</b></em>' attribute.

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

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

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CONFIG__REMOVE_UNMAPPED_DIAGRAMS = 3;

+

+	/**

+	 * The number of structural features of the '<em>Config</em>' class.

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

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

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CONFIG_FEATURE_COUNT = 4;

+

+	/**

+	 * The number of operations of the '<em>Config</em>' class.

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

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

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CONFIG_OPERATION_COUNT = 0;

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config <em>Config</em>}'.

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

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

+	 *

+	 * @return the meta object for class '<em>Config</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config

+	 * @generated

+	 */

+	EClass getConfig();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#isConvertOpaqueExpressionToLiteralString <em>Convert Opaque Expression To Literal String</em>}'.

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

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

+	 *

+	 * @return the meta object for the attribute '<em>Convert Opaque Expression To Literal String</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#isConvertOpaqueExpressionToLiteralString()

+	 * @see #getConfig()

+	 * @generated

+	 */

+	EAttribute getConfig_ConvertOpaqueExpressionToLiteralString();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#isRemoveUnmappedProfilesAndStereotypes <em>Remove Unmapped Profiles And Stereotypes</em>}'.

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

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

+	 *

+	 * @return the meta object for the attribute '<em>Remove Unmapped Profiles And Stereotypes</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#isRemoveUnmappedProfilesAndStereotypes()

+	 * @see #getConfig()

+	 * @generated

+	 */

+	EAttribute getConfig_RemoveUnmappedProfilesAndStereotypes();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#isRemoveUnmappedAnnotations <em>Remove Unmapped Annotations</em>}'.

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

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

+	 *

+	 * @return the meta object for the attribute '<em>Remove Unmapped Annotations</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#isRemoveUnmappedAnnotations()

+	 * @see #getConfig()

+	 * @generated

+	 */

+	EAttribute getConfig_RemoveUnmappedAnnotations();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#isRemoveUnmappedDiagrams <em>Remove Unmapped Diagrams</em>}'.

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

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

+	 *

+	 * @return the meta object for the attribute '<em>Remove Unmapped Diagrams</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#isRemoveUnmappedDiagrams()

+	 * @see #getConfig()

+	 * @generated

+	 */

+	EAttribute getConfig_RemoveUnmappedDiagrams();

+

+	/**

+	 * Returns the factory that creates the instances of the model.

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

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

+	 *

+	 * @return the factory that creates the instances of the model.

+	 * @generated

+	 */

+	RSAToPapyrusParametersFactory getRSAToPapyrusParametersFactory();

+

+	/**

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

+	 * Defines literals for the meta objects that represent

+	 * <ul>

+	 * <li>each class,</li>

+	 * <li>each feature of each class,</li>

+	 * <li>each operation of each class,</li>

+	 * <li>each enum,</li>

+	 * <li>and each data type</li>

+	 * </ul>

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

+	 *

+	 * @generated

+	 */

+	interface Literals {

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.ConfigImpl <em>Config</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.ConfigImpl

+		 * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.RSAToPapyrusParametersPackageImpl#getConfig()

+		 * @generated

+		 */

+		EClass CONFIG = eINSTANCE.getConfig();

+

+		/**

+		 * The meta object literal for the '<em><b>Convert Opaque Expression To Literal String</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute CONFIG__CONVERT_OPAQUE_EXPRESSION_TO_LITERAL_STRING = eINSTANCE.getConfig_ConvertOpaqueExpressionToLiteralString();

+

+		/**

+		 * The meta object literal for the '<em><b>Remove Unmapped Profiles And Stereotypes</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute CONFIG__REMOVE_UNMAPPED_PROFILES_AND_STEREOTYPES = eINSTANCE.getConfig_RemoveUnmappedProfilesAndStereotypes();

+

+		/**

+		 * The meta object literal for the '<em><b>Remove Unmapped Annotations</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute CONFIG__REMOVE_UNMAPPED_ANNOTATIONS = eINSTANCE.getConfig_RemoveUnmappedAnnotations();

+

+		/**

+		 * The meta object literal for the '<em><b>Remove Unmapped Diagrams</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute CONFIG__REMOVE_UNMAPPED_DIAGRAMS = eINSTANCE.getConfig_RemoveUnmappedDiagrams();

+

+	}

+

+} // RSAToPapyrusParametersPackage

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/ConfigImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/ConfigImpl.java
new file mode 100644
index 00000000000..b647ed95dca
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/ConfigImpl.java
@@ -0,0 +1,368 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config;

+import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Config</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.ConfigImpl#isConvertOpaqueExpressionToLiteralString <em>Convert Opaque Expression To Literal String</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.ConfigImpl#isRemoveUnmappedProfilesAndStereotypes <em>Remove Unmapped Profiles And Stereotypes</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.ConfigImpl#isRemoveUnmappedAnnotations <em>Remove Unmapped Annotations</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.ConfigImpl#isRemoveUnmappedDiagrams <em>Remove Unmapped Diagrams</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class ConfigImpl extends MinimalEObjectImpl.Container implements Config {

+	/**

+	 * The default value of the '{@link #isConvertOpaqueExpressionToLiteralString() <em>Convert Opaque Expression To Literal String</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isConvertOpaqueExpressionToLiteralString()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean CONVERT_OPAQUE_EXPRESSION_TO_LITERAL_STRING_EDEFAULT = true;

+

+	/**

+	 * The cached value of the '{@link #isConvertOpaqueExpressionToLiteralString() <em>Convert Opaque Expression To Literal String</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isConvertOpaqueExpressionToLiteralString()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean convertOpaqueExpressionToLiteralString = CONVERT_OPAQUE_EXPRESSION_TO_LITERAL_STRING_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #isRemoveUnmappedProfilesAndStereotypes() <em>Remove Unmapped Profiles And Stereotypes</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isRemoveUnmappedProfilesAndStereotypes()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean REMOVE_UNMAPPED_PROFILES_AND_STEREOTYPES_EDEFAULT = true;

+

+	/**

+	 * The cached value of the '{@link #isRemoveUnmappedProfilesAndStereotypes() <em>Remove Unmapped Profiles And Stereotypes</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isRemoveUnmappedProfilesAndStereotypes()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean removeUnmappedProfilesAndStereotypes = REMOVE_UNMAPPED_PROFILES_AND_STEREOTYPES_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #isRemoveUnmappedAnnotations() <em>Remove Unmapped Annotations</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isRemoveUnmappedAnnotations()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean REMOVE_UNMAPPED_ANNOTATIONS_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isRemoveUnmappedAnnotations() <em>Remove Unmapped Annotations</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isRemoveUnmappedAnnotations()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean removeUnmappedAnnotations = REMOVE_UNMAPPED_ANNOTATIONS_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #isRemoveUnmappedDiagrams() <em>Remove Unmapped Diagrams</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isRemoveUnmappedDiagrams()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean REMOVE_UNMAPPED_DIAGRAMS_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isRemoveUnmappedDiagrams() <em>Remove Unmapped Diagrams</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isRemoveUnmappedDiagrams()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean removeUnmappedDiagrams = REMOVE_UNMAPPED_DIAGRAMS_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected ConfigImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return RSAToPapyrusParametersPackage.Literals.CONFIG;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean isConvertOpaqueExpressionToLiteralString() {

+		return convertOpaqueExpressionToLiteralString;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setConvertOpaqueExpressionToLiteralString(boolean newConvertOpaqueExpressionToLiteralString) {

+		boolean oldConvertOpaqueExpressionToLiteralString = convertOpaqueExpressionToLiteralString;

+		convertOpaqueExpressionToLiteralString = newConvertOpaqueExpressionToLiteralString;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, RSAToPapyrusParametersPackage.CONFIG__CONVERT_OPAQUE_EXPRESSION_TO_LITERAL_STRING, oldConvertOpaqueExpressionToLiteralString, convertOpaqueExpressionToLiteralString));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean isRemoveUnmappedProfilesAndStereotypes() {

+		return removeUnmappedProfilesAndStereotypes;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setRemoveUnmappedProfilesAndStereotypes(boolean newRemoveUnmappedProfilesAndStereotypes) {

+		boolean oldRemoveUnmappedProfilesAndStereotypes = removeUnmappedProfilesAndStereotypes;

+		removeUnmappedProfilesAndStereotypes = newRemoveUnmappedProfilesAndStereotypes;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, RSAToPapyrusParametersPackage.CONFIG__REMOVE_UNMAPPED_PROFILES_AND_STEREOTYPES, oldRemoveUnmappedProfilesAndStereotypes, removeUnmappedProfilesAndStereotypes));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean isRemoveUnmappedAnnotations() {

+		return removeUnmappedAnnotations;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setRemoveUnmappedAnnotations(boolean newRemoveUnmappedAnnotations) {

+		boolean oldRemoveUnmappedAnnotations = removeUnmappedAnnotations;

+		removeUnmappedAnnotations = newRemoveUnmappedAnnotations;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, RSAToPapyrusParametersPackage.CONFIG__REMOVE_UNMAPPED_ANNOTATIONS, oldRemoveUnmappedAnnotations, removeUnmappedAnnotations));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean isRemoveUnmappedDiagrams() {

+		return removeUnmappedDiagrams;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setRemoveUnmappedDiagrams(boolean newRemoveUnmappedDiagrams) {

+		boolean oldRemoveUnmappedDiagrams = removeUnmappedDiagrams;

+		removeUnmappedDiagrams = newRemoveUnmappedDiagrams;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, RSAToPapyrusParametersPackage.CONFIG__REMOVE_UNMAPPED_DIAGRAMS, oldRemoveUnmappedDiagrams, removeUnmappedDiagrams));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case RSAToPapyrusParametersPackage.CONFIG__CONVERT_OPAQUE_EXPRESSION_TO_LITERAL_STRING:

+			return isConvertOpaqueExpressionToLiteralString();

+		case RSAToPapyrusParametersPackage.CONFIG__REMOVE_UNMAPPED_PROFILES_AND_STEREOTYPES:

+			return isRemoveUnmappedProfilesAndStereotypes();

+		case RSAToPapyrusParametersPackage.CONFIG__REMOVE_UNMAPPED_ANNOTATIONS:

+			return isRemoveUnmappedAnnotations();

+		case RSAToPapyrusParametersPackage.CONFIG__REMOVE_UNMAPPED_DIAGRAMS:

+			return isRemoveUnmappedDiagrams();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case RSAToPapyrusParametersPackage.CONFIG__CONVERT_OPAQUE_EXPRESSION_TO_LITERAL_STRING:

+			setConvertOpaqueExpressionToLiteralString((Boolean) newValue);

+			return;

+		case RSAToPapyrusParametersPackage.CONFIG__REMOVE_UNMAPPED_PROFILES_AND_STEREOTYPES:

+			setRemoveUnmappedProfilesAndStereotypes((Boolean) newValue);

+			return;

+		case RSAToPapyrusParametersPackage.CONFIG__REMOVE_UNMAPPED_ANNOTATIONS:

+			setRemoveUnmappedAnnotations((Boolean) newValue);

+			return;

+		case RSAToPapyrusParametersPackage.CONFIG__REMOVE_UNMAPPED_DIAGRAMS:

+			setRemoveUnmappedDiagrams((Boolean) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case RSAToPapyrusParametersPackage.CONFIG__CONVERT_OPAQUE_EXPRESSION_TO_LITERAL_STRING:

+			setConvertOpaqueExpressionToLiteralString(CONVERT_OPAQUE_EXPRESSION_TO_LITERAL_STRING_EDEFAULT);

+			return;

+		case RSAToPapyrusParametersPackage.CONFIG__REMOVE_UNMAPPED_PROFILES_AND_STEREOTYPES:

+			setRemoveUnmappedProfilesAndStereotypes(REMOVE_UNMAPPED_PROFILES_AND_STEREOTYPES_EDEFAULT);

+			return;

+		case RSAToPapyrusParametersPackage.CONFIG__REMOVE_UNMAPPED_ANNOTATIONS:

+			setRemoveUnmappedAnnotations(REMOVE_UNMAPPED_ANNOTATIONS_EDEFAULT);

+			return;

+		case RSAToPapyrusParametersPackage.CONFIG__REMOVE_UNMAPPED_DIAGRAMS:

+			setRemoveUnmappedDiagrams(REMOVE_UNMAPPED_DIAGRAMS_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case RSAToPapyrusParametersPackage.CONFIG__CONVERT_OPAQUE_EXPRESSION_TO_LITERAL_STRING:

+			return convertOpaqueExpressionToLiteralString != CONVERT_OPAQUE_EXPRESSION_TO_LITERAL_STRING_EDEFAULT;

+		case RSAToPapyrusParametersPackage.CONFIG__REMOVE_UNMAPPED_PROFILES_AND_STEREOTYPES:

+			return removeUnmappedProfilesAndStereotypes != REMOVE_UNMAPPED_PROFILES_AND_STEREOTYPES_EDEFAULT;

+		case RSAToPapyrusParametersPackage.CONFIG__REMOVE_UNMAPPED_ANNOTATIONS:

+			return removeUnmappedAnnotations != REMOVE_UNMAPPED_ANNOTATIONS_EDEFAULT;

+		case RSAToPapyrusParametersPackage.CONFIG__REMOVE_UNMAPPED_DIAGRAMS:

+			return removeUnmappedDiagrams != REMOVE_UNMAPPED_DIAGRAMS_EDEFAULT;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (convertOpaqueExpressionToLiteralString: ");

+		result.append(convertOpaqueExpressionToLiteralString);

+		result.append(", removeUnmappedProfilesAndStereotypes: ");

+		result.append(removeUnmappedProfilesAndStereotypes);

+		result.append(", removeUnmappedAnnotations: ");

+		result.append(removeUnmappedAnnotations);

+		result.append(", removeUnmappedDiagrams: ");

+		result.append(removeUnmappedDiagrams);

+		result.append(')');

+		return result.toString();

+	}

+

+} // ConfigImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/RSAToPapyrusParametersFactoryImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/RSAToPapyrusParametersFactoryImpl.java
new file mode 100644
index 00000000000..282b3e733df
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/RSAToPapyrusParametersFactoryImpl.java
@@ -0,0 +1,112 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.impl.EFactoryImpl;

+import org.eclipse.emf.ecore.plugin.EcorePlugin;

+import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config;

+import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersFactory;

+import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Factory</b>.

+ * <!-- end-user-doc -->

+ *

+ * @generated

+ */

+public class RSAToPapyrusParametersFactoryImpl extends EFactoryImpl implements RSAToPapyrusParametersFactory {

+	/**

+	 * Creates the default factory implementation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static RSAToPapyrusParametersFactory init() {

+		try {

+			RSAToPapyrusParametersFactory theRSAToPapyrusParametersFactory = (RSAToPapyrusParametersFactory) EPackage.Registry.INSTANCE.getEFactory(RSAToPapyrusParametersPackage.eNS_URI);

+			if (theRSAToPapyrusParametersFactory != null) {

+				return theRSAToPapyrusParametersFactory;

+			}

+		} catch (Exception exception) {

+			EcorePlugin.INSTANCE.log(exception);

+		}

+		return new RSAToPapyrusParametersFactoryImpl();

+	}

+

+	/**

+	 * Creates an instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public RSAToPapyrusParametersFactoryImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EObject create(EClass eClass) {

+		switch (eClass.getClassifierID()) {

+		case RSAToPapyrusParametersPackage.CONFIG:

+			return createConfig();

+		default:

+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Config createConfig() {

+		ConfigImpl config = new ConfigImpl();

+		return config;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public RSAToPapyrusParametersPackage getRSAToPapyrusParametersPackage() {

+		return (RSAToPapyrusParametersPackage) getEPackage();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @deprecated

+	 * @generated

+	 */

+	@Deprecated

+	public static RSAToPapyrusParametersPackage getPackage() {

+		return RSAToPapyrusParametersPackage.eINSTANCE;

+	}

+

+} // RSAToPapyrusParametersFactoryImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/RSAToPapyrusParametersPackageImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/RSAToPapyrusParametersPackageImpl.java
new file mode 100644
index 00000000000..c9541c70f6b
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/RSAToPapyrusParametersPackageImpl.java
@@ -0,0 +1,248 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl;

+

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.impl.EPackageImpl;

+import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config;

+import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersFactory;

+import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage;

+import org.eclipse.uml2.types.TypesPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Package</b>.

+ * <!-- end-user-doc -->

+ *

+ * @generated

+ */

+public class RSAToPapyrusParametersPackageImpl extends EPackageImpl implements RSAToPapyrusParametersPackage {

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass configEClass = null;

+

+	/**

+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

+	 * package URI value.

+	 * <p>

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.emf.ecore.EPackage.Registry

+	 * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage#eNS_URI

+	 * @see #init()

+	 * @generated

+	 */

+	private RSAToPapyrusParametersPackageImpl() {

+		super(eNS_URI, RSAToPapyrusParametersFactory.eINSTANCE);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private static boolean isInited = false;

+

+	/**

+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

+	 *

+	 * <p>

+	 * This method is used to initialize {@link RSAToPapyrusParametersPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!--

+	 * end-user-doc -->

+	 *

+	 * @see #eNS_URI

+	 * @see #createPackageContents()

+	 * @see #initializePackageContents()

+	 * @generated

+	 */

+	public static RSAToPapyrusParametersPackage init() {

+		if (isInited) {

+			return (RSAToPapyrusParametersPackage) EPackage.Registry.INSTANCE.getEPackage(RSAToPapyrusParametersPackage.eNS_URI);

+		}

+

+		// Obtain or create and register package

+		RSAToPapyrusParametersPackageImpl theRSAToPapyrusParametersPackage = (RSAToPapyrusParametersPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RSAToPapyrusParametersPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)

+				: new RSAToPapyrusParametersPackageImpl());

+

+		isInited = true;

+

+		// Initialize simple dependencies

+		TypesPackage.eINSTANCE.eClass();

+

+		// Create package meta-data objects

+		theRSAToPapyrusParametersPackage.createPackageContents();

+

+		// Initialize created meta-data

+		theRSAToPapyrusParametersPackage.initializePackageContents();

+

+		// Mark meta-data to indicate it can't be changed

+		theRSAToPapyrusParametersPackage.freeze();

+

+

+		// Update the registry and return the package

+		EPackage.Registry.INSTANCE.put(RSAToPapyrusParametersPackage.eNS_URI, theRSAToPapyrusParametersPackage);

+		return theRSAToPapyrusParametersPackage;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getConfig() {

+		return configEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getConfig_ConvertOpaqueExpressionToLiteralString() {

+		return (EAttribute) configEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getConfig_RemoveUnmappedProfilesAndStereotypes() {

+		return (EAttribute) configEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getConfig_RemoveUnmappedAnnotations() {

+		return (EAttribute) configEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getConfig_RemoveUnmappedDiagrams() {

+		return (EAttribute) configEClass.getEStructuralFeatures().get(3);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public RSAToPapyrusParametersFactory getRSAToPapyrusParametersFactory() {

+		return (RSAToPapyrusParametersFactory) getEFactoryInstance();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private boolean isCreated = false;

+

+	/**

+	 * Creates the meta-model objects for the package. This method is

+	 * guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public void createPackageContents() {

+		if (isCreated) {

+			return;

+		}

+		isCreated = true;

+

+		// Create classes and their features

+		configEClass = createEClass(CONFIG);

+		createEAttribute(configEClass, CONFIG__CONVERT_OPAQUE_EXPRESSION_TO_LITERAL_STRING);

+		createEAttribute(configEClass, CONFIG__REMOVE_UNMAPPED_PROFILES_AND_STEREOTYPES);

+		createEAttribute(configEClass, CONFIG__REMOVE_UNMAPPED_ANNOTATIONS);

+		createEAttribute(configEClass, CONFIG__REMOVE_UNMAPPED_DIAGRAMS);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private boolean isInitialized = false;

+

+	/**

+	 * Complete the initialization of the package and its meta-model. This

+	 * method is guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public void initializePackageContents() {

+		if (isInitialized) {

+			return;

+		}

+		isInitialized = true;

+

+		// Initialize package

+		setName(eNAME);

+		setNsPrefix(eNS_PREFIX);

+		setNsURI(eNS_URI);

+

+		// Obtain other dependent packages

+		TypesPackage theTypesPackage = (TypesPackage) EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);

+

+		// Create type parameters

+

+		// Set bounds for type parameters

+

+		// Add supertypes to classes

+

+		// Initialize classes, features, and operations; add parameters

+		initEClass(configEClass, Config.class, "Config", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getConfig_ConvertOpaqueExpressionToLiteralString(), theTypesPackage.getBoolean(), "convertOpaqueExpressionToLiteralString", "true", 1, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,

+				!IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getConfig_RemoveUnmappedProfilesAndStereotypes(), theTypesPackage.getBoolean(), "removeUnmappedProfilesAndStereotypes", "true", 1, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,

+				!IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getConfig_RemoveUnmappedAnnotations(), theTypesPackage.getBoolean(), "removeUnmappedAnnotations", "false", 1, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getConfig_RemoveUnmappedDiagrams(), theTypesPackage.getBoolean(), "removeUnmappedDiagrams", "false", 1, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+

+		// Create resource

+		createResource(eNS_URI);

+	}

+

+} // RSAToPapyrusParametersPackageImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/util/RSAToPapyrusParametersAdapterFactory.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/util/RSAToPapyrusParametersAdapterFactory.java
new file mode 100644
index 00000000000..63cad4e3761
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/util/RSAToPapyrusParametersAdapterFactory.java
@@ -0,0 +1,137 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.util;

+

+import org.eclipse.emf.common.notify.Adapter;

+import org.eclipse.emf.common.notify.Notifier;

+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config;

+import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Adapter Factory</b> for the model.

+ * It provides an adapter <code>createXXX</code> method for each class of the model.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage

+ * @generated

+ */

+public class RSAToPapyrusParametersAdapterFactory extends AdapterFactoryImpl {

+	/**

+	 * The cached model package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected static RSAToPapyrusParametersPackage modelPackage;

+

+	/**

+	 * Creates an instance of the adapter factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public RSAToPapyrusParametersAdapterFactory() {

+		if (modelPackage == null) {

+			modelPackage = RSAToPapyrusParametersPackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Returns whether this factory is applicable for the type of the object.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return whether this factory is applicable for the type of the object.

+	 * @generated

+	 */

+	@Override

+	public boolean isFactoryForType(Object object) {

+		if (object == modelPackage) {

+			return true;

+		}

+		if (object instanceof EObject) {

+			return ((EObject) object).eClass().getEPackage() == modelPackage;

+		}

+		return false;

+	}

+

+	/**

+	 * The switch that delegates to the <code>createXXX</code> methods.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected RSAToPapyrusParametersSwitch<Adapter> modelSwitch =

+			new RSAToPapyrusParametersSwitch<Adapter>() {

+				@Override

+				public Adapter caseConfig(Config object) {

+					return createConfigAdapter();

+				}

+

+				@Override

+				public Adapter defaultCase(EObject object) {

+					return createEObjectAdapter();

+				}

+			};

+

+	/**

+	 * Creates an adapter for the <code>target</code>.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param target

+	 *            the object to adapt.

+	 * @return the adapter for the <code>target</code>.

+	 * @generated

+	 */

+	@Override

+	public Adapter createAdapter(Notifier target) {

+		return modelSwitch.doSwitch((EObject) target);

+	}

+

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config <em>Config</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config

+	 * @generated

+	 */

+	public Adapter createConfigAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for the default case.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @generated

+	 */

+	public Adapter createEObjectAdapter() {

+		return null;

+	}

+

+} // RSAToPapyrusParametersAdapterFactory

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/util/RSAToPapyrusParametersSwitch.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/util/RSAToPapyrusParametersSwitch.java
new file mode 100644
index 00000000000..5ee1be089cc
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/util/RSAToPapyrusParametersSwitch.java
@@ -0,0 +1,129 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.util;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.util.Switch;

+import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config;

+import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Switch</b> for the model's inheritance hierarchy.

+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

+ * starting with the actual class of the object

+ * and proceeding up the inheritance hierarchy

+ * until a non-null result is returned,

+ * which is the result of the switch.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage

+ * @generated

+ */

+public class RSAToPapyrusParametersSwitch<T> extends Switch<T> {

+	/**

+	 * The cached model package

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected static RSAToPapyrusParametersPackage modelPackage;

+

+	/**

+	 * Creates an instance of the switch.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public RSAToPapyrusParametersSwitch() {

+		if (modelPackage == null) {

+			modelPackage = RSAToPapyrusParametersPackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Checks whether this is a switch for the given package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @parameter ePackage the package in question.

+	 * @return whether this is a switch for the given package.

+	 * @generated

+	 */

+	@Override

+	protected boolean isSwitchFor(EPackage ePackage) {

+		return ePackage == modelPackage;

+	}

+

+	/**

+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the first non-null result returned by a <code>caseXXX</code> call.

+	 * @generated

+	 */

+	@Override

+	protected T doSwitch(int classifierID, EObject theEObject) {

+		switch (classifierID) {

+		case RSAToPapyrusParametersPackage.CONFIG: {

+			Config config = (Config) theEObject;

+			T result = caseConfig(config);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		default:

+			return defaultCase(theEObject);

+		}

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Config</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Config</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseConfig(Config object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch, but this is the last case anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

+	 * @generated

+	 */

+	@Override

+	public T defaultCase(EObject object) {

+		return null;

+	}

+

+} // RSAToPapyrusParametersSwitch

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/AbstractConstraint.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/AbstractConstraint.java
new file mode 100644
index 00000000000..56ded8a3f3e
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/AbstractConstraint.java
@@ -0,0 +1,128 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.uml2.uml.Constraint;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Abstract Constraint</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint#getBase_Constraint <em>Base Constraint</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint#getEvaluationMode <em>Evaluation Mode</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint#getSeverity <em>Severity</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getAbstractConstraint()

+ * @model abstract="true"

+ * @generated

+ */

+public interface AbstractConstraint extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Base Constraint</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Constraint</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Base Constraint</em>' reference.

+	 * @see #setBase_Constraint(Constraint)

+	 * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getAbstractConstraint_Base_Constraint()

+	 * @model required="true"

+	 * @generated

+	 */

+	Constraint getBase_Constraint();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint#getBase_Constraint <em>Base Constraint</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Base Constraint</em>' reference.

+	 * @see #getBase_Constraint()

+	 * @generated

+	 */

+	void setBase_Constraint(Constraint value);

+

+	/**

+	 * Returns the value of the '<em><b>Evaluation Mode</b></em>' attribute.

+	 * The default value is <code>"batch"</code>.

+	 * The literals are from the enumeration {@link org.eclipse.papyrus.migration.rsa.default_.Mode}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Evaluation Mode</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Evaluation Mode</em>' attribute.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.Mode

+	 * @see #setEvaluationMode(Mode)

+	 * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getAbstractConstraint_EvaluationMode()

+	 * @model default="batch" required="true"

+	 * @generated

+	 */

+	Mode getEvaluationMode();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint#getEvaluationMode <em>Evaluation Mode</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Evaluation Mode</em>' attribute.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.Mode

+	 * @see #getEvaluationMode()

+	 * @generated

+	 */

+	void setEvaluationMode(Mode value);

+

+	/**

+	 * Returns the value of the '<em><b>Severity</b></em>' attribute.

+	 * The default value is <code>"error"</code>.

+	 * The literals are from the enumeration {@link org.eclipse.papyrus.migration.rsa.default_.Severity}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Severity</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Severity</em>' attribute.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.Severity

+	 * @see #setSeverity(Severity)

+	 * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getAbstractConstraint_Severity()

+	 * @model default="error" required="true"

+	 * @generated

+	 */

+	Severity getSeverity();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint#getSeverity <em>Severity</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Severity</em>' attribute.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.Severity

+	 * @see #getSeverity()

+	 * @generated

+	 */

+	void setSeverity(Severity value);

+

+} // AbstractConstraint

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/DefaultFactory.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/DefaultFactory.java
new file mode 100644
index 00000000000..4263324cfbc
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/DefaultFactory.java
@@ -0,0 +1,115 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_;

+

+import org.eclipse.emf.ecore.EFactory;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Factory</b> for the model.

+ * It provides a create method for each non-abstract class of the model.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage

+ * @generated

+ */

+public interface DefaultFactory extends EFactory {

+	/**

+	 * The singleton instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	DefaultFactory eINSTANCE = org.eclipse.papyrus.migration.rsa.default_.impl.DefaultFactoryImpl.init();

+

+	/**

+	 * Returns a new object of class '<em>Documentation</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Documentation</em>'.

+	 * @generated

+	 */

+	Documentation createDocumentation();

+

+	/**

+	 * Returns a new object of class '<em>URL</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>URL</em>'.

+	 * @generated

+	 */

+	URL createURL();

+

+	/**

+	 * Returns a new object of class '<em>Link</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Link</em>'.

+	 * @generated

+	 */

+	Link createLink();

+

+	/**

+	 * Returns a new object of class '<em>Meta Constraint</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Meta Constraint</em>'.

+	 * @generated

+	 */

+	MetaConstraint createMetaConstraint();

+

+	/**

+	 * Returns a new object of class '<em>Marking Model</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Marking Model</em>'.

+	 * @generated

+	 */

+	MarkingModel createMarkingModel();

+

+	/**

+	 * Returns a new object of class '<em>Marking Import</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Marking Import</em>'.

+	 * @generated

+	 */

+	MarkingImport createMarkingImport();

+

+	/**

+	 * Returns a new object of class '<em>Language</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Language</em>'.

+	 * @generated

+	 */

+	DefaultLanguage createDefaultLanguage();

+

+	/**

+	 * Returns the package supported by this factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the package supported by this factory.

+	 * @generated

+	 */

+	DefaultPackage getDefaultPackage();

+

+} // DefaultFactory

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/DefaultLanguage.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/DefaultLanguage.java
new file mode 100644
index 00000000000..9b47c4da2e6
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/DefaultLanguage.java
@@ -0,0 +1,90 @@
+/**

+ *  * Copyright (c) 2013, 2014 CEA LIST.

+ *  *

+ *  * All rights reserved. This program and the accompanying materials

+ *  * are made available under the terms of the Eclipse Public License v1.0

+ *  * which accompanies this distribution, and is available at

+ *  * http://www.eclipse.org/legal/epl-v10.html

+ *  *

+ *  * Contributors:

+ *  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ */

+package org.eclipse.papyrus.migration.rsa.default_;

+

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Language</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.DefaultLanguage#getBase_Package <em>Base Package</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.DefaultLanguage#getDefaultLanguage <em>Default Language</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getDefaultLanguage()

+ * @model

+ * @generated

+ */

+public interface DefaultLanguage extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Base Package</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Base Package</em>' reference.

+	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)

+	 * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getDefaultLanguage_Base_Package()

+	 * @model

+	 * @generated

+	 */

+	org.eclipse.uml2.uml.Package getBase_Package();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.default_.DefaultLanguage#getBase_Package <em>Base Package</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Base Package</em>' reference.

+	 * @see #getBase_Package()

+	 * @generated

+	 */

+	void setBase_Package(org.eclipse.uml2.uml.Package value);

+

+	/**

+	 * Returns the value of the '<em><b>Default Language</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Default Language</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Default Language</em>' attribute.

+	 * @see #setDefaultLanguage(String)

+	 * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getDefaultLanguage_DefaultLanguage()

+	 * @model

+	 * @generated

+	 */

+	String getDefaultLanguage();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.default_.DefaultLanguage#getDefaultLanguage <em>Default Language</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Default Language</em>' attribute.

+	 * @see #getDefaultLanguage()

+	 * @generated

+	 */

+	void setDefaultLanguage(String value);

+

+} // DefaultLanguage

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/DefaultPackage.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/DefaultPackage.java
new file mode 100644
index 00000000000..f419b2ea037
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/DefaultPackage.java
@@ -0,0 +1,1065 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_;

+

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EEnum;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.EReference;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Package</b> for the model.

+ * It contains accessors for the meta objects to represent

+ * <ul>

+ * <li>each class,</li>

+ * <li>each feature of each class,</li>

+ * <li>each operation of each class,</li>

+ * <li>each enum,</li>

+ * <li>and each data type</li>

+ * </ul>

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.default_.DefaultFactory

+ * @model kind="package"

+ * @generated

+ */

+public interface DefaultPackage extends EPackage {

+	/**

+	 * The package name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	String eNAME = "default";

+

+	/**

+	 * The package namespace URI.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	String eNS_URI = "http://www.eclipse.org/papyrus/profile/default";

+

+	/**

+	 * The package namespace name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	String eNS_PREFIX = "default";

+

+	/**

+	 * The singleton instance of the package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	DefaultPackage eINSTANCE = org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl.init();

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.default_.impl.DocumentationImpl <em>Documentation</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DocumentationImpl

+	 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getDocumentation()

+	 * @generated

+	 */

+	int DOCUMENTATION = 0;

+

+	/**

+	 * The feature id for the '<em><b>Base Comment</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int DOCUMENTATION__BASE_COMMENT = 0;

+

+	/**

+	 * The number of structural features of the '<em>Documentation</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int DOCUMENTATION_FEATURE_COUNT = 1;

+

+	/**

+	 * The number of operations of the '<em>Documentation</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int DOCUMENTATION_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.default_.impl.URLImpl <em>URL</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.default_.impl.URLImpl

+	 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getURL()

+	 * @generated

+	 */

+	int URL = 1;

+

+	/**

+	 * The feature id for the '<em><b>Base Comment</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int URL__BASE_COMMENT = 0;

+

+	/**

+	 * The feature id for the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int URL__TYPE = 1;

+

+	/**

+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int URL__DISPLAY_NAME = 2;

+

+	/**

+	 * The feature id for the '<em><b>Icon</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int URL__ICON = 3;

+

+	/**

+	 * The number of structural features of the '<em>URL</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int URL_FEATURE_COUNT = 4;

+

+	/**

+	 * The number of operations of the '<em>URL</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int URL_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.default_.impl.LinkImpl <em>Link</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.default_.impl.LinkImpl

+	 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getLink()

+	 * @generated

+	 */

+	int LINK = 2;

+

+	/**

+	 * The feature id for the '<em><b>Base Comment</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int LINK__BASE_COMMENT = URL__BASE_COMMENT;

+

+	/**

+	 * The feature id for the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int LINK__TYPE = URL__TYPE;

+

+	/**

+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int LINK__DISPLAY_NAME = URL__DISPLAY_NAME;

+

+	/**

+	 * The feature id for the '<em><b>Icon</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int LINK__ICON = URL__ICON;

+

+	/**

+	 * The number of structural features of the '<em>Link</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int LINK_FEATURE_COUNT = URL_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of operations of the '<em>Link</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int LINK_OPERATION_COUNT = URL_OPERATION_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.default_.impl.AbstractConstraintImpl <em>Abstract Constraint</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.default_.impl.AbstractConstraintImpl

+	 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getAbstractConstraint()

+	 * @generated

+	 */

+	int ABSTRACT_CONSTRAINT = 3;

+

+	/**

+	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int ABSTRACT_CONSTRAINT__BASE_CONSTRAINT = 0;

+

+	/**

+	 * The feature id for the '<em><b>Evaluation Mode</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int ABSTRACT_CONSTRAINT__EVALUATION_MODE = 1;

+

+	/**

+	 * The feature id for the '<em><b>Severity</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int ABSTRACT_CONSTRAINT__SEVERITY = 2;

+

+	/**

+	 * The number of structural features of the '<em>Abstract Constraint</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int ABSTRACT_CONSTRAINT_FEATURE_COUNT = 3;

+

+	/**

+	 * The number of operations of the '<em>Abstract Constraint</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int ABSTRACT_CONSTRAINT_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.default_.impl.MetaConstraintImpl <em>Meta Constraint</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.default_.impl.MetaConstraintImpl

+	 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getMetaConstraint()

+	 * @generated

+	 */

+	int META_CONSTRAINT = 4;

+

+	/**

+	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int META_CONSTRAINT__BASE_CONSTRAINT = ABSTRACT_CONSTRAINT__BASE_CONSTRAINT;

+

+	/**

+	 * The feature id for the '<em><b>Evaluation Mode</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int META_CONSTRAINT__EVALUATION_MODE = ABSTRACT_CONSTRAINT__EVALUATION_MODE;

+

+	/**

+	 * The feature id for the '<em><b>Severity</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int META_CONSTRAINT__SEVERITY = ABSTRACT_CONSTRAINT__SEVERITY;

+

+	/**

+	 * The feature id for the '<em><b>Message</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int META_CONSTRAINT__MESSAGE = ABSTRACT_CONSTRAINT_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>Meta Constraint</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int META_CONSTRAINT_FEATURE_COUNT = ABSTRACT_CONSTRAINT_FEATURE_COUNT + 1;

+

+	/**

+	 * The number of operations of the '<em>Meta Constraint</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int META_CONSTRAINT_OPERATION_COUNT = ABSTRACT_CONSTRAINT_OPERATION_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.default_.impl.MarkingModelImpl <em>Marking Model</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.default_.impl.MarkingModelImpl

+	 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getMarkingModel()

+	 * @generated

+	 */

+	int MARKING_MODEL = 5;

+

+	/**

+	 * The feature id for the '<em><b>Base Package</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int MARKING_MODEL__BASE_PACKAGE = 0;

+

+	/**

+	 * The number of structural features of the '<em>Marking Model</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int MARKING_MODEL_FEATURE_COUNT = 1;

+

+	/**

+	 * The number of operations of the '<em>Marking Model</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int MARKING_MODEL_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.default_.impl.MarkingImportImpl <em>Marking Import</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.default_.impl.MarkingImportImpl

+	 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getMarkingImport()

+	 * @generated

+	 */

+	int MARKING_IMPORT = 6;

+

+	/**

+	 * The feature id for the '<em><b>Base Element Import</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int MARKING_IMPORT__BASE_ELEMENT_IMPORT = 0;

+

+	/**

+	 * The number of structural features of the '<em>Marking Import</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int MARKING_IMPORT_FEATURE_COUNT = 1;

+

+	/**

+	 * The number of operations of the '<em>Marking Import</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int MARKING_IMPORT_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.default_.impl.DefaultLanguageImpl <em>Language</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultLanguageImpl

+	 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getDefaultLanguage()

+	 * @generated

+	 */

+	int DEFAULT_LANGUAGE = 7;

+

+	/**

+	 * The feature id for the '<em><b>Base Package</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int DEFAULT_LANGUAGE__BASE_PACKAGE = 0;

+

+	/**

+	 * The feature id for the '<em><b>Default Language</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int DEFAULT_LANGUAGE__DEFAULT_LANGUAGE = 1;

+

+	/**

+	 * The number of structural features of the '<em>Language</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int DEFAULT_LANGUAGE_FEATURE_COUNT = 2;

+

+	/**

+	 * The number of operations of the '<em>Language</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int DEFAULT_LANGUAGE_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.default_.Mode <em>Mode</em>}' enum.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.default_.Mode

+	 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getMode()

+	 * @generated

+	 */

+	int MODE = 8;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.default_.Severity <em>Severity</em>}' enum.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.default_.Severity

+	 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getSeverity()

+	 * @generated

+	 */

+	int SEVERITY = 9;

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.default_.Documentation <em>Documentation</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Documentation</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.Documentation

+	 * @generated

+	 */

+	EClass getDocumentation();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.migration.rsa.default_.Documentation#getBase_Comment <em>Base Comment</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the reference '<em>Base Comment</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.Documentation#getBase_Comment()

+	 * @see #getDocumentation()

+	 * @generated

+	 */

+	EReference getDocumentation_Base_Comment();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.default_.URL <em>URL</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>URL</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.URL

+	 * @generated

+	 */

+	EClass getURL();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.migration.rsa.default_.URL#getBase_Comment <em>Base Comment</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the reference '<em>Base Comment</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.URL#getBase_Comment()

+	 * @see #getURL()

+	 * @generated

+	 */

+	EReference getURL_Base_Comment();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.default_.URL#getType <em>Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Type</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.URL#getType()

+	 * @see #getURL()

+	 * @generated

+	 */

+	EAttribute getURL_Type();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.default_.URL#getDisplayName <em>Display Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Display Name</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.URL#getDisplayName()

+	 * @see #getURL()

+	 * @generated

+	 */

+	EAttribute getURL_DisplayName();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.default_.URL#getIcon <em>Icon</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Icon</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.URL#getIcon()

+	 * @see #getURL()

+	 * @generated

+	 */

+	EAttribute getURL_Icon();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.default_.Link <em>Link</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Link</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.Link

+	 * @generated

+	 */

+	EClass getLink();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint <em>Abstract Constraint</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Abstract Constraint</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint

+	 * @generated

+	 */

+	EClass getAbstractConstraint();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint#getBase_Constraint <em>Base Constraint</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the reference '<em>Base Constraint</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint#getBase_Constraint()

+	 * @see #getAbstractConstraint()

+	 * @generated

+	 */

+	EReference getAbstractConstraint_Base_Constraint();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint#getEvaluationMode <em>Evaluation Mode</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Evaluation Mode</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint#getEvaluationMode()

+	 * @see #getAbstractConstraint()

+	 * @generated

+	 */

+	EAttribute getAbstractConstraint_EvaluationMode();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint#getSeverity <em>Severity</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Severity</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint#getSeverity()

+	 * @see #getAbstractConstraint()

+	 * @generated

+	 */

+	EAttribute getAbstractConstraint_Severity();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.default_.MetaConstraint <em>Meta Constraint</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Meta Constraint</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.MetaConstraint

+	 * @generated

+	 */

+	EClass getMetaConstraint();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.default_.MetaConstraint#getMessage <em>Message</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Message</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.MetaConstraint#getMessage()

+	 * @see #getMetaConstraint()

+	 * @generated

+	 */

+	EAttribute getMetaConstraint_Message();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.default_.MarkingModel <em>Marking Model</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Marking Model</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.MarkingModel

+	 * @generated

+	 */

+	EClass getMarkingModel();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.migration.rsa.default_.MarkingModel#getBase_Package <em>Base Package</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the reference '<em>Base Package</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.MarkingModel#getBase_Package()

+	 * @see #getMarkingModel()

+	 * @generated

+	 */

+	EReference getMarkingModel_Base_Package();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.default_.MarkingImport <em>Marking Import</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Marking Import</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.MarkingImport

+	 * @generated

+	 */

+	EClass getMarkingImport();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.migration.rsa.default_.MarkingImport#getBase_ElementImport <em>Base Element Import</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the reference '<em>Base Element Import</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.MarkingImport#getBase_ElementImport()

+	 * @see #getMarkingImport()

+	 * @generated

+	 */

+	EReference getMarkingImport_Base_ElementImport();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.default_.DefaultLanguage <em>Language</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Language</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.DefaultLanguage

+	 * @generated

+	 */

+	EClass getDefaultLanguage();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.migration.rsa.default_.DefaultLanguage#getBase_Package <em>Base Package</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the reference '<em>Base Package</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.DefaultLanguage#getBase_Package()

+	 * @see #getDefaultLanguage()

+	 * @generated

+	 */

+	EReference getDefaultLanguage_Base_Package();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.default_.DefaultLanguage#getDefaultLanguage <em>Default Language</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Default Language</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.DefaultLanguage#getDefaultLanguage()

+	 * @see #getDefaultLanguage()

+	 * @generated

+	 */

+	EAttribute getDefaultLanguage_DefaultLanguage();

+

+	/**

+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.migration.rsa.default_.Mode <em>Mode</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for enum '<em>Mode</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.Mode

+	 * @generated

+	 */

+	EEnum getMode();

+

+	/**

+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.migration.rsa.default_.Severity <em>Severity</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for enum '<em>Severity</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.Severity

+	 * @generated

+	 */

+	EEnum getSeverity();

+

+	/**

+	 * Returns the factory that creates the instances of the model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the factory that creates the instances of the model.

+	 * @generated

+	 */

+	DefaultFactory getDefaultFactory();

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * Defines literals for the meta objects that represent

+	 * <ul>

+	 * <li>each class,</li>

+	 * <li>each feature of each class,</li>

+	 * <li>each operation of each class,</li>

+	 * <li>each enum,</li>

+	 * <li>and each data type</li>

+	 * </ul>

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	interface Literals {

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.default_.impl.DocumentationImpl <em>Documentation</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DocumentationImpl

+		 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getDocumentation()

+		 * @generated

+		 */

+		EClass DOCUMENTATION = eINSTANCE.getDocumentation();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Comment</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference DOCUMENTATION__BASE_COMMENT = eINSTANCE.getDocumentation_Base_Comment();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.default_.impl.URLImpl <em>URL</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.default_.impl.URLImpl

+		 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getURL()

+		 * @generated

+		 */

+		EClass URL = eINSTANCE.getURL();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Comment</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference URL__BASE_COMMENT = eINSTANCE.getURL_Base_Comment();

+

+		/**

+		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute URL__TYPE = eINSTANCE.getURL_Type();

+

+		/**

+		 * The meta object literal for the '<em><b>Display Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute URL__DISPLAY_NAME = eINSTANCE.getURL_DisplayName();

+

+		/**

+		 * The meta object literal for the '<em><b>Icon</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute URL__ICON = eINSTANCE.getURL_Icon();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.default_.impl.LinkImpl <em>Link</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.default_.impl.LinkImpl

+		 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getLink()

+		 * @generated

+		 */

+		EClass LINK = eINSTANCE.getLink();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.default_.impl.AbstractConstraintImpl <em>Abstract Constraint</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.default_.impl.AbstractConstraintImpl

+		 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getAbstractConstraint()

+		 * @generated

+		 */

+		EClass ABSTRACT_CONSTRAINT = eINSTANCE.getAbstractConstraint();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Constraint</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference ABSTRACT_CONSTRAINT__BASE_CONSTRAINT = eINSTANCE.getAbstractConstraint_Base_Constraint();

+

+		/**

+		 * The meta object literal for the '<em><b>Evaluation Mode</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute ABSTRACT_CONSTRAINT__EVALUATION_MODE = eINSTANCE.getAbstractConstraint_EvaluationMode();

+

+		/**

+		 * The meta object literal for the '<em><b>Severity</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute ABSTRACT_CONSTRAINT__SEVERITY = eINSTANCE.getAbstractConstraint_Severity();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.default_.impl.MetaConstraintImpl <em>Meta Constraint</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.default_.impl.MetaConstraintImpl

+		 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getMetaConstraint()

+		 * @generated

+		 */

+		EClass META_CONSTRAINT = eINSTANCE.getMetaConstraint();

+

+		/**

+		 * The meta object literal for the '<em><b>Message</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute META_CONSTRAINT__MESSAGE = eINSTANCE.getMetaConstraint_Message();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.default_.impl.MarkingModelImpl <em>Marking Model</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.default_.impl.MarkingModelImpl

+		 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getMarkingModel()

+		 * @generated

+		 */

+		EClass MARKING_MODEL = eINSTANCE.getMarkingModel();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference MARKING_MODEL__BASE_PACKAGE = eINSTANCE.getMarkingModel_Base_Package();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.default_.impl.MarkingImportImpl <em>Marking Import</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.default_.impl.MarkingImportImpl

+		 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getMarkingImport()

+		 * @generated

+		 */

+		EClass MARKING_IMPORT = eINSTANCE.getMarkingImport();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Element Import</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference MARKING_IMPORT__BASE_ELEMENT_IMPORT = eINSTANCE.getMarkingImport_Base_ElementImport();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.default_.impl.DefaultLanguageImpl <em>Language</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultLanguageImpl

+		 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getDefaultLanguage()

+		 * @generated

+		 */

+		EClass DEFAULT_LANGUAGE = eINSTANCE.getDefaultLanguage();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference DEFAULT_LANGUAGE__BASE_PACKAGE = eINSTANCE.getDefaultLanguage_Base_Package();

+

+		/**

+		 * The meta object literal for the '<em><b>Default Language</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute DEFAULT_LANGUAGE__DEFAULT_LANGUAGE = eINSTANCE.getDefaultLanguage_DefaultLanguage();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.default_.Mode <em>Mode</em>}' enum.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.default_.Mode

+		 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getMode()

+		 * @generated

+		 */

+		EEnum MODE = eINSTANCE.getMode();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.default_.Severity <em>Severity</em>}' enum.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.default_.Severity

+		 * @see org.eclipse.papyrus.migration.rsa.default_.impl.DefaultPackageImpl#getSeverity()

+		 * @generated

+		 */

+		EEnum SEVERITY = eINSTANCE.getSeverity();

+

+	}

+

+} // DefaultPackage

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/Documentation.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/Documentation.java
new file mode 100644
index 00000000000..f2a8fa2a3fe
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/Documentation.java
@@ -0,0 +1,62 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.uml2.uml.Comment;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Documentation</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.Documentation#getBase_Comment <em>Base Comment</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getDocumentation()

+ * @model

+ * @generated

+ */

+public interface Documentation extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Base Comment</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Comment</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Base Comment</em>' reference.

+	 * @see #setBase_Comment(Comment)

+	 * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getDocumentation_Base_Comment()

+	 * @model required="true"

+	 * @generated

+	 */

+	Comment getBase_Comment();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.default_.Documentation#getBase_Comment <em>Base Comment</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Base Comment</em>' reference.

+	 * @see #getBase_Comment()

+	 * @generated

+	 */

+	void setBase_Comment(Comment value);

+

+} // Documentation

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/Link.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/Link.java
new file mode 100644
index 00000000000..c5c0dad836d
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/Link.java
@@ -0,0 +1,26 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Link</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ *

+ * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getLink()

+ * @model

+ * @generated

+ */

+public interface Link extends URL {

+} // Link

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/MarkingImport.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/MarkingImport.java
new file mode 100644
index 00000000000..db642a3fa2b
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/MarkingImport.java
@@ -0,0 +1,62 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.uml2.uml.ElementImport;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Marking Import</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.MarkingImport#getBase_ElementImport <em>Base Element Import</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getMarkingImport()

+ * @model

+ * @generated

+ */

+public interface MarkingImport extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Base Element Import</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Element Import</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Base Element Import</em>' reference.

+	 * @see #setBase_ElementImport(ElementImport)

+	 * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getMarkingImport_Base_ElementImport()

+	 * @model required="true"

+	 * @generated

+	 */

+	ElementImport getBase_ElementImport();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.default_.MarkingImport#getBase_ElementImport <em>Base Element Import</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Base Element Import</em>' reference.

+	 * @see #getBase_ElementImport()

+	 * @generated

+	 */

+	void setBase_ElementImport(ElementImport value);

+

+} // MarkingImport

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/MarkingModel.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/MarkingModel.java
new file mode 100644
index 00000000000..d9eaaa11926
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/MarkingModel.java
@@ -0,0 +1,61 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_;

+

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Marking Model</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.MarkingModel#getBase_Package <em>Base Package</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getMarkingModel()

+ * @model

+ * @generated

+ */

+public interface MarkingModel extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Base Package</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Base Package</em>' reference.

+	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)

+	 * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getMarkingModel_Base_Package()

+	 * @model required="true"

+	 * @generated

+	 */

+	org.eclipse.uml2.uml.Package getBase_Package();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.default_.MarkingModel#getBase_Package <em>Base Package</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Base Package</em>' reference.

+	 * @see #getBase_Package()

+	 * @generated

+	 */

+	void setBase_Package(org.eclipse.uml2.uml.Package value);

+

+} // MarkingModel

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/MetaConstraint.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/MetaConstraint.java
new file mode 100644
index 00000000000..4b327262913
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/MetaConstraint.java
@@ -0,0 +1,60 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Meta Constraint</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.MetaConstraint#getMessage <em>Message</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getMetaConstraint()

+ * @model

+ * @generated

+ */

+public interface MetaConstraint extends AbstractConstraint {

+

+	/**

+	 * Returns the value of the '<em><b>Message</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Message</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Message</em>' attribute.

+	 * @see #setMessage(String)

+	 * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getMetaConstraint_Message()

+	 * @model required="true"

+	 * @generated

+	 */

+	String getMessage();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.default_.MetaConstraint#getMessage <em>Message</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Message</em>' attribute.

+	 * @see #getMessage()

+	 * @generated

+	 */

+	void setMessage(String value);

+} // MetaConstraint

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/Mode.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/Mode.java
new file mode 100644
index 00000000000..c9473082a9e
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/Mode.java
@@ -0,0 +1,238 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_;

+

+import java.util.Arrays;

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.emf.common.util.Enumerator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the literals of the enumeration '<em><b>Mode</b></em>',

+ * and utility methods for working with them.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getMode()

+ * @model

+ * @generated

+ */

+public enum Mode implements Enumerator {

+	/**

+	 * The '<em><b>Batch</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #BATCH_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	BATCH(0, "batch", "batch"),

+

+	/**

+	 * The '<em><b>Live</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #LIVE_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	LIVE(1, "live", "live");

+

+	/**

+	 * The '<em><b>Batch</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>Batch</b></em>' literal object isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #BATCH

+	 * @model name="batch"

+	 * @generated

+	 * @ordered

+	 */

+	public static final int BATCH_VALUE = 0;

+

+	/**

+	 * The '<em><b>Live</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>Live</b></em>' literal object isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #LIVE

+	 * @model name="live"

+	 * @generated

+	 * @ordered

+	 */

+	public static final int LIVE_VALUE = 1;

+

+	/**

+	 * An array of all the '<em><b>Mode</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private static final Mode[] VALUES_ARRAY =

+			new Mode[] {

+					BATCH,

+					LIVE,

+			};

+

+	/**

+	 * A public read-only list of all the '<em><b>Mode</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static final List<Mode> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

+

+	/**

+	 * Returns the '<em><b>Mode</b></em>' literal with the specified literal value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static Mode get(String literal) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+			Mode result = VALUES_ARRAY[i];

+			if (result.toString().equals(literal)) {

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>Mode</b></em>' literal with the specified name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static Mode getByName(String name) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+			Mode result = VALUES_ARRAY[i];

+			if (result.getName().equals(name)) {

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>Mode</b></em>' literal with the specified integer value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static Mode get(int value) {

+		switch (value) {

+		case BATCH_VALUE:

+			return BATCH;

+		case LIVE_VALUE:

+			return LIVE;

+		}

+		return null;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private final int value;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private final String name;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private final String literal;

+

+	/**

+	 * Only this class can construct instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private Mode(int value, String name, String literal) {

+		this.value = value;

+		this.name = name;

+		this.literal = literal;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public int getValue() {

+		return value;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getName() {

+		return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getLiteral() {

+		return literal;

+	}

+

+	/**

+	 * Returns the literal value of the enumerator, which is its string representation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		return literal;

+	}

+

+} // Mode

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/Severity.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/Severity.java
new file mode 100644
index 00000000000..b937e543a39
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/Severity.java
@@ -0,0 +1,267 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_;

+

+import java.util.Arrays;

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.emf.common.util.Enumerator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the literals of the enumeration '<em><b>Severity</b></em>',

+ * and utility methods for working with them.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getSeverity()

+ * @model

+ * @generated

+ */

+public enum Severity implements Enumerator {

+	/**

+	 * The '<em><b>Error</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #ERROR_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	ERROR(0, "error", "error"),

+

+	/**

+	 * The '<em><b>Warning</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #WARNING_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	WARNING(1, "warning", "warning"),

+

+	/**

+	 * The '<em><b>Info</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #INFO_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	INFO(2, "info", "info");

+

+	/**

+	 * The '<em><b>Error</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>Error</b></em>' literal object isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #ERROR

+	 * @model name="error"

+	 * @generated

+	 * @ordered

+	 */

+	public static final int ERROR_VALUE = 0;

+

+	/**

+	 * The '<em><b>Warning</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>Warning</b></em>' literal object isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #WARNING

+	 * @model name="warning"

+	 * @generated

+	 * @ordered

+	 */

+	public static final int WARNING_VALUE = 1;

+

+	/**

+	 * The '<em><b>Info</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>Info</b></em>' literal object isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #INFO

+	 * @model name="info"

+	 * @generated

+	 * @ordered

+	 */

+	public static final int INFO_VALUE = 2;

+

+	/**

+	 * An array of all the '<em><b>Severity</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private static final Severity[] VALUES_ARRAY =

+			new Severity[] {

+					ERROR,

+					WARNING,

+					INFO,

+			};

+

+	/**

+	 * A public read-only list of all the '<em><b>Severity</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static final List<Severity> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

+

+	/**

+	 * Returns the '<em><b>Severity</b></em>' literal with the specified literal value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static Severity get(String literal) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+			Severity result = VALUES_ARRAY[i];

+			if (result.toString().equals(literal)) {

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>Severity</b></em>' literal with the specified name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static Severity getByName(String name) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+			Severity result = VALUES_ARRAY[i];

+			if (result.getName().equals(name)) {

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>Severity</b></em>' literal with the specified integer value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static Severity get(int value) {

+		switch (value) {

+		case ERROR_VALUE:

+			return ERROR;

+		case WARNING_VALUE:

+			return WARNING;

+		case INFO_VALUE:

+			return INFO;

+		}

+		return null;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private final int value;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private final String name;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private final String literal;

+

+	/**

+	 * Only this class can construct instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private Severity(int value, String name, String literal) {

+		this.value = value;

+		this.name = name;

+		this.literal = literal;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public int getValue() {

+		return value;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getName() {

+		return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getLiteral() {

+		return literal;

+	}

+

+	/**

+	 * Returns the literal value of the enumerator, which is its string representation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		return literal;

+	}

+

+} // Severity

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/URL.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/URL.java
new file mode 100644
index 00000000000..61614129909
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/URL.java
@@ -0,0 +1,149 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.uml2.uml.Comment;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>URL</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.URL#getBase_Comment <em>Base Comment</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.URL#getType <em>Type</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.URL#getDisplayName <em>Display Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.URL#getIcon <em>Icon</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getURL()

+ * @model

+ * @generated

+ */

+public interface URL extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Base Comment</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Comment</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Base Comment</em>' reference.

+	 * @see #setBase_Comment(Comment)

+	 * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getURL_Base_Comment()

+	 * @model required="true"

+	 * @generated

+	 */

+	Comment getBase_Comment();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.default_.URL#getBase_Comment <em>Base Comment</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Base Comment</em>' reference.

+	 * @see #getBase_Comment()

+	 * @generated

+	 */

+	void setBase_Comment(Comment value);

+

+	/**

+	 * Returns the value of the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Type</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Type</em>' attribute.

+	 * @see #setType(String)

+	 * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getURL_Type()

+	 * @model required="true"

+	 * @generated

+	 */

+	String getType();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.default_.URL#getType <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Type</em>' attribute.

+	 * @see #getType()

+	 * @generated

+	 */

+	void setType(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Display Name</em>' attribute.

+	 * @see #setDisplayName(String)

+	 * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getURL_DisplayName()

+	 * @model required="true"

+	 * @generated

+	 */

+	String getDisplayName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.default_.URL#getDisplayName <em>Display Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Display Name</em>' attribute.

+	 * @see #getDisplayName()

+	 * @generated

+	 */

+	void setDisplayName(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Icon</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Icon</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Icon</em>' attribute.

+	 * @see #setIcon(byte[])

+	 * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#getURL_Icon()

+	 * @model required="true"

+	 * @generated

+	 */

+	byte[] getIcon();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.default_.URL#getIcon <em>Icon</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Icon</em>' attribute.

+	 * @see #getIcon()

+	 * @generated

+	 */

+	void setIcon(byte[] value);

+

+} // URL

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/AbstractConstraintImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/AbstractConstraintImpl.java
new file mode 100644
index 00000000000..99be2bffaf6
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/AbstractConstraintImpl.java
@@ -0,0 +1,320 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+import org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultPackage;

+import org.eclipse.papyrus.migration.rsa.default_.Mode;

+import org.eclipse.papyrus.migration.rsa.default_.Severity;

+import org.eclipse.uml2.uml.Constraint;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Abstract Constraint</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.impl.AbstractConstraintImpl#getBase_Constraint <em>Base Constraint</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.impl.AbstractConstraintImpl#getEvaluationMode <em>Evaluation Mode</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.impl.AbstractConstraintImpl#getSeverity <em>Severity</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public abstract class AbstractConstraintImpl extends MinimalEObjectImpl.Container implements AbstractConstraint {

+	/**

+	 * The cached value of the '{@link #getBase_Constraint() <em>Base Constraint</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getBase_Constraint()

+	 * @generated

+	 * @ordered

+	 */

+	protected Constraint base_Constraint;

+

+	/**

+	 * The default value of the '{@link #getEvaluationMode() <em>Evaluation Mode</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getEvaluationMode()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final Mode EVALUATION_MODE_EDEFAULT = Mode.BATCH;

+

+	/**

+	 * The cached value of the '{@link #getEvaluationMode() <em>Evaluation Mode</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getEvaluationMode()

+	 * @generated

+	 * @ordered

+	 */

+	protected Mode evaluationMode = EVALUATION_MODE_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getSeverity() <em>Severity</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getSeverity()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final Severity SEVERITY_EDEFAULT = Severity.ERROR;

+

+	/**

+	 * The cached value of the '{@link #getSeverity() <em>Severity</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getSeverity()

+	 * @generated

+	 * @ordered

+	 */

+	protected Severity severity = SEVERITY_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected AbstractConstraintImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DefaultPackage.Literals.ABSTRACT_CONSTRAINT;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Constraint getBase_Constraint() {

+		if (base_Constraint != null && base_Constraint.eIsProxy()) {

+			InternalEObject oldBase_Constraint = (InternalEObject) base_Constraint;

+			base_Constraint = (Constraint) eResolveProxy(oldBase_Constraint);

+			if (base_Constraint != oldBase_Constraint) {

+				if (eNotificationRequired()) {

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DefaultPackage.ABSTRACT_CONSTRAINT__BASE_CONSTRAINT, oldBase_Constraint, base_Constraint));

+				}

+			}

+		}

+		return base_Constraint;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public Constraint basicGetBase_Constraint() {

+		return base_Constraint;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setBase_Constraint(Constraint newBase_Constraint) {

+		Constraint oldBase_Constraint = base_Constraint;

+		base_Constraint = newBase_Constraint;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, DefaultPackage.ABSTRACT_CONSTRAINT__BASE_CONSTRAINT, oldBase_Constraint, base_Constraint));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Mode getEvaluationMode() {

+		return evaluationMode;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setEvaluationMode(Mode newEvaluationMode) {

+		Mode oldEvaluationMode = evaluationMode;

+		evaluationMode = newEvaluationMode == null ? EVALUATION_MODE_EDEFAULT : newEvaluationMode;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, DefaultPackage.ABSTRACT_CONSTRAINT__EVALUATION_MODE, oldEvaluationMode, evaluationMode));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Severity getSeverity() {

+		return severity;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setSeverity(Severity newSeverity) {

+		Severity oldSeverity = severity;

+		severity = newSeverity == null ? SEVERITY_EDEFAULT : newSeverity;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, DefaultPackage.ABSTRACT_CONSTRAINT__SEVERITY, oldSeverity, severity));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case DefaultPackage.ABSTRACT_CONSTRAINT__BASE_CONSTRAINT:

+			if (resolve) {

+				return getBase_Constraint();

+			}

+			return basicGetBase_Constraint();

+		case DefaultPackage.ABSTRACT_CONSTRAINT__EVALUATION_MODE:

+			return getEvaluationMode();

+		case DefaultPackage.ABSTRACT_CONSTRAINT__SEVERITY:

+			return getSeverity();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case DefaultPackage.ABSTRACT_CONSTRAINT__BASE_CONSTRAINT:

+			setBase_Constraint((Constraint) newValue);

+			return;

+		case DefaultPackage.ABSTRACT_CONSTRAINT__EVALUATION_MODE:

+			setEvaluationMode((Mode) newValue);

+			return;

+		case DefaultPackage.ABSTRACT_CONSTRAINT__SEVERITY:

+			setSeverity((Severity) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case DefaultPackage.ABSTRACT_CONSTRAINT__BASE_CONSTRAINT:

+			setBase_Constraint((Constraint) null);

+			return;

+		case DefaultPackage.ABSTRACT_CONSTRAINT__EVALUATION_MODE:

+			setEvaluationMode(EVALUATION_MODE_EDEFAULT);

+			return;

+		case DefaultPackage.ABSTRACT_CONSTRAINT__SEVERITY:

+			setSeverity(SEVERITY_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case DefaultPackage.ABSTRACT_CONSTRAINT__BASE_CONSTRAINT:

+			return base_Constraint != null;

+		case DefaultPackage.ABSTRACT_CONSTRAINT__EVALUATION_MODE:

+			return evaluationMode != EVALUATION_MODE_EDEFAULT;

+		case DefaultPackage.ABSTRACT_CONSTRAINT__SEVERITY:

+			return severity != SEVERITY_EDEFAULT;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (evaluationMode: ");

+		result.append(evaluationMode);

+		result.append(", severity: ");

+		result.append(severity);

+		result.append(')');

+		return result.toString();

+	}

+

+} // AbstractConstraintImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/DefaultFactoryImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/DefaultFactoryImpl.java
new file mode 100644
index 00000000000..3cf9e7db382
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/DefaultFactoryImpl.java
@@ -0,0 +1,289 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_.impl;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EDataType;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.impl.EFactoryImpl;

+import org.eclipse.emf.ecore.plugin.EcorePlugin;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultFactory;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultLanguage;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultPackage;

+import org.eclipse.papyrus.migration.rsa.default_.Documentation;

+import org.eclipse.papyrus.migration.rsa.default_.Link;

+import org.eclipse.papyrus.migration.rsa.default_.MarkingImport;

+import org.eclipse.papyrus.migration.rsa.default_.MarkingModel;

+import org.eclipse.papyrus.migration.rsa.default_.MetaConstraint;

+import org.eclipse.papyrus.migration.rsa.default_.Mode;

+import org.eclipse.papyrus.migration.rsa.default_.Severity;

+import org.eclipse.papyrus.migration.rsa.default_.URL;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Factory</b>.

+ * <!-- end-user-doc -->

+ *

+ * @generated

+ */

+public class DefaultFactoryImpl extends EFactoryImpl implements DefaultFactory {

+	/**

+	 * Creates the default factory implementation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static DefaultFactory init() {

+		try {

+			DefaultFactory theDefaultFactory = (DefaultFactory) EPackage.Registry.INSTANCE.getEFactory(DefaultPackage.eNS_URI);

+			if (theDefaultFactory != null) {

+				return theDefaultFactory;

+			}

+		} catch (Exception exception) {

+			EcorePlugin.INSTANCE.log(exception);

+		}

+		return new DefaultFactoryImpl();

+	}

+

+	/**

+	 * Creates an instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public DefaultFactoryImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EObject create(EClass eClass) {

+		switch (eClass.getClassifierID()) {

+		case DefaultPackage.DOCUMENTATION:

+			return createDocumentation();

+		case DefaultPackage.URL:

+			return createURL();

+		case DefaultPackage.LINK:

+			return createLink();

+		case DefaultPackage.META_CONSTRAINT:

+			return createMetaConstraint();

+		case DefaultPackage.MARKING_MODEL:

+			return createMarkingModel();

+		case DefaultPackage.MARKING_IMPORT:

+			return createMarkingImport();

+		case DefaultPackage.DEFAULT_LANGUAGE:

+			return createDefaultLanguage();

+		default:

+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object createFromString(EDataType eDataType, String initialValue) {

+		switch (eDataType.getClassifierID()) {

+		case DefaultPackage.MODE:

+			return createModeFromString(eDataType, initialValue);

+		case DefaultPackage.SEVERITY:

+			return createSeverityFromString(eDataType, initialValue);

+		default:

+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String convertToString(EDataType eDataType, Object instanceValue) {

+		switch (eDataType.getClassifierID()) {

+		case DefaultPackage.MODE:

+			return convertModeToString(eDataType, instanceValue);

+		case DefaultPackage.SEVERITY:

+			return convertSeverityToString(eDataType, instanceValue);

+		default:

+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Documentation createDocumentation() {

+		DocumentationImpl documentation = new DocumentationImpl();

+		return documentation;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public URL createURL() {

+		URLImpl url = new URLImpl();

+		return url;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Link createLink() {

+		LinkImpl link = new LinkImpl();

+		return link;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public MetaConstraint createMetaConstraint() {

+		MetaConstraintImpl metaConstraint = new MetaConstraintImpl();

+		return metaConstraint;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public MarkingModel createMarkingModel() {

+		MarkingModelImpl markingModel = new MarkingModelImpl();

+		return markingModel;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public MarkingImport createMarkingImport() {

+		MarkingImportImpl markingImport = new MarkingImportImpl();

+		return markingImport;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public DefaultLanguage createDefaultLanguage() {

+		DefaultLanguageImpl defaultLanguage = new DefaultLanguageImpl();

+		return defaultLanguage;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public Mode createModeFromString(EDataType eDataType, String initialValue) {

+		Mode result = Mode.get(initialValue);

+		if (result == null) {

+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		}

+		return result;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public String convertModeToString(EDataType eDataType, Object instanceValue) {

+		return instanceValue == null ? null : instanceValue.toString();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public Severity createSeverityFromString(EDataType eDataType, String initialValue) {

+		Severity result = Severity.get(initialValue);

+		if (result == null) {

+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		}

+		return result;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public String convertSeverityToString(EDataType eDataType, Object instanceValue) {

+		return instanceValue == null ? null : instanceValue.toString();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public DefaultPackage getDefaultPackage() {

+		return (DefaultPackage) getEPackage();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @deprecated

+	 * @generated

+	 */

+	@Deprecated

+	public static DefaultPackage getPackage() {

+		return DefaultPackage.eINSTANCE;

+	}

+

+} // DefaultFactoryImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/DefaultLanguageImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/DefaultLanguageImpl.java
new file mode 100644
index 00000000000..c6ba691ac56
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/DefaultLanguageImpl.java
@@ -0,0 +1,256 @@
+/**

+ *  * Copyright (c) 2013, 2014 CEA LIST.

+ *  *

+ *  * All rights reserved. This program and the accompanying materials

+ *  * are made available under the terms of the Eclipse Public License v1.0

+ *  * which accompanies this distribution, and is available at

+ *  * http://www.eclipse.org/legal/epl-v10.html

+ *  *

+ *  * Contributors:

+ *  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ */

+package org.eclipse.papyrus.migration.rsa.default_.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultLanguage;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Language</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.impl.DefaultLanguageImpl#getBase_Package <em>Base Package</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.impl.DefaultLanguageImpl#getDefaultLanguage <em>Default Language</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class DefaultLanguageImpl extends MinimalEObjectImpl.Container implements DefaultLanguage {

+	/**

+	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getBase_Package()

+	 * @generated

+	 * @ordered

+	 */

+	protected org.eclipse.uml2.uml.Package base_Package;

+

+	/**

+	 * The default value of the '{@link #getDefaultLanguage() <em>Default Language</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getDefaultLanguage()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String DEFAULT_LANGUAGE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getDefaultLanguage() <em>Default Language</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getDefaultLanguage()

+	 * @generated

+	 * @ordered

+	 */

+	protected String defaultLanguage = DEFAULT_LANGUAGE_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected DefaultLanguageImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DefaultPackage.Literals.DEFAULT_LANGUAGE;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public org.eclipse.uml2.uml.Package getBase_Package() {

+		if (base_Package != null && base_Package.eIsProxy()) {

+			InternalEObject oldBase_Package = (InternalEObject) base_Package;

+			base_Package = (org.eclipse.uml2.uml.Package) eResolveProxy(oldBase_Package);

+			if (base_Package != oldBase_Package) {

+				if (eNotificationRequired()) {

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DefaultPackage.DEFAULT_LANGUAGE__BASE_PACKAGE, oldBase_Package, base_Package));

+				}

+			}

+		}

+		return base_Package;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public org.eclipse.uml2.uml.Package basicGetBase_Package() {

+		return base_Package;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {

+		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;

+		base_Package = newBase_Package;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, DefaultPackage.DEFAULT_LANGUAGE__BASE_PACKAGE, oldBase_Package, base_Package));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getDefaultLanguage() {

+		return defaultLanguage;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setDefaultLanguage(String newDefaultLanguage) {

+		String oldDefaultLanguage = defaultLanguage;

+		defaultLanguage = newDefaultLanguage;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, DefaultPackage.DEFAULT_LANGUAGE__DEFAULT_LANGUAGE, oldDefaultLanguage, defaultLanguage));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case DefaultPackage.DEFAULT_LANGUAGE__BASE_PACKAGE:

+			if (resolve) {

+				return getBase_Package();

+			}

+			return basicGetBase_Package();

+		case DefaultPackage.DEFAULT_LANGUAGE__DEFAULT_LANGUAGE:

+			return getDefaultLanguage();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case DefaultPackage.DEFAULT_LANGUAGE__BASE_PACKAGE:

+			setBase_Package((org.eclipse.uml2.uml.Package) newValue);

+			return;

+		case DefaultPackage.DEFAULT_LANGUAGE__DEFAULT_LANGUAGE:

+			setDefaultLanguage((String) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case DefaultPackage.DEFAULT_LANGUAGE__BASE_PACKAGE:

+			setBase_Package((org.eclipse.uml2.uml.Package) null);

+			return;

+		case DefaultPackage.DEFAULT_LANGUAGE__DEFAULT_LANGUAGE:

+			setDefaultLanguage(DEFAULT_LANGUAGE_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case DefaultPackage.DEFAULT_LANGUAGE__BASE_PACKAGE:

+			return base_Package != null;

+		case DefaultPackage.DEFAULT_LANGUAGE__DEFAULT_LANGUAGE:

+			return DEFAULT_LANGUAGE_EDEFAULT == null ? defaultLanguage != null : !DEFAULT_LANGUAGE_EDEFAULT.equals(defaultLanguage);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (defaultLanguage: ");

+		result.append(defaultLanguage);

+		result.append(')');

+		return result.toString();

+	}

+

+} // DefaultLanguageImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/DefaultPackageImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/DefaultPackageImpl.java
new file mode 100644
index 00000000000..b2bc8c78013
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/DefaultPackageImpl.java
@@ -0,0 +1,594 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_.impl;

+

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EEnum;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.EReference;

+import org.eclipse.emf.ecore.EcorePackage;

+import org.eclipse.emf.ecore.impl.EPackageImpl;

+import org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultFactory;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultLanguage;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultPackage;

+import org.eclipse.papyrus.migration.rsa.default_.Documentation;

+import org.eclipse.papyrus.migration.rsa.default_.Link;

+import org.eclipse.papyrus.migration.rsa.default_.MarkingImport;

+import org.eclipse.papyrus.migration.rsa.default_.MarkingModel;

+import org.eclipse.papyrus.migration.rsa.default_.MetaConstraint;

+import org.eclipse.papyrus.migration.rsa.default_.Mode;

+import org.eclipse.papyrus.migration.rsa.default_.Severity;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Package</b>.

+ * <!-- end-user-doc -->

+ *

+ * @generated

+ */

+public class DefaultPackageImpl extends EPackageImpl implements DefaultPackage {

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass documentationEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass urlEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass linkEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass abstractConstraintEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass metaConstraintEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass markingModelEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass markingImportEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass defaultLanguageEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EEnum modeEEnum = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EEnum severityEEnum = null;

+

+	/**

+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

+	 * package URI value.

+	 * <p>

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.emf.ecore.EPackage.Registry

+	 * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage#eNS_URI

+	 * @see #init()

+	 * @generated

+	 */

+	private DefaultPackageImpl() {

+		super(eNS_URI, DefaultFactory.eINSTANCE);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private static boolean isInited = false;

+

+	/**

+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

+	 *

+	 * <p>

+	 * This method is used to initialize {@link DefaultPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

+	 * @see #eNS_URI

+	 * @see #createPackageContents()

+	 * @see #initializePackageContents()

+	 * @generated

+	 */

+	public static DefaultPackage init() {

+		if (isInited) {

+			return (DefaultPackage) EPackage.Registry.INSTANCE.getEPackage(DefaultPackage.eNS_URI);

+		}

+

+		// Obtain or create and register package

+		DefaultPackageImpl theDefaultPackage = (DefaultPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DefaultPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DefaultPackageImpl());

+

+		isInited = true;

+

+		// Initialize simple dependencies

+		UMLPackage.eINSTANCE.eClass();

+

+		// Create package meta-data objects

+		theDefaultPackage.createPackageContents();

+

+		// Initialize created meta-data

+		theDefaultPackage.initializePackageContents();

+

+		// Mark meta-data to indicate it can't be changed

+		theDefaultPackage.freeze();

+

+

+		// Update the registry and return the package

+		EPackage.Registry.INSTANCE.put(DefaultPackage.eNS_URI, theDefaultPackage);

+		return theDefaultPackage;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getDocumentation() {

+		return documentationEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getDocumentation_Base_Comment() {

+		return (EReference) documentationEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getURL() {

+		return urlEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getURL_Base_Comment() {

+		return (EReference) urlEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getURL_Type() {

+		return (EAttribute) urlEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getURL_DisplayName() {

+		return (EAttribute) urlEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getURL_Icon() {

+		return (EAttribute) urlEClass.getEStructuralFeatures().get(3);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getLink() {

+		return linkEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getAbstractConstraint() {

+		return abstractConstraintEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getAbstractConstraint_Base_Constraint() {

+		return (EReference) abstractConstraintEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getAbstractConstraint_EvaluationMode() {

+		return (EAttribute) abstractConstraintEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getAbstractConstraint_Severity() {

+		return (EAttribute) abstractConstraintEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getMetaConstraint() {

+		return metaConstraintEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getMetaConstraint_Message() {

+		return (EAttribute) metaConstraintEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getMarkingModel() {

+		return markingModelEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getMarkingModel_Base_Package() {

+		return (EReference) markingModelEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getMarkingImport() {

+		return markingImportEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getMarkingImport_Base_ElementImport() {

+		return (EReference) markingImportEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getDefaultLanguage() {

+		return defaultLanguageEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getDefaultLanguage_Base_Package() {

+		return (EReference) defaultLanguageEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getDefaultLanguage_DefaultLanguage() {

+		return (EAttribute) defaultLanguageEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EEnum getMode() {

+		return modeEEnum;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EEnum getSeverity() {

+		return severityEEnum;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public DefaultFactory getDefaultFactory() {

+		return (DefaultFactory) getEFactoryInstance();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private boolean isCreated = false;

+

+	/**

+	 * Creates the meta-model objects for the package. This method is

+	 * guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public void createPackageContents() {

+		if (isCreated) {

+			return;

+		}

+		isCreated = true;

+

+		// Create classes and their features

+		documentationEClass = createEClass(DOCUMENTATION);

+		createEReference(documentationEClass, DOCUMENTATION__BASE_COMMENT);

+

+		urlEClass = createEClass(URL);

+		createEReference(urlEClass, URL__BASE_COMMENT);

+		createEAttribute(urlEClass, URL__TYPE);

+		createEAttribute(urlEClass, URL__DISPLAY_NAME);

+		createEAttribute(urlEClass, URL__ICON);

+

+		linkEClass = createEClass(LINK);

+

+		abstractConstraintEClass = createEClass(ABSTRACT_CONSTRAINT);

+		createEReference(abstractConstraintEClass, ABSTRACT_CONSTRAINT__BASE_CONSTRAINT);

+		createEAttribute(abstractConstraintEClass, ABSTRACT_CONSTRAINT__EVALUATION_MODE);

+		createEAttribute(abstractConstraintEClass, ABSTRACT_CONSTRAINT__SEVERITY);

+

+		metaConstraintEClass = createEClass(META_CONSTRAINT);

+		createEAttribute(metaConstraintEClass, META_CONSTRAINT__MESSAGE);

+

+		markingModelEClass = createEClass(MARKING_MODEL);

+		createEReference(markingModelEClass, MARKING_MODEL__BASE_PACKAGE);

+

+		markingImportEClass = createEClass(MARKING_IMPORT);

+		createEReference(markingImportEClass, MARKING_IMPORT__BASE_ELEMENT_IMPORT);

+

+		defaultLanguageEClass = createEClass(DEFAULT_LANGUAGE);

+		createEReference(defaultLanguageEClass, DEFAULT_LANGUAGE__BASE_PACKAGE);

+		createEAttribute(defaultLanguageEClass, DEFAULT_LANGUAGE__DEFAULT_LANGUAGE);

+

+		// Create enums

+		modeEEnum = createEEnum(MODE);

+		severityEEnum = createEEnum(SEVERITY);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private boolean isInitialized = false;

+

+	/**

+	 * Complete the initialization of the package and its meta-model. This

+	 * method is guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public void initializePackageContents() {

+		if (isInitialized) {

+			return;

+		}

+		isInitialized = true;

+

+		// Initialize package

+		setName(eNAME);

+		setNsPrefix(eNS_PREFIX);

+		setNsURI(eNS_URI);

+

+		// Obtain other dependent packages

+		UMLPackage theUMLPackage = (UMLPackage) EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

+		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

+

+		// Create type parameters

+

+		// Set bounds for type parameters

+

+		// Add supertypes to classes

+		linkEClass.getESuperTypes().add(this.getURL());

+		metaConstraintEClass.getESuperTypes().add(this.getAbstractConstraint());

+

+		// Initialize classes, features, and operations; add parameters

+		initEClass(documentationEClass, Documentation.class, "Documentation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getDocumentation_Base_Comment(), theUMLPackage.getComment(), null, "base_Comment", null, 1, 1, Documentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+				IS_ORDERED);

+

+		initEClass(urlEClass, org.eclipse.papyrus.migration.rsa.default_.URL.class, "URL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getURL_Base_Comment(), theUMLPackage.getComment(), null, "base_Comment", null, 1, 1, org.eclipse.papyrus.migration.rsa.default_.URL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getURL_Type(), theEcorePackage.getEString(), "type", null, 1, 1, org.eclipse.papyrus.migration.rsa.default_.URL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getURL_DisplayName(), theEcorePackage.getEString(), "displayName", null, 1, 1, org.eclipse.papyrus.migration.rsa.default_.URL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getURL_Icon(), theEcorePackage.getEByteArray(), "icon", null, 1, 1, org.eclipse.papyrus.migration.rsa.default_.URL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(linkEClass, Link.class, "Link", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+		initEClass(abstractConstraintEClass, AbstractConstraint.class, "AbstractConstraint", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getAbstractConstraint_Base_Constraint(), theUMLPackage.getConstraint(), null, "base_Constraint", null, 1, 1, AbstractConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getAbstractConstraint_EvaluationMode(), this.getMode(), "evaluationMode", "batch", 1, 1, AbstractConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getAbstractConstraint_Severity(), this.getSeverity(), "severity", "error", 1, 1, AbstractConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(metaConstraintEClass, MetaConstraint.class, "MetaConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getMetaConstraint_Message(), theEcorePackage.getEString(), "message", null, 1, 1, MetaConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(markingModelEClass, MarkingModel.class, "MarkingModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getMarkingModel_Base_Package(), theUMLPackage.getPackage(), null, "base_Package", null, 1, 1, MarkingModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+				IS_ORDERED);

+

+		initEClass(markingImportEClass, MarkingImport.class, "MarkingImport", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getMarkingImport_Base_ElementImport(), theUMLPackage.getElementImport(), null, "base_ElementImport", null, 1, 1, MarkingImport.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(defaultLanguageEClass, DefaultLanguage.class, "DefaultLanguage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getDefaultLanguage_Base_Package(), theUMLPackage.getPackage(), null, "base_Package", null, 0, 1, DefaultLanguage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

+				!IS_DERIVED, IS_ORDERED);

+		initEAttribute(getDefaultLanguage_DefaultLanguage(), theEcorePackage.getEString(), "defaultLanguage", null, 0, 1, DefaultLanguage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		// Initialize enums and add enum literals

+		initEEnum(modeEEnum, Mode.class, "Mode");

+		addEEnumLiteral(modeEEnum, Mode.BATCH);

+		addEEnumLiteral(modeEEnum, Mode.LIVE);

+

+		initEEnum(severityEEnum, Severity.class, "Severity");

+		addEEnumLiteral(severityEEnum, Severity.ERROR);

+		addEEnumLiteral(severityEEnum, Severity.WARNING);

+		addEEnumLiteral(severityEEnum, Severity.INFO);

+

+		// Create resource

+		createResource(eNS_URI);

+	}

+

+} // DefaultPackageImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/DocumentationImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/DocumentationImpl.java
new file mode 100644
index 00000000000..ee5e9c1853e
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/DocumentationImpl.java
@@ -0,0 +1,179 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultPackage;

+import org.eclipse.papyrus.migration.rsa.default_.Documentation;

+import org.eclipse.uml2.uml.Comment;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Documentation</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.impl.DocumentationImpl#getBase_Comment <em>Base Comment</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class DocumentationImpl extends MinimalEObjectImpl.Container implements Documentation {

+	/**

+	 * The cached value of the '{@link #getBase_Comment() <em>Base Comment</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getBase_Comment()

+	 * @generated

+	 * @ordered

+	 */

+	protected Comment base_Comment;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected DocumentationImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DefaultPackage.Literals.DOCUMENTATION;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Comment getBase_Comment() {

+		if (base_Comment != null && base_Comment.eIsProxy()) {

+			InternalEObject oldBase_Comment = (InternalEObject) base_Comment;

+			base_Comment = (Comment) eResolveProxy(oldBase_Comment);

+			if (base_Comment != oldBase_Comment) {

+				if (eNotificationRequired()) {

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DefaultPackage.DOCUMENTATION__BASE_COMMENT, oldBase_Comment, base_Comment));

+				}

+			}

+		}

+		return base_Comment;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public Comment basicGetBase_Comment() {

+		return base_Comment;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setBase_Comment(Comment newBase_Comment) {

+		Comment oldBase_Comment = base_Comment;

+		base_Comment = newBase_Comment;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, DefaultPackage.DOCUMENTATION__BASE_COMMENT, oldBase_Comment, base_Comment));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case DefaultPackage.DOCUMENTATION__BASE_COMMENT:

+			if (resolve) {

+				return getBase_Comment();

+			}

+			return basicGetBase_Comment();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case DefaultPackage.DOCUMENTATION__BASE_COMMENT:

+			setBase_Comment((Comment) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case DefaultPackage.DOCUMENTATION__BASE_COMMENT:

+			setBase_Comment((Comment) null);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case DefaultPackage.DOCUMENTATION__BASE_COMMENT:

+			return base_Comment != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} // DocumentationImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/LinkImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/LinkImpl.java
new file mode 100644
index 00000000000..9da5da1571e
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/LinkImpl.java
@@ -0,0 +1,49 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_.impl;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultPackage;

+import org.eclipse.papyrus.migration.rsa.default_.Link;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Link</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * </p>

+ *

+ * @generated

+ */

+public class LinkImpl extends URLImpl implements Link {

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected LinkImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DefaultPackage.Literals.LINK;

+	}

+

+} // LinkImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/MarkingImportImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/MarkingImportImpl.java
new file mode 100644
index 00000000000..22c7663f839
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/MarkingImportImpl.java
@@ -0,0 +1,179 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultPackage;

+import org.eclipse.papyrus.migration.rsa.default_.MarkingImport;

+import org.eclipse.uml2.uml.ElementImport;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Marking Import</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.impl.MarkingImportImpl#getBase_ElementImport <em>Base Element Import</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class MarkingImportImpl extends MinimalEObjectImpl.Container implements MarkingImport {

+	/**

+	 * The cached value of the '{@link #getBase_ElementImport() <em>Base Element Import</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getBase_ElementImport()

+	 * @generated

+	 * @ordered

+	 */

+	protected ElementImport base_ElementImport;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected MarkingImportImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DefaultPackage.Literals.MARKING_IMPORT;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public ElementImport getBase_ElementImport() {

+		if (base_ElementImport != null && base_ElementImport.eIsProxy()) {

+			InternalEObject oldBase_ElementImport = (InternalEObject) base_ElementImport;

+			base_ElementImport = (ElementImport) eResolveProxy(oldBase_ElementImport);

+			if (base_ElementImport != oldBase_ElementImport) {

+				if (eNotificationRequired()) {

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DefaultPackage.MARKING_IMPORT__BASE_ELEMENT_IMPORT, oldBase_ElementImport, base_ElementImport));

+				}

+			}

+		}

+		return base_ElementImport;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public ElementImport basicGetBase_ElementImport() {

+		return base_ElementImport;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setBase_ElementImport(ElementImport newBase_ElementImport) {

+		ElementImport oldBase_ElementImport = base_ElementImport;

+		base_ElementImport = newBase_ElementImport;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, DefaultPackage.MARKING_IMPORT__BASE_ELEMENT_IMPORT, oldBase_ElementImport, base_ElementImport));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case DefaultPackage.MARKING_IMPORT__BASE_ELEMENT_IMPORT:

+			if (resolve) {

+				return getBase_ElementImport();

+			}

+			return basicGetBase_ElementImport();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case DefaultPackage.MARKING_IMPORT__BASE_ELEMENT_IMPORT:

+			setBase_ElementImport((ElementImport) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case DefaultPackage.MARKING_IMPORT__BASE_ELEMENT_IMPORT:

+			setBase_ElementImport((ElementImport) null);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case DefaultPackage.MARKING_IMPORT__BASE_ELEMENT_IMPORT:

+			return base_ElementImport != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} // MarkingImportImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/MarkingModelImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/MarkingModelImpl.java
new file mode 100644
index 00000000000..b3008133347
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/MarkingModelImpl.java
@@ -0,0 +1,178 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultPackage;

+import org.eclipse.papyrus.migration.rsa.default_.MarkingModel;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Marking Model</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.impl.MarkingModelImpl#getBase_Package <em>Base Package</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class MarkingModelImpl extends MinimalEObjectImpl.Container implements MarkingModel {

+	/**

+	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getBase_Package()

+	 * @generated

+	 * @ordered

+	 */

+	protected org.eclipse.uml2.uml.Package base_Package;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected MarkingModelImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DefaultPackage.Literals.MARKING_MODEL;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public org.eclipse.uml2.uml.Package getBase_Package() {

+		if (base_Package != null && base_Package.eIsProxy()) {

+			InternalEObject oldBase_Package = (InternalEObject) base_Package;

+			base_Package = (org.eclipse.uml2.uml.Package) eResolveProxy(oldBase_Package);

+			if (base_Package != oldBase_Package) {

+				if (eNotificationRequired()) {

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DefaultPackage.MARKING_MODEL__BASE_PACKAGE, oldBase_Package, base_Package));

+				}

+			}

+		}

+		return base_Package;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public org.eclipse.uml2.uml.Package basicGetBase_Package() {

+		return base_Package;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {

+		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;

+		base_Package = newBase_Package;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, DefaultPackage.MARKING_MODEL__BASE_PACKAGE, oldBase_Package, base_Package));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case DefaultPackage.MARKING_MODEL__BASE_PACKAGE:

+			if (resolve) {

+				return getBase_Package();

+			}

+			return basicGetBase_Package();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case DefaultPackage.MARKING_MODEL__BASE_PACKAGE:

+			setBase_Package((org.eclipse.uml2.uml.Package) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case DefaultPackage.MARKING_MODEL__BASE_PACKAGE:

+			setBase_Package((org.eclipse.uml2.uml.Package) null);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case DefaultPackage.MARKING_MODEL__BASE_PACKAGE:

+			return base_Package != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} // MarkingModelImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/MetaConstraintImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/MetaConstraintImpl.java
new file mode 100644
index 00000000000..7aac6fd0c23
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/MetaConstraintImpl.java
@@ -0,0 +1,183 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultPackage;

+import org.eclipse.papyrus.migration.rsa.default_.MetaConstraint;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Meta Constraint</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.impl.MetaConstraintImpl#getMessage <em>Message</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class MetaConstraintImpl extends AbstractConstraintImpl implements MetaConstraint {

+	/**

+	 * The default value of the '{@link #getMessage() <em>Message</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getMessage()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String MESSAGE_EDEFAULT = null;

+	/**

+	 * The cached value of the '{@link #getMessage() <em>Message</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getMessage()

+	 * @generated

+	 * @ordered

+	 */

+	protected String message = MESSAGE_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected MetaConstraintImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DefaultPackage.Literals.META_CONSTRAINT;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getMessage() {

+		return message;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setMessage(String newMessage) {

+		String oldMessage = message;

+		message = newMessage;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, DefaultPackage.META_CONSTRAINT__MESSAGE, oldMessage, message));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case DefaultPackage.META_CONSTRAINT__MESSAGE:

+			return getMessage();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case DefaultPackage.META_CONSTRAINT__MESSAGE:

+			setMessage((String) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case DefaultPackage.META_CONSTRAINT__MESSAGE:

+			setMessage(MESSAGE_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case DefaultPackage.META_CONSTRAINT__MESSAGE:

+			return MESSAGE_EDEFAULT == null ? message != null : !MESSAGE_EDEFAULT.equals(message);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (message: ");

+		result.append(message);

+		result.append(')');

+		return result.toString();

+	}

+

+} // MetaConstraintImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/URLImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/URLImpl.java
new file mode 100644
index 00000000000..4b12554f6bc
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/impl/URLImpl.java
@@ -0,0 +1,379 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultPackage;

+import org.eclipse.papyrus.migration.rsa.default_.URL;

+import org.eclipse.uml2.uml.Comment;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>URL</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.impl.URLImpl#getBase_Comment <em>Base Comment</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.impl.URLImpl#getType <em>Type</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.impl.URLImpl#getDisplayName <em>Display Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.default_.impl.URLImpl#getIcon <em>Icon</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class URLImpl extends MinimalEObjectImpl.Container implements URL {

+	/**

+	 * The cached value of the '{@link #getBase_Comment() <em>Base Comment</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getBase_Comment()

+	 * @generated

+	 * @ordered

+	 */

+	protected Comment base_Comment;

+

+	/**

+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String TYPE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String type = TYPE_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getDisplayName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String DISPLAY_NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getDisplayName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String displayName = DISPLAY_NAME_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getIcon() <em>Icon</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getIcon()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final byte[] ICON_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getIcon() <em>Icon</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getIcon()

+	 * @generated

+	 * @ordered

+	 */

+	protected byte[] icon = ICON_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected URLImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DefaultPackage.Literals.URL;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Comment getBase_Comment() {

+		if (base_Comment != null && base_Comment.eIsProxy()) {

+			InternalEObject oldBase_Comment = (InternalEObject) base_Comment;

+			base_Comment = (Comment) eResolveProxy(oldBase_Comment);

+			if (base_Comment != oldBase_Comment) {

+				if (eNotificationRequired()) {

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DefaultPackage.URL__BASE_COMMENT, oldBase_Comment, base_Comment));

+				}

+			}

+		}

+		return base_Comment;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public Comment basicGetBase_Comment() {

+		return base_Comment;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setBase_Comment(Comment newBase_Comment) {

+		Comment oldBase_Comment = base_Comment;

+		base_Comment = newBase_Comment;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, DefaultPackage.URL__BASE_COMMENT, oldBase_Comment, base_Comment));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getType() {

+		return type;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setType(String newType) {

+		String oldType = type;

+		type = newType;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, DefaultPackage.URL__TYPE, oldType, type));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getDisplayName() {

+		return displayName;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setDisplayName(String newDisplayName) {

+		String oldDisplayName = displayName;

+		displayName = newDisplayName;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, DefaultPackage.URL__DISPLAY_NAME, oldDisplayName, displayName));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public byte[] getIcon() {

+		return icon;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setIcon(byte[] newIcon) {

+		byte[] oldIcon = icon;

+		icon = newIcon;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, DefaultPackage.URL__ICON, oldIcon, icon));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case DefaultPackage.URL__BASE_COMMENT:

+			if (resolve) {

+				return getBase_Comment();

+			}

+			return basicGetBase_Comment();

+		case DefaultPackage.URL__TYPE:

+			return getType();

+		case DefaultPackage.URL__DISPLAY_NAME:

+			return getDisplayName();

+		case DefaultPackage.URL__ICON:

+			return getIcon();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case DefaultPackage.URL__BASE_COMMENT:

+			setBase_Comment((Comment) newValue);

+			return;

+		case DefaultPackage.URL__TYPE:

+			setType((String) newValue);

+			return;

+		case DefaultPackage.URL__DISPLAY_NAME:

+			setDisplayName((String) newValue);

+			return;

+		case DefaultPackage.URL__ICON:

+			setIcon((byte[]) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case DefaultPackage.URL__BASE_COMMENT:

+			setBase_Comment((Comment) null);

+			return;

+		case DefaultPackage.URL__TYPE:

+			setType(TYPE_EDEFAULT);

+			return;

+		case DefaultPackage.URL__DISPLAY_NAME:

+			setDisplayName(DISPLAY_NAME_EDEFAULT);

+			return;

+		case DefaultPackage.URL__ICON:

+			setIcon(ICON_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case DefaultPackage.URL__BASE_COMMENT:

+			return base_Comment != null;

+		case DefaultPackage.URL__TYPE:

+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);

+		case DefaultPackage.URL__DISPLAY_NAME:

+			return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);

+		case DefaultPackage.URL__ICON:

+			return ICON_EDEFAULT == null ? icon != null : !ICON_EDEFAULT.equals(icon);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (type: ");

+		result.append(type);

+		result.append(", displayName: ");

+		result.append(displayName);

+		result.append(", icon: ");

+		result.append(icon);

+		result.append(')');

+		return result.toString();

+	}

+

+} // URLImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/util/DefaultAdapterFactory.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/util/DefaultAdapterFactory.java
new file mode 100644
index 00000000000..36b9218ef9a
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/util/DefaultAdapterFactory.java
@@ -0,0 +1,284 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_.util;

+

+import org.eclipse.emf.common.notify.Adapter;

+import org.eclipse.emf.common.notify.Notifier;

+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultLanguage;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultPackage;

+import org.eclipse.papyrus.migration.rsa.default_.Documentation;

+import org.eclipse.papyrus.migration.rsa.default_.Link;

+import org.eclipse.papyrus.migration.rsa.default_.MarkingImport;

+import org.eclipse.papyrus.migration.rsa.default_.MarkingModel;

+import org.eclipse.papyrus.migration.rsa.default_.MetaConstraint;

+import org.eclipse.papyrus.migration.rsa.default_.URL;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Adapter Factory</b> for the model.

+ * It provides an adapter <code>createXXX</code> method for each class of the model.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage

+ * @generated

+ */

+public class DefaultAdapterFactory extends AdapterFactoryImpl {

+	/**

+	 * The cached model package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected static DefaultPackage modelPackage;

+

+	/**

+	 * Creates an instance of the adapter factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public DefaultAdapterFactory() {

+		if (modelPackage == null) {

+			modelPackage = DefaultPackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Returns whether this factory is applicable for the type of the object.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return whether this factory is applicable for the type of the object.

+	 * @generated

+	 */

+	@Override

+	public boolean isFactoryForType(Object object) {

+		if (object == modelPackage) {

+			return true;

+		}

+		if (object instanceof EObject) {

+			return ((EObject) object).eClass().getEPackage() == modelPackage;

+		}

+		return false;

+	}

+

+	/**

+	 * The switch that delegates to the <code>createXXX</code> methods.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected DefaultSwitch<Adapter> modelSwitch =

+			new DefaultSwitch<Adapter>() {

+				@Override

+				public Adapter caseDocumentation(Documentation object) {

+					return createDocumentationAdapter();

+				}

+

+				@Override

+				public Adapter caseURL(URL object) {

+					return createURLAdapter();

+				}

+

+				@Override

+				public Adapter caseLink(Link object) {

+					return createLinkAdapter();

+				}

+

+				@Override

+				public Adapter caseAbstractConstraint(AbstractConstraint object) {

+					return createAbstractConstraintAdapter();

+				}

+

+				@Override

+				public Adapter caseMetaConstraint(MetaConstraint object) {

+					return createMetaConstraintAdapter();

+				}

+

+				@Override

+				public Adapter caseMarkingModel(MarkingModel object) {

+					return createMarkingModelAdapter();

+				}

+

+				@Override

+				public Adapter caseMarkingImport(MarkingImport object) {

+					return createMarkingImportAdapter();

+				}

+

+				@Override

+				public Adapter caseDefaultLanguage(DefaultLanguage object) {

+					return createDefaultLanguageAdapter();

+				}

+

+				@Override

+				public Adapter defaultCase(EObject object) {

+					return createEObjectAdapter();

+				}

+			};

+

+	/**

+	 * Creates an adapter for the <code>target</code>.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param target

+	 *            the object to adapt.

+	 * @return the adapter for the <code>target</code>.

+	 * @generated

+	 */

+	@Override

+	public Adapter createAdapter(Notifier target) {

+		return modelSwitch.doSwitch((EObject) target);

+	}

+

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.default_.Documentation <em>Documentation</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.Documentation

+	 * @generated

+	 */

+	public Adapter createDocumentationAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.default_.URL <em>URL</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.URL

+	 * @generated

+	 */

+	public Adapter createURLAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.default_.Link <em>Link</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.Link

+	 * @generated

+	 */

+	public Adapter createLinkAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint <em>Abstract Constraint</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint

+	 * @generated

+	 */

+	public Adapter createAbstractConstraintAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.default_.MetaConstraint <em>Meta Constraint</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.MetaConstraint

+	 * @generated

+	 */

+	public Adapter createMetaConstraintAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.default_.MarkingModel <em>Marking Model</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.MarkingModel

+	 * @generated

+	 */

+	public Adapter createMarkingModelAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.default_.MarkingImport <em>Marking Import</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.MarkingImport

+	 * @generated

+	 */

+	public Adapter createMarkingImportAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.default_.DefaultLanguage <em>Language</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.DefaultLanguage

+	 * @generated

+	 */

+	public Adapter createDefaultLanguageAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for the default case.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @generated

+	 */

+	public Adapter createEObjectAdapter() {

+		return null;

+	}

+

+} // DefaultAdapterFactory

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/util/DefaultResourceFactoryImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/util/DefaultResourceFactoryImpl.java
new file mode 100644
index 00000000000..ad75a8165c4
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/util/DefaultResourceFactoryImpl.java
@@ -0,0 +1,51 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_.util;

+

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Resource Factory</b> associated with the package.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.default_.util.DefaultResourceImpl

+ * @generated

+ */

+public class DefaultResourceFactoryImpl extends ResourceFactoryImpl {

+	/**

+	 * Creates an instance of the resource factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public DefaultResourceFactoryImpl() {

+		super();

+	}

+

+	/**

+	 * Creates an instance of the resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Resource createResource(URI uri) {

+		Resource result = new DefaultResourceImpl(uri);

+		return result;

+	}

+

+} // DefaultResourceFactoryImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/util/DefaultResourceImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/util/DefaultResourceImpl.java
new file mode 100644
index 00000000000..4432755b499
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/util/DefaultResourceImpl.java
@@ -0,0 +1,39 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_.util;

+

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Resource </b> associated with the package.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.default_.util.DefaultResourceFactoryImpl

+ * @generated

+ */

+public class DefaultResourceImpl extends XMLResourceImpl {

+	/**

+	 * Creates an instance of the resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param uri

+	 *            the URI of the new resource.

+	 * @generated

+	 */

+	public DefaultResourceImpl(URI uri) {

+		super(uri);

+	}

+

+} // DefaultResourceImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/util/DefaultSwitch.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/util/DefaultSwitch.java
new file mode 100644
index 00000000000..d4f980094fa
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/util/DefaultSwitch.java
@@ -0,0 +1,317 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_.util;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.util.Switch;

+import org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultLanguage;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultPackage;

+import org.eclipse.papyrus.migration.rsa.default_.Documentation;

+import org.eclipse.papyrus.migration.rsa.default_.Link;

+import org.eclipse.papyrus.migration.rsa.default_.MarkingImport;

+import org.eclipse.papyrus.migration.rsa.default_.MarkingModel;

+import org.eclipse.papyrus.migration.rsa.default_.MetaConstraint;

+import org.eclipse.papyrus.migration.rsa.default_.URL;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Switch</b> for the model's inheritance hierarchy.

+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

+ * starting with the actual class of the object

+ * and proceeding up the inheritance hierarchy

+ * until a non-null result is returned,

+ * which is the result of the switch.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.default_.DefaultPackage

+ * @generated

+ */

+public class DefaultSwitch<T> extends Switch<T> {

+	/**

+	 * The cached model package

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected static DefaultPackage modelPackage;

+

+	/**

+	 * Creates an instance of the switch.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public DefaultSwitch() {

+		if (modelPackage == null) {

+			modelPackage = DefaultPackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Checks whether this is a switch for the given package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @parameter ePackage the package in question.

+	 * @return whether this is a switch for the given package.

+	 * @generated

+	 */

+	@Override

+	protected boolean isSwitchFor(EPackage ePackage) {

+		return ePackage == modelPackage;

+	}

+

+	/**

+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the first non-null result returned by a <code>caseXXX</code> call.

+	 * @generated

+	 */

+	@Override

+	protected T doSwitch(int classifierID, EObject theEObject) {

+		switch (classifierID) {

+		case DefaultPackage.DOCUMENTATION: {

+			Documentation documentation = (Documentation) theEObject;

+			T result = caseDocumentation(documentation);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case DefaultPackage.URL: {

+			URL url = (URL) theEObject;

+			T result = caseURL(url);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case DefaultPackage.LINK: {

+			Link link = (Link) theEObject;

+			T result = caseLink(link);

+			if (result == null) {

+				result = caseURL(link);

+			}

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case DefaultPackage.ABSTRACT_CONSTRAINT: {

+			AbstractConstraint abstractConstraint = (AbstractConstraint) theEObject;

+			T result = caseAbstractConstraint(abstractConstraint);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case DefaultPackage.META_CONSTRAINT: {

+			MetaConstraint metaConstraint = (MetaConstraint) theEObject;

+			T result = caseMetaConstraint(metaConstraint);

+			if (result == null) {

+				result = caseAbstractConstraint(metaConstraint);

+			}

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case DefaultPackage.MARKING_MODEL: {

+			MarkingModel markingModel = (MarkingModel) theEObject;

+			T result = caseMarkingModel(markingModel);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case DefaultPackage.MARKING_IMPORT: {

+			MarkingImport markingImport = (MarkingImport) theEObject;

+			T result = caseMarkingImport(markingImport);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case DefaultPackage.DEFAULT_LANGUAGE: {

+			DefaultLanguage defaultLanguage = (DefaultLanguage) theEObject;

+			T result = caseDefaultLanguage(defaultLanguage);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		default:

+			return defaultCase(theEObject);

+		}

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Documentation</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Documentation</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseDocumentation(Documentation object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>URL</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>URL</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseURL(URL object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Link</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Link</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseLink(Link object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Constraint</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Abstract Constraint</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseAbstractConstraint(AbstractConstraint object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Meta Constraint</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Meta Constraint</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseMetaConstraint(MetaConstraint object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Marking Model</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Marking Model</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseMarkingModel(MarkingModel object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Marking Import</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Marking Import</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseMarkingImport(MarkingImport object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Language</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Language</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseDefaultLanguage(DefaultLanguage object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch, but this is the last case anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

+	 * @generated

+	 */

+	@Override

+	public T defaultCase(EObject object) {

+		return null;

+	}

+

+} // DefaultSwitch

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/util/DefaultXMLProcessor.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/util/DefaultXMLProcessor.java
new file mode 100644
index 00000000000..5b9fa787cbb
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/default_/util/DefaultXMLProcessor.java
@@ -0,0 +1,59 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.default_.util;

+

+import java.util.Map;

+

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultPackage;

+

+/**

+ * This class contains helper methods to serialize and deserialize XML documents

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ *

+ * @generated

+ */

+public class DefaultXMLProcessor extends XMLProcessor {

+

+	/**

+	 * Public constructor to instantiate the helper.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public DefaultXMLProcessor() {

+		super((EPackage.Registry.INSTANCE));

+		DefaultPackage.eINSTANCE.eClass();

+	}

+

+	/**

+	 * Register for "*" and "xml" file extensions the DefaultResourceFactoryImpl factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected Map<String, Resource.Factory> getRegistrations() {

+		if (registrations == null) {

+			super.getRegistrations();

+			registrations.put(XML_EXTENSION, new DefaultResourceFactoryImpl());

+			registrations.put(STAR_EXTENSION, new DefaultResourceFactoryImpl());

+		}

+		return registrations;

+	}

+

+} // DefaultXMLProcessor

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/ProfileBaseFactory.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/ProfileBaseFactory.java
new file mode 100644
index 00000000000..ac09c6fc641
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/ProfileBaseFactory.java
@@ -0,0 +1,55 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.profilebase;

+

+import org.eclipse.emf.ecore.EFactory;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Factory</b> for the model.

+ * It provides a create method for each non-abstract class of the model.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.profilebase.ProfileBasePackage

+ * @generated

+ */

+public interface ProfileBaseFactory extends EFactory {

+	/**

+	 * The singleton instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	ProfileBaseFactory eINSTANCE = org.eclipse.papyrus.migration.rsa.profilebase.impl.ProfileBaseFactoryImpl.init();

+

+	/**

+	 * Returns a new object of class '<em>Profile Constraint</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Profile Constraint</em>'.

+	 * @generated

+	 */

+	ProfileConstraint createProfileConstraint();

+

+	/**

+	 * Returns the package supported by this factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the package supported by this factory.

+	 * @generated

+	 */

+	ProfileBasePackage getProfileBasePackage();

+

+} // ProfileBaseFactory

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/ProfileBasePackage.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/ProfileBasePackage.java
new file mode 100644
index 00000000000..e54ab4d85c1
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/ProfileBasePackage.java
@@ -0,0 +1,215 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.profilebase;

+

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Package</b> for the model.

+ * It contains accessors for the meta objects to represent

+ * <ul>

+ * <li>each class,</li>

+ * <li>each feature of each class,</li>

+ * <li>each operation of each class,</li>

+ * <li>each enum,</li>

+ * <li>and each data type</li>

+ * </ul>

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.profilebase.ProfileBaseFactory

+ * @model kind="package"

+ * @generated

+ */

+public interface ProfileBasePackage extends EPackage {

+	/**

+	 * The package name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	String eNAME = "profilebase";

+

+	/**

+	 * The package namespace URI.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	String eNS_URI = "http://www.eclipse.org/papyrus/profile/profilebase";

+

+	/**

+	 * The package namespace name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	String eNS_PREFIX = "ProfileBase";

+

+	/**

+	 * The singleton instance of the package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	ProfileBasePackage eINSTANCE = org.eclipse.papyrus.migration.rsa.profilebase.impl.ProfileBasePackageImpl.init();

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.profilebase.impl.ProfileConstraintImpl <em>Profile Constraint</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.profilebase.impl.ProfileConstraintImpl

+	 * @see org.eclipse.papyrus.migration.rsa.profilebase.impl.ProfileBasePackageImpl#getProfileConstraint()

+	 * @generated

+	 */

+	int PROFILE_CONSTRAINT = 0;

+

+	/**

+	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PROFILE_CONSTRAINT__BASE_CONSTRAINT = DefaultPackage.ABSTRACT_CONSTRAINT__BASE_CONSTRAINT;

+

+	/**

+	 * The feature id for the '<em><b>Evaluation Mode</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PROFILE_CONSTRAINT__EVALUATION_MODE = DefaultPackage.ABSTRACT_CONSTRAINT__EVALUATION_MODE;

+

+	/**

+	 * The feature id for the '<em><b>Severity</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PROFILE_CONSTRAINT__SEVERITY = DefaultPackage.ABSTRACT_CONSTRAINT__SEVERITY;

+

+	/**

+	 * The feature id for the '<em><b>Message Key</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PROFILE_CONSTRAINT__MESSAGE_KEY = DefaultPackage.ABSTRACT_CONSTRAINT_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>Profile Constraint</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PROFILE_CONSTRAINT_FEATURE_COUNT = DefaultPackage.ABSTRACT_CONSTRAINT_FEATURE_COUNT + 1;

+

+	/**

+	 * The number of operations of the '<em>Profile Constraint</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PROFILE_CONSTRAINT_OPERATION_COUNT = DefaultPackage.ABSTRACT_CONSTRAINT_OPERATION_COUNT + 0;

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.profilebase.ProfileConstraint <em>Profile Constraint</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Profile Constraint</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.profilebase.ProfileConstraint

+	 * @generated

+	 */

+	EClass getProfileConstraint();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.profilebase.ProfileConstraint#getMessageKey <em>Message Key</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Message Key</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.profilebase.ProfileConstraint#getMessageKey()

+	 * @see #getProfileConstraint()

+	 * @generated

+	 */

+	EAttribute getProfileConstraint_MessageKey();

+

+	/**

+	 * Returns the factory that creates the instances of the model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the factory that creates the instances of the model.

+	 * @generated

+	 */

+	ProfileBaseFactory getProfileBaseFactory();

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * Defines literals for the meta objects that represent

+	 * <ul>

+	 * <li>each class,</li>

+	 * <li>each feature of each class,</li>

+	 * <li>each operation of each class,</li>

+	 * <li>each enum,</li>

+	 * <li>and each data type</li>

+	 * </ul>

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	interface Literals {

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.profilebase.impl.ProfileConstraintImpl <em>Profile Constraint</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.profilebase.impl.ProfileConstraintImpl

+		 * @see org.eclipse.papyrus.migration.rsa.profilebase.impl.ProfileBasePackageImpl#getProfileConstraint()

+		 * @generated

+		 */

+		EClass PROFILE_CONSTRAINT = eINSTANCE.getProfileConstraint();

+

+		/**

+		 * The meta object literal for the '<em><b>Message Key</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute PROFILE_CONSTRAINT__MESSAGE_KEY = eINSTANCE.getProfileConstraint_MessageKey();

+

+	}

+

+} // ProfileBasePackage

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/ProfileConstraint.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/ProfileConstraint.java
new file mode 100644
index 00000000000..e4b679e9636
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/ProfileConstraint.java
@@ -0,0 +1,61 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.profilebase;

+

+import org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Profile Constraint</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.profilebase.ProfileConstraint#getMessageKey <em>Message Key</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.profilebase.ProfileBasePackage#getProfileConstraint()

+ * @model

+ * @generated

+ */

+public interface ProfileConstraint extends AbstractConstraint {

+	/**

+	 * Returns the value of the '<em><b>Message Key</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Message Key</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Message Key</em>' attribute.

+	 * @see #setMessageKey(String)

+	 * @see org.eclipse.papyrus.migration.rsa.profilebase.ProfileBasePackage#getProfileConstraint_MessageKey()

+	 * @model required="true"

+	 * @generated

+	 */

+	String getMessageKey();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.profilebase.ProfileConstraint#getMessageKey <em>Message Key</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Message Key</em>' attribute.

+	 * @see #getMessageKey()

+	 * @generated

+	 */

+	void setMessageKey(String value);

+

+} // ProfileConstraint

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/impl/ProfileBaseFactoryImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/impl/ProfileBaseFactoryImpl.java
new file mode 100644
index 00000000000..6c976e7bb5c
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/impl/ProfileBaseFactoryImpl.java
@@ -0,0 +1,112 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.profilebase.impl;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.impl.EFactoryImpl;

+import org.eclipse.emf.ecore.plugin.EcorePlugin;

+import org.eclipse.papyrus.migration.rsa.profilebase.ProfileBaseFactory;

+import org.eclipse.papyrus.migration.rsa.profilebase.ProfileBasePackage;

+import org.eclipse.papyrus.migration.rsa.profilebase.ProfileConstraint;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Factory</b>.

+ * <!-- end-user-doc -->

+ *

+ * @generated

+ */

+public class ProfileBaseFactoryImpl extends EFactoryImpl implements ProfileBaseFactory {

+	/**

+	 * Creates the default factory implementation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static ProfileBaseFactory init() {

+		try {

+			ProfileBaseFactory theProfileBaseFactory = (ProfileBaseFactory) EPackage.Registry.INSTANCE.getEFactory(ProfileBasePackage.eNS_URI);

+			if (theProfileBaseFactory != null) {

+				return theProfileBaseFactory;

+			}

+		} catch (Exception exception) {

+			EcorePlugin.INSTANCE.log(exception);

+		}

+		return new ProfileBaseFactoryImpl();

+	}

+

+	/**

+	 * Creates an instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public ProfileBaseFactoryImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EObject create(EClass eClass) {

+		switch (eClass.getClassifierID()) {

+		case ProfileBasePackage.PROFILE_CONSTRAINT:

+			return createProfileConstraint();

+		default:

+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public ProfileConstraint createProfileConstraint() {

+		ProfileConstraintImpl profileConstraint = new ProfileConstraintImpl();

+		return profileConstraint;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public ProfileBasePackage getProfileBasePackage() {

+		return (ProfileBasePackage) getEPackage();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @deprecated

+	 * @generated

+	 */

+	@Deprecated

+	public static ProfileBasePackage getPackage() {

+		return ProfileBasePackage.eINSTANCE;

+	}

+

+} // ProfileBaseFactoryImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/impl/ProfileBasePackageImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/impl/ProfileBasePackageImpl.java
new file mode 100644
index 00000000000..8ec7b8c6abe
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/impl/ProfileBasePackageImpl.java
@@ -0,0 +1,206 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.profilebase.impl;

+

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.impl.EPackageImpl;

+import org.eclipse.papyrus.migration.rsa.default_.DefaultPackage;

+import org.eclipse.papyrus.migration.rsa.profilebase.ProfileBaseFactory;

+import org.eclipse.papyrus.migration.rsa.profilebase.ProfileBasePackage;

+import org.eclipse.papyrus.migration.rsa.profilebase.ProfileConstraint;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Package</b>.

+ * <!-- end-user-doc -->

+ *

+ * @generated

+ */

+public class ProfileBasePackageImpl extends EPackageImpl implements ProfileBasePackage {

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass profileConstraintEClass = null;

+

+	/**

+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

+	 * package URI value.

+	 * <p>

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.emf.ecore.EPackage.Registry

+	 * @see org.eclipse.papyrus.migration.rsa.profilebase.ProfileBasePackage#eNS_URI

+	 * @see #init()

+	 * @generated

+	 */

+	private ProfileBasePackageImpl() {

+		super(eNS_URI, ProfileBaseFactory.eINSTANCE);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private static boolean isInited = false;

+

+	/**

+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

+	 *

+	 * <p>

+	 * This method is used to initialize {@link ProfileBasePackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

+	 * @see #eNS_URI

+	 * @see #createPackageContents()

+	 * @see #initializePackageContents()

+	 * @generated

+	 */

+	public static ProfileBasePackage init() {

+		if (isInited) {

+			return (ProfileBasePackage) EPackage.Registry.INSTANCE.getEPackage(ProfileBasePackage.eNS_URI);

+		}

+

+		// Obtain or create and register package

+		ProfileBasePackageImpl theProfileBasePackage = (ProfileBasePackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ProfileBasePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ProfileBasePackageImpl());

+

+		isInited = true;

+

+		// Initialize simple dependencies

+		DefaultPackage.eINSTANCE.eClass();

+

+		// Create package meta-data objects

+		theProfileBasePackage.createPackageContents();

+

+		// Initialize created meta-data

+		theProfileBasePackage.initializePackageContents();

+

+		// Mark meta-data to indicate it can't be changed

+		theProfileBasePackage.freeze();

+

+

+		// Update the registry and return the package

+		EPackage.Registry.INSTANCE.put(ProfileBasePackage.eNS_URI, theProfileBasePackage);

+		return theProfileBasePackage;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getProfileConstraint() {

+		return profileConstraintEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getProfileConstraint_MessageKey() {

+		return (EAttribute) profileConstraintEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public ProfileBaseFactory getProfileBaseFactory() {

+		return (ProfileBaseFactory) getEFactoryInstance();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private boolean isCreated = false;

+

+	/**

+	 * Creates the meta-model objects for the package. This method is

+	 * guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public void createPackageContents() {

+		if (isCreated) {

+			return;

+		}

+		isCreated = true;

+

+		// Create classes and their features

+		profileConstraintEClass = createEClass(PROFILE_CONSTRAINT);

+		createEAttribute(profileConstraintEClass, PROFILE_CONSTRAINT__MESSAGE_KEY);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private boolean isInitialized = false;

+

+	/**

+	 * Complete the initialization of the package and its meta-model. This

+	 * method is guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public void initializePackageContents() {

+		if (isInitialized) {

+			return;

+		}

+		isInitialized = true;

+

+		// Initialize package

+		setName(eNAME);

+		setNsPrefix(eNS_PREFIX);

+		setNsURI(eNS_URI);

+

+		// Obtain other dependent packages

+		DefaultPackage theDefaultPackage = (DefaultPackage) EPackage.Registry.INSTANCE.getEPackage(DefaultPackage.eNS_URI);

+

+		// Create type parameters

+

+		// Set bounds for type parameters

+

+		// Add supertypes to classes

+		profileConstraintEClass.getESuperTypes().add(theDefaultPackage.getAbstractConstraint());

+

+		// Initialize classes, features, and operations; add parameters

+		initEClass(profileConstraintEClass, ProfileConstraint.class, "ProfileConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getProfileConstraint_MessageKey(), ecorePackage.getEString(), "messageKey", null, 1, 1, ProfileConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		// Create resource

+		createResource(eNS_URI);

+	}

+

+} // ProfileBasePackageImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/impl/ProfileConstraintImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/impl/ProfileConstraintImpl.java
new file mode 100644
index 00000000000..dd1af3b4bc6
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/impl/ProfileConstraintImpl.java
@@ -0,0 +1,185 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.profilebase.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.papyrus.migration.rsa.default_.impl.AbstractConstraintImpl;

+import org.eclipse.papyrus.migration.rsa.profilebase.ProfileBasePackage;

+import org.eclipse.papyrus.migration.rsa.profilebase.ProfileConstraint;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Profile Constraint</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.profilebase.impl.ProfileConstraintImpl#getMessageKey <em>Message Key</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class ProfileConstraintImpl extends AbstractConstraintImpl implements ProfileConstraint {

+	/**

+	 * The default value of the '{@link #getMessageKey() <em>Message Key</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getMessageKey()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String MESSAGE_KEY_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getMessageKey() <em>Message Key</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getMessageKey()

+	 * @generated

+	 * @ordered

+	 */

+	protected String messageKey = MESSAGE_KEY_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected ProfileConstraintImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return ProfileBasePackage.Literals.PROFILE_CONSTRAINT;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getMessageKey() {

+		return messageKey;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setMessageKey(String newMessageKey) {

+		String oldMessageKey = messageKey;

+		messageKey = newMessageKey;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, ProfileBasePackage.PROFILE_CONSTRAINT__MESSAGE_KEY, oldMessageKey, messageKey));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case ProfileBasePackage.PROFILE_CONSTRAINT__MESSAGE_KEY:

+			return getMessageKey();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case ProfileBasePackage.PROFILE_CONSTRAINT__MESSAGE_KEY:

+			setMessageKey((String) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case ProfileBasePackage.PROFILE_CONSTRAINT__MESSAGE_KEY:

+			setMessageKey(MESSAGE_KEY_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case ProfileBasePackage.PROFILE_CONSTRAINT__MESSAGE_KEY:

+			return MESSAGE_KEY_EDEFAULT == null ? messageKey != null : !MESSAGE_KEY_EDEFAULT.equals(messageKey);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (messageKey: ");

+		result.append(messageKey);

+		result.append(')');

+		return result.toString();

+	}

+

+} // ProfileConstraintImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/util/ProfileBaseAdapterFactory.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/util/ProfileBaseAdapterFactory.java
new file mode 100644
index 00000000000..112fb69673c
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/util/ProfileBaseAdapterFactory.java
@@ -0,0 +1,158 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.profilebase.util;

+

+import org.eclipse.emf.common.notify.Adapter;

+import org.eclipse.emf.common.notify.Notifier;

+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint;

+import org.eclipse.papyrus.migration.rsa.profilebase.ProfileBasePackage;

+import org.eclipse.papyrus.migration.rsa.profilebase.ProfileConstraint;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Adapter Factory</b> for the model.

+ * It provides an adapter <code>createXXX</code> method for each class of the model.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.profilebase.ProfileBasePackage

+ * @generated

+ */

+public class ProfileBaseAdapterFactory extends AdapterFactoryImpl {

+	/**

+	 * The cached model package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected static ProfileBasePackage modelPackage;

+

+	/**

+	 * Creates an instance of the adapter factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public ProfileBaseAdapterFactory() {

+		if (modelPackage == null) {

+			modelPackage = ProfileBasePackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Returns whether this factory is applicable for the type of the object.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return whether this factory is applicable for the type of the object.

+	 * @generated

+	 */

+	@Override

+	public boolean isFactoryForType(Object object) {

+		if (object == modelPackage) {

+			return true;

+		}

+		if (object instanceof EObject) {

+			return ((EObject) object).eClass().getEPackage() == modelPackage;

+		}

+		return false;

+	}

+

+	/**

+	 * The switch that delegates to the <code>createXXX</code> methods.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected ProfileBaseSwitch<Adapter> modelSwitch =

+			new ProfileBaseSwitch<Adapter>() {

+				@Override

+				public Adapter caseProfileConstraint(ProfileConstraint object) {

+					return createProfileConstraintAdapter();

+				}

+

+				@Override

+				public Adapter caseAbstractConstraint(AbstractConstraint object) {

+					return createAbstractConstraintAdapter();

+				}

+

+				@Override

+				public Adapter defaultCase(EObject object) {

+					return createEObjectAdapter();

+				}

+			};

+

+	/**

+	 * Creates an adapter for the <code>target</code>.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param target

+	 *            the object to adapt.

+	 * @return the adapter for the <code>target</code>.

+	 * @generated

+	 */

+	@Override

+	public Adapter createAdapter(Notifier target) {

+		return modelSwitch.doSwitch((EObject) target);

+	}

+

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.profilebase.ProfileConstraint <em>Profile Constraint</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.profilebase.ProfileConstraint

+	 * @generated

+	 */

+	public Adapter createProfileConstraintAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint <em>Abstract Constraint</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint

+	 * @generated

+	 */

+	public Adapter createAbstractConstraintAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for the default case.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @generated

+	 */

+	public Adapter createEObjectAdapter() {

+		return null;

+	}

+

+} // ProfileBaseAdapterFactory

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/util/ProfileBaseResourceFactoryImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/util/ProfileBaseResourceFactoryImpl.java
new file mode 100644
index 00000000000..ef724e62d22
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/util/ProfileBaseResourceFactoryImpl.java
@@ -0,0 +1,61 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.profilebase.util;

+

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

+import org.eclipse.emf.ecore.xmi.XMLResource;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Resource Factory</b> associated with the package.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.profilebase.util.ProfileBaseResourceImpl

+ * @generated

+ */

+public class ProfileBaseResourceFactoryImpl extends ResourceFactoryImpl {

+	/**

+	 * Creates an instance of the resource factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public ProfileBaseResourceFactoryImpl() {

+		super();

+	}

+

+	/**

+	 * Creates an instance of the resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Resource createResource(URI uri) {

+		XMLResource result = new ProfileBaseResourceImpl(uri);

+		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

+		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

+

+		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);

+

+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

+		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

+

+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);

+		return result;

+	}

+

+} // ProfileBaseResourceFactoryImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/util/ProfileBaseResourceImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/util/ProfileBaseResourceImpl.java
new file mode 100644
index 00000000000..8e9ed0f1c09
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/util/ProfileBaseResourceImpl.java
@@ -0,0 +1,39 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.profilebase.util;

+

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Resource </b> associated with the package.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.profilebase.util.ProfileBaseResourceFactoryImpl

+ * @generated

+ */

+public class ProfileBaseResourceImpl extends XMLResourceImpl {

+	/**

+	 * Creates an instance of the resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param uri

+	 *            the URI of the new resource.

+	 * @generated

+	 */

+	public ProfileBaseResourceImpl(URI uri) {

+		super(uri);

+	}

+

+} // ProfileBaseResourceImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/util/ProfileBaseSwitch.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/util/ProfileBaseSwitch.java
new file mode 100644
index 00000000000..619161bd3ad
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/util/ProfileBaseSwitch.java
@@ -0,0 +1,150 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.profilebase.util;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.util.Switch;

+import org.eclipse.papyrus.migration.rsa.default_.AbstractConstraint;

+import org.eclipse.papyrus.migration.rsa.profilebase.ProfileBasePackage;

+import org.eclipse.papyrus.migration.rsa.profilebase.ProfileConstraint;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Switch</b> for the model's inheritance hierarchy.

+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

+ * starting with the actual class of the object

+ * and proceeding up the inheritance hierarchy

+ * until a non-null result is returned,

+ * which is the result of the switch.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.profilebase.ProfileBasePackage

+ * @generated

+ */

+public class ProfileBaseSwitch<T> extends Switch<T> {

+	/**

+	 * The cached model package

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected static ProfileBasePackage modelPackage;

+

+	/**

+	 * Creates an instance of the switch.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public ProfileBaseSwitch() {

+		if (modelPackage == null) {

+			modelPackage = ProfileBasePackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Checks whether this is a switch for the given package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @parameter ePackage the package in question.

+	 * @return whether this is a switch for the given package.

+	 * @generated

+	 */

+	@Override

+	protected boolean isSwitchFor(EPackage ePackage) {

+		return ePackage == modelPackage;

+	}

+

+	/**

+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the first non-null result returned by a <code>caseXXX</code> call.

+	 * @generated

+	 */

+	@Override

+	protected T doSwitch(int classifierID, EObject theEObject) {

+		switch (classifierID) {

+		case ProfileBasePackage.PROFILE_CONSTRAINT: {

+			ProfileConstraint profileConstraint = (ProfileConstraint) theEObject;

+			T result = caseProfileConstraint(profileConstraint);

+			if (result == null) {

+				result = caseAbstractConstraint(profileConstraint);

+			}

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		default:

+			return defaultCase(theEObject);

+		}

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Profile Constraint</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Profile Constraint</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseProfileConstraint(ProfileConstraint object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Constraint</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Abstract Constraint</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseAbstractConstraint(AbstractConstraint object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch, but this is the last case anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

+	 * @generated

+	 */

+	@Override

+	public T defaultCase(EObject object) {

+		return null;

+	}

+

+} // ProfileBaseSwitch

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/util/ProfileBaseXMLProcessor.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/util/ProfileBaseXMLProcessor.java
new file mode 100644
index 00000000000..5a8e6c7b26b
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/profilebase/util/ProfileBaseXMLProcessor.java
@@ -0,0 +1,59 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.profilebase.util;

+

+import java.util.Map;

+

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

+import org.eclipse.papyrus.migration.rsa.profilebase.ProfileBasePackage;

+

+/**

+ * This class contains helper methods to serialize and deserialize XML documents

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ *

+ * @generated

+ */

+public class ProfileBaseXMLProcessor extends XMLProcessor {

+

+	/**

+	 * Public constructor to instantiate the helper.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public ProfileBaseXMLProcessor() {

+		super((EPackage.Registry.INSTANCE));

+		ProfileBasePackage.eINSTANCE.eClass();

+	}

+

+	/**

+	 * Register for "*" and "xml" file extensions the ProfileBaseResourceFactoryImpl factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected Map<String, Resource.Factory> getRegistrations() {

+		if (registrations == null) {

+			super.getRegistrations();

+			registrations.put(XML_EXTENSION, new ProfileBaseResourceFactoryImpl());

+			registrations.put(STAR_EXTENSION, new ProfileBaseResourceFactoryImpl());

+		}

+		return registrations;

+	}

+

+} // ProfileBaseXMLProcessor

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/PapyrusUMLNotationFactory.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/PapyrusUMLNotationFactory.java
new file mode 100644
index 00000000000..36c72335d81
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/PapyrusUMLNotationFactory.java
@@ -0,0 +1,116 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.umlnotation;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage
+ * @generated
+ */
+public interface PapyrusUMLNotationFactory extends EFactory {
+
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	PapyrusUMLNotationFactory eINSTANCE = org.eclipse.papyrus.migration.rsa.umlnotation.impl.PapyrusUMLNotationFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>UML Diagram</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>UML Diagram</em>'.
+	 * @generated
+	 */
+	UMLDiagram createUMLDiagram();
+
+	/**
+	 * Returns a new object of class '<em>UML Frame</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>UML Frame</em>'.
+	 * @generated
+	 */
+	UMLFrame createUMLFrame();
+
+	/**
+	 * Returns a new object of class '<em>UML Shape Compartment</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>UML Shape Compartment</em>'.
+	 * @generated
+	 */
+	UMLShapeCompartment createUMLShapeCompartment();
+
+	/**
+	 * Returns a new object of class '<em>UML Shape</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>UML Shape</em>'.
+	 * @generated
+	 */
+	UMLShape createUMLShape();
+
+	/**
+	 * Returns a new object of class '<em>UML Connector</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>UML Connector</em>'.
+	 * @generated
+	 */
+	UMLConnector createUMLConnector();
+
+	/**
+	 * Returns a new object of class '<em>UML Component</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>UML Component</em>'.
+	 * @generated
+	 */
+	UMLComponent createUMLComponent();
+
+	/**
+	 * Returns a new object of class '<em>UML Classifier Shape</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>UML Classifier Shape</em>'.
+	 * @generated
+	 */
+	UMLClassifierShape createUMLClassifierShape();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	PapyrusUMLNotationPackage getPapyrusUMLNotationPackage();
+
+} // PapyrusUMLNotationFactory
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/PapyrusUMLNotationPackage.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/PapyrusUMLNotationPackage.java
new file mode 100644
index 00000000000..9ac5e907dc2
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/PapyrusUMLNotationPackage.java
@@ -0,0 +1,2822 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.umlnotation;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface PapyrusUMLNotationPackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNAME = "umlnotation";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/umlnotation";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_PREFIX = "umlnotationext";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	PapyrusUMLNotationPackage eINSTANCE = org.eclipse.papyrus.migration.rsa.umlnotation.impl.PapyrusUMLNotationPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLDiagramImpl <em>UML Diagram</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLDiagramImpl
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.PapyrusUMLNotationPackageImpl#getUMLDiagram()
+	 * @generated
+	 */
+	int UML_DIAGRAM = 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__EANNOTATIONS = NotationPackage.DIAGRAM__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Visible</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__VISIBLE = NotationPackage.DIAGRAM__VISIBLE;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__TYPE = NotationPackage.DIAGRAM__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__MUTABLE = NotationPackage.DIAGRAM__MUTABLE;
+
+	/**
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__SOURCE_EDGES = NotationPackage.DIAGRAM__SOURCE_EDGES;
+
+	/**
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__TARGET_EDGES = NotationPackage.DIAGRAM__TARGET_EDGES;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__PERSISTED_CHILDREN = NotationPackage.DIAGRAM__PERSISTED_CHILDREN;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__STYLES = NotationPackage.DIAGRAM__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__ELEMENT = NotationPackage.DIAGRAM__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Diagram</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__DIAGRAM = NotationPackage.DIAGRAM__DIAGRAM;
+
+	/**
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__TRANSIENT_CHILDREN = NotationPackage.DIAGRAM__TRANSIENT_CHILDREN;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__NAME = NotationPackage.DIAGRAM__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Measurement Unit</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__MEASUREMENT_UNIT = NotationPackage.DIAGRAM__MEASUREMENT_UNIT;
+
+	/**
+	 * The feature id for the '<em><b>Edges</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int DIAGRAM__PERSISTED_EDGES = NotationPackage.DIAGRAM__PERSISTED_EDGES;
+
+	/**
+	 * The feature id for the '<em><b>Transient Edges</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__TRANSIENT_EDGES = NotationPackage.DIAGRAM__TRANSIENT_EDGES;
+
+	/**
+	 * The feature id for the '<em><b>Show Stereotype</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__SHOW_STEREOTYPE = NotationPackage.DIAGRAM_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Show List Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__SHOW_LIST_VISIBILITY = NotationPackage.DIAGRAM_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Show List Signature</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__SHOW_LIST_SIGNATURE = NotationPackage.DIAGRAM_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Alignment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__ALIGNMENT = NotationPackage.DIAGRAM_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Show Stereotype Attribute Compartment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT = NotationPackage.DIAGRAM_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of structural features of the '<em>UML Diagram</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM_FEATURE_COUNT = NotationPackage.DIAGRAM_FEATURE_COUNT + 5;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLShapeImpl <em>UML Shape</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLShapeImpl
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.PapyrusUMLNotationPackageImpl#getUMLShape()
+	 * @generated
+	 */
+	int UML_SHAPE = 3;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__EANNOTATIONS = NotationPackage.SHAPE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Visible</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__VISIBLE = NotationPackage.SHAPE__VISIBLE;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__TYPE = NotationPackage.SHAPE__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__MUTABLE = NotationPackage.SHAPE__MUTABLE;
+
+	/**
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__SOURCE_EDGES = NotationPackage.SHAPE__SOURCE_EDGES;
+
+	/**
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__TARGET_EDGES = NotationPackage.SHAPE__TARGET_EDGES;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__PERSISTED_CHILDREN = NotationPackage.SHAPE__PERSISTED_CHILDREN;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__STYLES = NotationPackage.SHAPE__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__ELEMENT = NotationPackage.SHAPE__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Diagram</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__DIAGRAM = NotationPackage.SHAPE__DIAGRAM;
+
+	/**
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__TRANSIENT_CHILDREN = NotationPackage.SHAPE__TRANSIENT_CHILDREN;
+
+	/**
+	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__LAYOUT_CONSTRAINT = NotationPackage.SHAPE__LAYOUT_CONSTRAINT;
+
+	/**
+	 * The feature id for the '<em><b>Font Color</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__FONT_COLOR = NotationPackage.SHAPE__FONT_COLOR;
+
+	/**
+	 * The feature id for the '<em><b>Font Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__FONT_NAME = NotationPackage.SHAPE__FONT_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Font Height</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__FONT_HEIGHT = NotationPackage.SHAPE__FONT_HEIGHT;
+
+	/**
+	 * The feature id for the '<em><b>Bold</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__BOLD = NotationPackage.SHAPE__BOLD;
+
+	/**
+	 * The feature id for the '<em><b>Italic</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__ITALIC = NotationPackage.SHAPE__ITALIC;
+
+	/**
+	 * The feature id for the '<em><b>Underline</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__UNDERLINE = NotationPackage.SHAPE__UNDERLINE;
+
+	/**
+	 * The feature id for the '<em><b>Strike Through</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__STRIKE_THROUGH = NotationPackage.SHAPE__STRIKE_THROUGH;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__DESCRIPTION = NotationPackage.SHAPE__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Fill Color</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__FILL_COLOR = NotationPackage.SHAPE__FILL_COLOR;
+
+	/**
+	 * The feature id for the '<em><b>Transparency</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__TRANSPARENCY = NotationPackage.SHAPE__TRANSPARENCY;
+
+	/**
+	 * The feature id for the '<em><b>Gradient</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__GRADIENT = NotationPackage.SHAPE__GRADIENT;
+
+	/**
+	 * The feature id for the '<em><b>Line Color</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__LINE_COLOR = NotationPackage.SHAPE__LINE_COLOR;
+
+	/**
+	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__LINE_WIDTH = NotationPackage.SHAPE__LINE_WIDTH;
+
+	/**
+	 * The feature id for the '<em><b>Rounded Bendpoints Radius</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__ROUNDED_BENDPOINTS_RADIUS = NotationPackage.SHAPE__ROUNDED_BENDPOINTS_RADIUS;
+
+	/**
+	 * The feature id for the '<em><b>Show Stereotype</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__SHOW_STEREOTYPE = NotationPackage.SHAPE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Show List Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__SHOW_LIST_VISIBILITY = NotationPackage.SHAPE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Show List Signature</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__SHOW_LIST_SIGNATURE = NotationPackage.SHAPE_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Alignment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__ALIGNMENT = NotationPackage.SHAPE_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Show Stereotype Attribute Compartment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT = NotationPackage.SHAPE_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of structural features of the '<em>UML Shape</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_FEATURE_COUNT = NotationPackage.SHAPE_FEATURE_COUNT + 5;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLFrameImpl <em>UML Frame</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLFrameImpl
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.PapyrusUMLNotationPackageImpl#getUMLFrame()
+	 * @generated
+	 */
+	int UML_FRAME = 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__EANNOTATIONS = UML_SHAPE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Visible</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__VISIBLE = UML_SHAPE__VISIBLE;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__TYPE = UML_SHAPE__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__MUTABLE = UML_SHAPE__MUTABLE;
+
+	/**
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__SOURCE_EDGES = UML_SHAPE__SOURCE_EDGES;
+
+	/**
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__TARGET_EDGES = UML_SHAPE__TARGET_EDGES;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__PERSISTED_CHILDREN = UML_SHAPE__PERSISTED_CHILDREN;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__STYLES = UML_SHAPE__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__ELEMENT = UML_SHAPE__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Diagram</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__DIAGRAM = UML_SHAPE__DIAGRAM;
+
+	/**
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__TRANSIENT_CHILDREN = UML_SHAPE__TRANSIENT_CHILDREN;
+
+	/**
+	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__LAYOUT_CONSTRAINT = UML_SHAPE__LAYOUT_CONSTRAINT;
+
+	/**
+	 * The feature id for the '<em><b>Font Color</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__FONT_COLOR = UML_SHAPE__FONT_COLOR;
+
+	/**
+	 * The feature id for the '<em><b>Font Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__FONT_NAME = UML_SHAPE__FONT_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Font Height</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__FONT_HEIGHT = UML_SHAPE__FONT_HEIGHT;
+
+	/**
+	 * The feature id for the '<em><b>Bold</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__BOLD = UML_SHAPE__BOLD;
+
+	/**
+	 * The feature id for the '<em><b>Italic</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__ITALIC = UML_SHAPE__ITALIC;
+
+	/**
+	 * The feature id for the '<em><b>Underline</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__UNDERLINE = UML_SHAPE__UNDERLINE;
+
+	/**
+	 * The feature id for the '<em><b>Strike Through</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__STRIKE_THROUGH = UML_SHAPE__STRIKE_THROUGH;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__DESCRIPTION = UML_SHAPE__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Fill Color</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__FILL_COLOR = UML_SHAPE__FILL_COLOR;
+
+	/**
+	 * The feature id for the '<em><b>Transparency</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__TRANSPARENCY = UML_SHAPE__TRANSPARENCY;
+
+	/**
+	 * The feature id for the '<em><b>Gradient</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__GRADIENT = UML_SHAPE__GRADIENT;
+
+	/**
+	 * The feature id for the '<em><b>Line Color</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__LINE_COLOR = UML_SHAPE__LINE_COLOR;
+
+	/**
+	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__LINE_WIDTH = UML_SHAPE__LINE_WIDTH;
+
+	/**
+	 * The feature id for the '<em><b>Rounded Bendpoints Radius</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__ROUNDED_BENDPOINTS_RADIUS = UML_SHAPE__ROUNDED_BENDPOINTS_RADIUS;
+
+	/**
+	 * The feature id for the '<em><b>Show Stereotype</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__SHOW_STEREOTYPE = UML_SHAPE__SHOW_STEREOTYPE;
+
+	/**
+	 * The feature id for the '<em><b>Show List Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__SHOW_LIST_VISIBILITY = UML_SHAPE__SHOW_LIST_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Show List Signature</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__SHOW_LIST_SIGNATURE = UML_SHAPE__SHOW_LIST_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Alignment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__ALIGNMENT = UML_SHAPE__ALIGNMENT;
+
+	/**
+	 * The feature id for the '<em><b>Show Stereotype Attribute Compartment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT = UML_SHAPE__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT;
+
+	/**
+	 * The number of structural features of the '<em>UML Frame</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_FRAME_FEATURE_COUNT = UML_SHAPE_FEATURE_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLShapeCompartmentImpl <em>UML Shape Compartment</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLShapeCompartmentImpl
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.PapyrusUMLNotationPackageImpl#getUMLShapeCompartment()
+	 * @generated
+	 */
+	int UML_SHAPE_COMPARTMENT = 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__EANNOTATIONS = NotationPackage.COMPARTMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Visible</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__VISIBLE = NotationPackage.COMPARTMENT__VISIBLE;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__TYPE = NotationPackage.COMPARTMENT__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__MUTABLE = NotationPackage.COMPARTMENT__MUTABLE;
+
+	/**
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__SOURCE_EDGES = NotationPackage.COMPARTMENT__SOURCE_EDGES;
+
+	/**
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__TARGET_EDGES = NotationPackage.COMPARTMENT__TARGET_EDGES;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__PERSISTED_CHILDREN = NotationPackage.COMPARTMENT__PERSISTED_CHILDREN;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__STYLES = NotationPackage.COMPARTMENT__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__ELEMENT = NotationPackage.COMPARTMENT__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Diagram</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__DIAGRAM = NotationPackage.COMPARTMENT__DIAGRAM;
+
+	/**
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__TRANSIENT_CHILDREN = NotationPackage.COMPARTMENT__TRANSIENT_CHILDREN;
+
+	/**
+	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__LAYOUT_CONSTRAINT = NotationPackage.COMPARTMENT__LAYOUT_CONSTRAINT;
+
+	/**
+	 * The feature id for the '<em><b>Collapsed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__COLLAPSED = NotationPackage.COMPARTMENT__COLLAPSED;
+
+	/**
+	 * The feature id for the '<em><b>Canonical</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__CANONICAL = NotationPackage.COMPARTMENT__CANONICAL;
+
+	/**
+	 * The feature id for the '<em><b>Show Title</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__SHOW_TITLE = NotationPackage.COMPARTMENT__SHOW_TITLE;
+
+	/**
+	 * The feature id for the '<em><b>Show Stereotype</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__SHOW_STEREOTYPE = NotationPackage.COMPARTMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Show List Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__SHOW_LIST_VISIBILITY = NotationPackage.COMPARTMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Show List Signature</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__SHOW_LIST_SIGNATURE = NotationPackage.COMPARTMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Alignment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__ALIGNMENT = NotationPackage.COMPARTMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Show Stereotype Attribute Compartment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT = NotationPackage.COMPARTMENT_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Vertical Alignment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT__VERTICAL_ALIGNMENT = NotationPackage.COMPARTMENT_FEATURE_COUNT + 5;
+
+	/**
+	 * The number of structural features of the '<em>UML Shape Compartment</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_COMPARTMENT_FEATURE_COUNT = NotationPackage.COMPARTMENT_FEATURE_COUNT + 6;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLConnectorImpl <em>UML Connector</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLConnectorImpl
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.PapyrusUMLNotationPackageImpl#getUMLConnector()
+	 * @generated
+	 */
+	int UML_CONNECTOR = 4;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__EANNOTATIONS = NotationPackage.CONNECTOR__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Visible</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__VISIBLE = NotationPackage.CONNECTOR__VISIBLE;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__TYPE = NotationPackage.CONNECTOR__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__MUTABLE = NotationPackage.CONNECTOR__MUTABLE;
+
+	/**
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__SOURCE_EDGES = NotationPackage.CONNECTOR__SOURCE_EDGES;
+
+	/**
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__TARGET_EDGES = NotationPackage.CONNECTOR__TARGET_EDGES;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__PERSISTED_CHILDREN = NotationPackage.CONNECTOR__PERSISTED_CHILDREN;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__STYLES = NotationPackage.CONNECTOR__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__ELEMENT = NotationPackage.CONNECTOR__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Diagram</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__DIAGRAM = NotationPackage.CONNECTOR__DIAGRAM;
+
+	/**
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__TRANSIENT_CHILDREN = NotationPackage.CONNECTOR__TRANSIENT_CHILDREN;
+
+	/**
+	 * The feature id for the '<em><b>Source</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__SOURCE = NotationPackage.CONNECTOR__SOURCE;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__TARGET = NotationPackage.CONNECTOR__TARGET;
+
+	/**
+	 * The feature id for the '<em><b>Bendpoints</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__BENDPOINTS = NotationPackage.CONNECTOR__BENDPOINTS;
+
+	/**
+	 * The feature id for the '<em><b>Source Anchor</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__SOURCE_ANCHOR = NotationPackage.CONNECTOR__SOURCE_ANCHOR;
+
+	/**
+	 * The feature id for the '<em><b>Target Anchor</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__TARGET_ANCHOR = NotationPackage.CONNECTOR__TARGET_ANCHOR;
+
+	/**
+	 * The feature id for the '<em><b>Rounded Bendpoints Radius</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__ROUNDED_BENDPOINTS_RADIUS = NotationPackage.CONNECTOR__ROUNDED_BENDPOINTS_RADIUS;
+
+	/**
+	 * The feature id for the '<em><b>Routing</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__ROUTING = NotationPackage.CONNECTOR__ROUTING;
+
+	/**
+	 * The feature id for the '<em><b>Smoothness</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__SMOOTHNESS = NotationPackage.CONNECTOR__SMOOTHNESS;
+
+	/**
+	 * The feature id for the '<em><b>Avoid Obstructions</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__AVOID_OBSTRUCTIONS = NotationPackage.CONNECTOR__AVOID_OBSTRUCTIONS;
+
+	/**
+	 * The feature id for the '<em><b>Closest Distance</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__CLOSEST_DISTANCE = NotationPackage.CONNECTOR__CLOSEST_DISTANCE;
+
+	/**
+	 * The feature id for the '<em><b>Jump Link Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__JUMP_LINK_STATUS = NotationPackage.CONNECTOR__JUMP_LINK_STATUS;
+
+	/**
+	 * The feature id for the '<em><b>Jump Link Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__JUMP_LINK_TYPE = NotationPackage.CONNECTOR__JUMP_LINK_TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Jump Links Reverse</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__JUMP_LINKS_REVERSE = NotationPackage.CONNECTOR__JUMP_LINKS_REVERSE;
+
+	/**
+	 * The feature id for the '<em><b>Line Color</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__LINE_COLOR = NotationPackage.CONNECTOR__LINE_COLOR;
+
+	/**
+	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__LINE_WIDTH = NotationPackage.CONNECTOR__LINE_WIDTH;
+
+	/**
+	 * The feature id for the '<em><b>Font Color</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__FONT_COLOR = NotationPackage.CONNECTOR_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Font Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__FONT_NAME = NotationPackage.CONNECTOR_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Font Height</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__FONT_HEIGHT = NotationPackage.CONNECTOR_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Bold</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__BOLD = NotationPackage.CONNECTOR_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Italic</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__ITALIC = NotationPackage.CONNECTOR_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Underline</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__UNDERLINE = NotationPackage.CONNECTOR_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Strike Through</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__STRIKE_THROUGH = NotationPackage.CONNECTOR_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Show Stereotype</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__SHOW_STEREOTYPE = NotationPackage.CONNECTOR_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>Show List Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__SHOW_LIST_VISIBILITY = NotationPackage.CONNECTOR_FEATURE_COUNT + 8;
+
+	/**
+	 * The feature id for the '<em><b>Show List Signature</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__SHOW_LIST_SIGNATURE = NotationPackage.CONNECTOR_FEATURE_COUNT + 9;
+
+	/**
+	 * The feature id for the '<em><b>Alignment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__ALIGNMENT = NotationPackage.CONNECTOR_FEATURE_COUNT + 10;
+
+	/**
+	 * The feature id for the '<em><b>Show Stereotype Attribute Compartment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT = NotationPackage.CONNECTOR_FEATURE_COUNT + 11;
+
+	/**
+	 * The number of structural features of the '<em>UML Connector</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CONNECTOR_FEATURE_COUNT = NotationPackage.CONNECTOR_FEATURE_COUNT + 12;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLViewImpl <em>UML View</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLViewImpl
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.PapyrusUMLNotationPackageImpl#getUMLView()
+	 * @generated
+	 */
+	int UML_VIEW = 5;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_VIEW__EANNOTATIONS = NotationPackage.VIEW__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Visible</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_VIEW__VISIBLE = NotationPackage.VIEW__VISIBLE;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_VIEW__TYPE = NotationPackage.VIEW__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_VIEW__MUTABLE = NotationPackage.VIEW__MUTABLE;
+
+	/**
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_VIEW__SOURCE_EDGES = NotationPackage.VIEW__SOURCE_EDGES;
+
+	/**
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_VIEW__TARGET_EDGES = NotationPackage.VIEW__TARGET_EDGES;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_VIEW__PERSISTED_CHILDREN = NotationPackage.VIEW__PERSISTED_CHILDREN;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_VIEW__STYLES = NotationPackage.VIEW__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_VIEW__ELEMENT = NotationPackage.VIEW__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Diagram</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_VIEW__DIAGRAM = NotationPackage.VIEW__DIAGRAM;
+
+	/**
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_VIEW__TRANSIENT_CHILDREN = NotationPackage.VIEW__TRANSIENT_CHILDREN;
+
+	/**
+	 * The feature id for the '<em><b>Show Stereotype</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_VIEW__SHOW_STEREOTYPE = NotationPackage.VIEW_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Show List Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_VIEW__SHOW_LIST_VISIBILITY = NotationPackage.VIEW_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Show List Signature</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_VIEW__SHOW_LIST_SIGNATURE = NotationPackage.VIEW_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Alignment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_VIEW__ALIGNMENT = NotationPackage.VIEW_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Show Stereotype Attribute Compartment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_VIEW__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT = NotationPackage.VIEW_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of structural features of the '<em>UML View</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_VIEW_FEATURE_COUNT = NotationPackage.VIEW_FEATURE_COUNT + 5;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLComponentImpl <em>UML Component</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLComponentImpl
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.PapyrusUMLNotationPackageImpl#getUMLComponent()
+	 * @generated
+	 */
+	int UML_COMPONENT = 6;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__EANNOTATIONS = UML_SHAPE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Visible</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__VISIBLE = UML_SHAPE__VISIBLE;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__TYPE = UML_SHAPE__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__MUTABLE = UML_SHAPE__MUTABLE;
+
+	/**
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__SOURCE_EDGES = UML_SHAPE__SOURCE_EDGES;
+
+	/**
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__TARGET_EDGES = UML_SHAPE__TARGET_EDGES;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__CHILDREN = UML_SHAPE__PERSISTED_CHILDREN;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__STYLES = UML_SHAPE__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__ELEMENT = UML_SHAPE__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Diagram</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__DIAGRAM = UML_SHAPE__DIAGRAM;
+
+	/**
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__TRANSIENT_CHILDREN = UML_SHAPE__TRANSIENT_CHILDREN;
+
+	/**
+	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__LAYOUT_CONSTRAINT = UML_SHAPE__LAYOUT_CONSTRAINT;
+
+	/**
+	 * The feature id for the '<em><b>Font Color</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__FONT_COLOR = UML_SHAPE__FONT_COLOR;
+
+	/**
+	 * The feature id for the '<em><b>Font Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__FONT_NAME = UML_SHAPE__FONT_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Font Height</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__FONT_HEIGHT = UML_SHAPE__FONT_HEIGHT;
+
+	/**
+	 * The feature id for the '<em><b>Bold</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__BOLD = UML_SHAPE__BOLD;
+
+	/**
+	 * The feature id for the '<em><b>Italic</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__ITALIC = UML_SHAPE__ITALIC;
+
+	/**
+	 * The feature id for the '<em><b>Underline</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__UNDERLINE = UML_SHAPE__UNDERLINE;
+
+	/**
+	 * The feature id for the '<em><b>Strike Through</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__STRIKE_THROUGH = UML_SHAPE__STRIKE_THROUGH;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__DESCRIPTION = UML_SHAPE__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Fill Color</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__FILL_COLOR = UML_SHAPE__FILL_COLOR;
+
+	/**
+	 * The feature id for the '<em><b>Transparency</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__TRANSPARENCY = UML_SHAPE__TRANSPARENCY;
+
+	/**
+	 * The feature id for the '<em><b>Gradient</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__GRADIENT = UML_SHAPE__GRADIENT;
+
+	/**
+	 * The feature id for the '<em><b>Line Color</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__LINE_COLOR = UML_SHAPE__LINE_COLOR;
+
+	/**
+	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__LINE_WIDTH = UML_SHAPE__LINE_WIDTH;
+
+	/**
+	 * The feature id for the '<em><b>Rounded Bendpoints Radius</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__ROUNDED_BENDPOINTS_RADIUS = UML_SHAPE__ROUNDED_BENDPOINTS_RADIUS;
+
+	/**
+	 * The feature id for the '<em><b>Show Stereotype</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__SHOW_STEREOTYPE = UML_SHAPE__SHOW_STEREOTYPE;
+
+	/**
+	 * The feature id for the '<em><b>Show List Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__SHOW_LIST_VISIBILITY = UML_SHAPE__SHOW_LIST_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Show List Signature</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__SHOW_LIST_SIGNATURE = UML_SHAPE__SHOW_LIST_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Alignment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__ALIGNMENT = UML_SHAPE__ALIGNMENT;
+
+	/**
+	 * The feature id for the '<em><b>Show Stereotype Attribute Compartment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT = UML_SHAPE__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT;
+
+	/**
+	 * The feature id for the '<em><b>Show Whitebox</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT__SHOW_WHITEBOX = UML_SHAPE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>UML Component</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPONENT_FEATURE_COUNT = UML_SHAPE_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLClassifierShapeImpl <em>UML Classifier Shape</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLClassifierShapeImpl
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.PapyrusUMLNotationPackageImpl#getUMLClassifierShape()
+	 * @generated
+	 */
+	int UML_CLASSIFIER_SHAPE = 7;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__EANNOTATIONS = UML_SHAPE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Visible</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__VISIBLE = UML_SHAPE__VISIBLE;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__TYPE = UML_SHAPE__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__MUTABLE = UML_SHAPE__MUTABLE;
+
+	/**
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__SOURCE_EDGES = UML_SHAPE__SOURCE_EDGES;
+
+	/**
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__TARGET_EDGES = UML_SHAPE__TARGET_EDGES;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__CHILDREN = UML_SHAPE__PERSISTED_CHILDREN;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__STYLES = UML_SHAPE__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__ELEMENT = UML_SHAPE__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Diagram</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__DIAGRAM = UML_SHAPE__DIAGRAM;
+
+	/**
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__TRANSIENT_CHILDREN = UML_SHAPE__TRANSIENT_CHILDREN;
+
+	/**
+	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__LAYOUT_CONSTRAINT = UML_SHAPE__LAYOUT_CONSTRAINT;
+
+	/**
+	 * The feature id for the '<em><b>Font Color</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__FONT_COLOR = UML_SHAPE__FONT_COLOR;
+
+	/**
+	 * The feature id for the '<em><b>Font Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__FONT_NAME = UML_SHAPE__FONT_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Font Height</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__FONT_HEIGHT = UML_SHAPE__FONT_HEIGHT;
+
+	/**
+	 * The feature id for the '<em><b>Bold</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__BOLD = UML_SHAPE__BOLD;
+
+	/**
+	 * The feature id for the '<em><b>Italic</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__ITALIC = UML_SHAPE__ITALIC;
+
+	/**
+	 * The feature id for the '<em><b>Underline</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__UNDERLINE = UML_SHAPE__UNDERLINE;
+
+	/**
+	 * The feature id for the '<em><b>Strike Through</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__STRIKE_THROUGH = UML_SHAPE__STRIKE_THROUGH;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__DESCRIPTION = UML_SHAPE__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Fill Color</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__FILL_COLOR = UML_SHAPE__FILL_COLOR;
+
+	/**
+	 * The feature id for the '<em><b>Transparency</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__TRANSPARENCY = UML_SHAPE__TRANSPARENCY;
+
+	/**
+	 * The feature id for the '<em><b>Gradient</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__GRADIENT = UML_SHAPE__GRADIENT;
+
+	/**
+	 * The feature id for the '<em><b>Line Color</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__LINE_COLOR = UML_SHAPE__LINE_COLOR;
+
+	/**
+	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__LINE_WIDTH = UML_SHAPE__LINE_WIDTH;
+
+	/**
+	 * The feature id for the '<em><b>Rounded Bendpoints Radius</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__ROUNDED_BENDPOINTS_RADIUS = UML_SHAPE__ROUNDED_BENDPOINTS_RADIUS;
+
+	/**
+	 * The feature id for the '<em><b>Show Stereotype</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__SHOW_STEREOTYPE = UML_SHAPE__SHOW_STEREOTYPE;
+
+	/**
+	 * The feature id for the '<em><b>Show List Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__SHOW_LIST_VISIBILITY = UML_SHAPE__SHOW_LIST_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Show List Signature</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__SHOW_LIST_SIGNATURE = UML_SHAPE__SHOW_LIST_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Alignment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__ALIGNMENT = UML_SHAPE__ALIGNMENT;
+
+	/**
+	 * The feature id for the '<em><b>Show Stereotype Attribute Compartment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT = UML_SHAPE__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT;
+
+	/**
+	 * The feature id for the '<em><b>Use Classifier Shape</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE__USE_CLASSIFIER_SHAPE = UML_SHAPE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>UML Classifier Shape</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int UML_CLASSIFIER_SHAPE_FEATURE_COUNT = UML_SHAPE_FEATURE_COUNT + 1;
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLDiagram <em>UML Diagram</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>UML Diagram</em>'.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLDiagram
+	 * @generated
+	 */
+	EClass getUMLDiagram();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLFrame <em>UML Frame</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>UML Frame</em>'.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLFrame
+	 * @generated
+	 */
+	EClass getUMLFrame();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLShapeCompartment <em>UML Shape Compartment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>UML Shape Compartment</em>'.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLShapeCompartment
+	 * @generated
+	 */
+	EClass getUMLShapeCompartment();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLShapeCompartment#isVerticalAlignment <em>Vertical Alignment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Vertical Alignment</em>'.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLShapeCompartment#isVerticalAlignment()
+	 * @see #getUMLShapeCompartment()
+	 * @generated
+	 */
+	EAttribute getUMLShapeCompartment_VerticalAlignment();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLShape <em>UML Shape</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>UML Shape</em>'.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLShape
+	 * @generated
+	 */
+	EClass getUMLShape();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLConnector <em>UML Connector</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>UML Connector</em>'.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLConnector
+	 * @generated
+	 */
+	EClass getUMLConnector();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLView <em>UML View</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>UML View</em>'.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLView
+	 * @generated
+	 */
+	EClass getUMLView();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#getShowStereotype <em>Show Stereotype</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Show Stereotype</em>'.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#getShowStereotype()
+	 * @see #getUMLView()
+	 * @generated
+	 */
+	EAttribute getUMLView_ShowStereotype();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#getShowListVisibility <em>Show List Visibility</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Show List Visibility</em>'.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#getShowListVisibility()
+	 * @see #getUMLView()
+	 * @generated
+	 */
+	EAttribute getUMLView_ShowListVisibility();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#isShowListSignature <em>Show List Signature</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Show List Signature</em>'.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#isShowListSignature()
+	 * @see #getUMLView()
+	 * @generated
+	 */
+	EAttribute getUMLView_ShowListSignature();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#getAlignment <em>Alignment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Alignment</em>'.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#getAlignment()
+	 * @see #getUMLView()
+	 * @generated
+	 */
+	EAttribute getUMLView_Alignment();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#getShowStereotypeAttributeCompartment <em>Show Stereotype Attribute Compartment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Show Stereotype Attribute Compartment</em>'.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#getShowStereotypeAttributeCompartment()
+	 * @see #getUMLView()
+	 * @generated
+	 */
+	EAttribute getUMLView_ShowStereotypeAttributeCompartment();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLComponent <em>UML Component</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>UML Component</em>'.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLComponent
+	 * @generated
+	 */
+	EClass getUMLComponent();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLComponent#isShowWhitebox <em>Show Whitebox</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Show Whitebox</em>'.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLComponent#isShowWhitebox()
+	 * @see #getUMLComponent()
+	 * @generated
+	 */
+	EAttribute getUMLComponent_ShowWhitebox();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLClassifierShape <em>UML Classifier Shape</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>UML Classifier Shape</em>'.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLClassifierShape
+	 * @generated
+	 */
+	EClass getUMLClassifierShape();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLClassifierShape#isUseClassifierShape <em>Use Classifier Shape</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Use Classifier Shape</em>'.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLClassifierShape#isUseClassifierShape()
+	 * @see #getUMLClassifierShape()
+	 * @generated
+	 */
+	EAttribute getUMLClassifierShape_UseClassifierShape();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	PapyrusUMLNotationFactory getPapyrusUMLNotationFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLDiagramImpl <em>UML Diagram</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLDiagramImpl
+		 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.PapyrusUMLNotationPackageImpl#getUMLDiagram()
+		 * @generated
+		 */
+		EClass UML_DIAGRAM = eINSTANCE.getUMLDiagram();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLFrameImpl <em>UML Frame</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLFrameImpl
+		 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.PapyrusUMLNotationPackageImpl#getUMLFrame()
+		 * @generated
+		 */
+		EClass UML_FRAME = eINSTANCE.getUMLFrame();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLShapeCompartmentImpl <em>UML Shape Compartment</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLShapeCompartmentImpl
+		 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.PapyrusUMLNotationPackageImpl#getUMLShapeCompartment()
+		 * @generated
+		 */
+		EClass UML_SHAPE_COMPARTMENT = eINSTANCE.getUMLShapeCompartment();
+
+		/**
+		 * The meta object literal for the '<em><b>Vertical Alignment</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute UML_SHAPE_COMPARTMENT__VERTICAL_ALIGNMENT = eINSTANCE.getUMLShapeCompartment_VerticalAlignment();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLShapeImpl <em>UML Shape</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLShapeImpl
+		 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.PapyrusUMLNotationPackageImpl#getUMLShape()
+		 * @generated
+		 */
+		EClass UML_SHAPE = eINSTANCE.getUMLShape();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLConnectorImpl <em>UML Connector</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLConnectorImpl
+		 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.PapyrusUMLNotationPackageImpl#getUMLConnector()
+		 * @generated
+		 */
+		EClass UML_CONNECTOR = eINSTANCE.getUMLConnector();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLViewImpl <em>UML View</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLViewImpl
+		 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.PapyrusUMLNotationPackageImpl#getUMLView()
+		 * @generated
+		 */
+		EClass UML_VIEW = eINSTANCE.getUMLView();
+
+		/**
+		 * The meta object literal for the '<em><b>Show Stereotype</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute UML_VIEW__SHOW_STEREOTYPE = eINSTANCE.getUMLView_ShowStereotype();
+
+		/**
+		 * The meta object literal for the '<em><b>Show List Visibility</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute UML_VIEW__SHOW_LIST_VISIBILITY = eINSTANCE.getUMLView_ShowListVisibility();
+
+		/**
+		 * The meta object literal for the '<em><b>Show List Signature</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute UML_VIEW__SHOW_LIST_SIGNATURE = eINSTANCE.getUMLView_ShowListSignature();
+
+		/**
+		 * The meta object literal for the '<em><b>Alignment</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute UML_VIEW__ALIGNMENT = eINSTANCE.getUMLView_Alignment();
+
+		/**
+		 * The meta object literal for the '<em><b>Show Stereotype Attribute Compartment</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute UML_VIEW__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT = eINSTANCE.getUMLView_ShowStereotypeAttributeCompartment();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLComponentImpl <em>UML Component</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLComponentImpl
+		 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.PapyrusUMLNotationPackageImpl#getUMLComponent()
+		 * @generated
+		 */
+		EClass UML_COMPONENT = eINSTANCE.getUMLComponent();
+
+		/**
+		 * The meta object literal for the '<em><b>Show Whitebox</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute UML_COMPONENT__SHOW_WHITEBOX = eINSTANCE.getUMLComponent_ShowWhitebox();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLClassifierShapeImpl <em>UML Classifier Shape</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLClassifierShapeImpl
+		 * @see org.eclipse.papyrus.migration.rsa.umlnotation.impl.PapyrusUMLNotationPackageImpl#getUMLClassifierShape()
+		 * @generated
+		 */
+		EClass UML_CLASSIFIER_SHAPE = eINSTANCE.getUMLClassifierShape();
+
+		/**
+		 * The meta object literal for the '<em><b>Use Classifier Shape</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute UML_CLASSIFIER_SHAPE__USE_CLASSIFIER_SHAPE = eINSTANCE.getUMLClassifierShape_UseClassifierShape();
+
+	}
+
+} // PapyrusUMLNotationPackage
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLClassifierShape.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLClassifierShape.java
new file mode 100644
index 00000000000..3a1b6e94505
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLClassifierShape.java
@@ -0,0 +1,60 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlnotation;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>UML Classifier Shape</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLClassifierShape#isUseClassifierShape <em>Use Classifier Shape</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage#getUMLClassifierShape()

+ * @model

+ * @generated

+ */

+public interface UMLClassifierShape extends UMLShape {

+	/**

+	 * Returns the value of the '<em><b>Use Classifier Shape</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Use Classifier Shape</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Use Classifier Shape</em>' attribute.

+	 * @see #setUseClassifierShape(boolean)

+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage#getUMLClassifierShape_UseClassifierShape()

+	 * @model

+	 * @generated

+	 */

+	boolean isUseClassifierShape();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLClassifierShape#isUseClassifierShape <em>Use Classifier Shape</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Use Classifier Shape</em>' attribute.

+	 * @see #isUseClassifierShape()

+	 * @generated

+	 */

+	void setUseClassifierShape(boolean value);

+

+} // UMLClassifierShape

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLComponent.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLComponent.java
new file mode 100644
index 00000000000..41841bcc1fa
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLComponent.java
@@ -0,0 +1,60 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlnotation;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>UML Component</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLComponent#isShowWhitebox <em>Show Whitebox</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage#getUMLComponent()

+ * @model

+ * @generated

+ */

+public interface UMLComponent extends UMLShape {

+

+	/**

+	 * Returns the value of the '<em><b>Show Whitebox</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Show Whitebox</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Show Whitebox</em>' attribute.

+	 * @see #setShowWhitebox(boolean)

+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage#getUMLComponent_ShowWhitebox()

+	 * @model

+	 * @generated

+	 */

+	boolean isShowWhitebox();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLComponent#isShowWhitebox <em>Show Whitebox</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Show Whitebox</em>' attribute.

+	 * @see #isShowWhitebox()

+	 * @generated

+	 */

+	void setShowWhitebox(boolean value);

+} // UMLComponent

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLConnector.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLConnector.java
new file mode 100644
index 00000000000..cea2694fe07
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLConnector.java
@@ -0,0 +1,28 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.umlnotation;
+
+import org.eclipse.gmf.runtime.notation.Connector;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>UML Connector</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage#getUMLConnector()
+ * @model
+ * @generated
+ */
+public interface UMLConnector extends Connector, FontStyle, UMLView {
+} // UMLConnector
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLDiagram.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLDiagram.java
new file mode 100644
index 00000000000..24f78227331
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLDiagram.java
@@ -0,0 +1,27 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.umlnotation;
+
+import org.eclipse.gmf.runtime.notation.Diagram;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>UML Diagram</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage#getUMLDiagram()
+ * @model
+ * @generated
+ */
+public interface UMLDiagram extends Diagram, UMLView {
+} // UMLDiagram
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLFrame.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLFrame.java
new file mode 100644
index 00000000000..d02b439e0bc
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLFrame.java
@@ -0,0 +1,26 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.umlnotation;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>UML Frame</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage#getUMLFrame()
+ * @model
+ * @generated
+ */
+public interface UMLFrame extends UMLShape {
+} // UMLFrame
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLShape.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLShape.java
new file mode 100644
index 00000000000..b5aa8bb6ee3
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLShape.java
@@ -0,0 +1,27 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.umlnotation;
+
+import org.eclipse.gmf.runtime.notation.Shape;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>UML Shape</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage#getUMLShape()
+ * @model
+ * @generated
+ */
+public interface UMLShape extends Shape, UMLView {
+} // UMLShape
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLShapeCompartment.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLShapeCompartment.java
new file mode 100644
index 00000000000..80a8733b44e
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLShapeCompartment.java
@@ -0,0 +1,62 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.umlnotation;
+
+import org.eclipse.gmf.runtime.notation.Compartment;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>UML Shape Compartment</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLShapeCompartment#isVerticalAlignment <em>Vertical Alignment</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage#getUMLShapeCompartment()
+ * @model
+ * @generated
+ */
+public interface UMLShapeCompartment extends Compartment, UMLView {
+
+	/**
+	 * Returns the value of the '<em><b>Vertical Alignment</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Vertical Alignment</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Vertical Alignment</em>' attribute.
+	 * @see #setVerticalAlignment(boolean)
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage#getUMLShapeCompartment_VerticalAlignment()
+	 * @model default="true"
+	 * @generated
+	 */
+	boolean isVerticalAlignment();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLShapeCompartment#isVerticalAlignment <em>Vertical Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Vertical Alignment</em>' attribute.
+	 * @see #isVerticalAlignment()
+	 * @generated
+	 */
+	void setVerticalAlignment(boolean value);
+} // UMLShapeCompartment
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLView.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLView.java
new file mode 100644
index 00000000000..a1c2f7b35ac
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/UMLView.java
@@ -0,0 +1,180 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.umlnotation;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>UML View</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#getShowStereotype <em>Show Stereotype</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#getShowListVisibility <em>Show List Visibility</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#isShowListSignature <em>Show List Signature</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#getAlignment <em>Alignment</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#getShowStereotypeAttributeCompartment <em>Show Stereotype Attribute Compartment</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage#getUMLView()
+ * @model abstract="true"
+ * @generated
+ */
+public interface UMLView extends EObject, View {
+	/**
+	 * Returns the value of the '<em><b>Show Stereotype</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Show Stereotype</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Show Stereotype</em>' attribute.
+	 * @see #setShowStereotype(String)
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage#getUMLView_ShowStereotype()
+	 * @model
+	 * @generated
+	 */
+	String getShowStereotype();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#getShowStereotype <em>Show Stereotype</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Show Stereotype</em>' attribute.
+	 * @see #getShowStereotype()
+	 * @generated
+	 */
+	void setShowStereotype(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Show List Visibility</b></em>' attribute.
+	 * The default value is <code>"None"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Show List Visibility</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Show List Visibility</em>' attribute.
+	 * @see #setShowListVisibility(String)
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage#getUMLView_ShowListVisibility()
+	 * @model default="None"
+	 * @generated
+	 */
+	String getShowListVisibility();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#getShowListVisibility <em>Show List Visibility</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Show List Visibility</em>' attribute.
+	 * @see #getShowListVisibility()
+	 * @generated
+	 */
+	void setShowListVisibility(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Show List Signature</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Show List Signature</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Show List Signature</em>' attribute.
+	 * @see #setShowListSignature(boolean)
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage#getUMLView_ShowListSignature()
+	 * @model default="true"
+	 * @generated
+	 */
+	boolean isShowListSignature();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#isShowListSignature <em>Show List Signature</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Show List Signature</em>' attribute.
+	 * @see #isShowListSignature()
+	 * @generated
+	 */
+	void setShowListSignature(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Alignment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Alignment</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Alignment</em>' attribute.
+	 * @see #setAlignment(String)
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage#getUMLView_Alignment()
+	 * @model
+	 * @generated
+	 */
+	String getAlignment();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#getAlignment <em>Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Alignment</em>' attribute.
+	 * @see #getAlignment()
+	 * @generated
+	 */
+	void setAlignment(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Show Stereotype Attribute Compartment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Show Stereotype Attribute Compartment</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Show Stereotype Attribute Compartment</em>' attribute.
+	 * @see #setShowStereotypeAttributeCompartment(String)
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage#getUMLView_ShowStereotypeAttributeCompartment()
+	 * @model
+	 * @generated
+	 */
+	String getShowStereotypeAttributeCompartment();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLView#getShowStereotypeAttributeCompartment <em>Show Stereotype Attribute Compartment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Show Stereotype Attribute Compartment</em>' attribute.
+	 * @see #getShowStereotypeAttributeCompartment()
+	 * @generated
+	 */
+	void setShowStereotypeAttributeCompartment(String value);
+
+} // UMLView
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/PapyrusUMLNotationFactoryImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/PapyrusUMLNotationFactoryImpl.java
new file mode 100644
index 00000000000..e7510abb127
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/PapyrusUMLNotationFactoryImpl.java
@@ -0,0 +1,202 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.umlnotation.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationFactory;
+import org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLClassifierShape;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLComponent;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLConnector;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLDiagram;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLFrame;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLShape;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLShapeCompartment;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class PapyrusUMLNotationFactoryImpl extends EFactoryImpl implements PapyrusUMLNotationFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static PapyrusUMLNotationFactory init() {
+		try {
+			PapyrusUMLNotationFactory thePapyrusUMLNotationFactory = (PapyrusUMLNotationFactory) EPackage.Registry.INSTANCE.getEFactory(PapyrusUMLNotationPackage.eNS_URI);
+			if (thePapyrusUMLNotationFactory != null) {
+				return thePapyrusUMLNotationFactory;
+			}
+		} catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new PapyrusUMLNotationFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public PapyrusUMLNotationFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+		case PapyrusUMLNotationPackage.UML_DIAGRAM:
+			return createUMLDiagram();
+		case PapyrusUMLNotationPackage.UML_FRAME:
+			return createUMLFrame();
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT:
+			return createUMLShapeCompartment();
+		case PapyrusUMLNotationPackage.UML_SHAPE:
+			return createUMLShape();
+		case PapyrusUMLNotationPackage.UML_CONNECTOR:
+			return createUMLConnector();
+		case PapyrusUMLNotationPackage.UML_COMPONENT:
+			return createUMLComponent();
+		case PapyrusUMLNotationPackage.UML_CLASSIFIER_SHAPE:
+			return createUMLClassifierShape();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public UMLDiagram createUMLDiagram() {
+		UMLDiagramImpl umlDiagram = new UMLDiagramImpl();
+		return umlDiagram;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public UMLFrame createUMLFrame() {
+		UMLFrameImpl umlFrame = new UMLFrameImpl();
+		return umlFrame;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public UMLShapeCompartment createUMLShapeCompartment() {
+		UMLShapeCompartmentImpl umlShapeCompartment = new UMLShapeCompartmentImpl();
+		return umlShapeCompartment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public UMLShape createUMLShape() {
+		UMLShapeImpl umlShape = new UMLShapeImpl();
+		return umlShape;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public UMLConnector createUMLConnector() {
+		UMLConnectorImpl umlConnector = new UMLConnectorImpl();
+		return umlConnector;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public UMLComponent createUMLComponent() {
+		UMLComponentImpl umlComponent = new UMLComponentImpl();
+		return umlComponent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public UMLClassifierShape createUMLClassifierShape() {
+		UMLClassifierShapeImpl umlClassifierShape = new UMLClassifierShapeImpl();
+		return umlClassifierShape;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public PapyrusUMLNotationPackage getPapyrusUMLNotationPackage() {
+		return (PapyrusUMLNotationPackage) getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static PapyrusUMLNotationPackage getPackage() {
+		return PapyrusUMLNotationPackage.eINSTANCE;
+	}
+
+} // PapyrusUMLNotationFactoryImpl
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/PapyrusUMLNotationPackageImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/PapyrusUMLNotationPackageImpl.java
new file mode 100644
index 00000000000..4fa0f288f82
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/PapyrusUMLNotationPackageImpl.java
@@ -0,0 +1,485 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.umlnotation.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl;
+import org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationFactory;
+import org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLClassifierShape;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLComponent;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLConnector;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLDiagram;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLFrame;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLShape;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLShapeCompartment;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLView;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class PapyrusUMLNotationPackageImpl extends EPackageImpl implements PapyrusUMLNotationPackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass umlDiagramEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass umlFrameEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass umlShapeCompartmentEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass umlShapeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass umlConnectorEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass umlViewEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass umlComponentEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass umlClassifierShapeEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private PapyrusUMLNotationPackageImpl() {
+		super(eNS_URI, PapyrusUMLNotationFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 *
+	 * <p>
+	 * This method is used to initialize {@link PapyrusUMLNotationPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 *
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static PapyrusUMLNotationPackage init() {
+		if (isInited) {
+			return (PapyrusUMLNotationPackage) EPackage.Registry.INSTANCE.getEPackage(PapyrusUMLNotationPackage.eNS_URI);
+		}
+
+		// Obtain or create and register package
+		PapyrusUMLNotationPackageImpl thePapyrusUMLNotationPackage = (PapyrusUMLNotationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PapyrusUMLNotationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+				: new PapyrusUMLNotationPackageImpl());
+
+		isInited = true;
+
+		// Obtain or create and register interdependencies
+		NotationPackageImpl theNotationPackage = (NotationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(NotationPackage.eNS_URI) instanceof NotationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NotationPackage.eNS_URI)
+				: NotationPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		thePapyrusUMLNotationPackage.createPackageContents();
+		theNotationPackage.createPackageContents();
+
+		// Initialize created meta-data
+		thePapyrusUMLNotationPackage.initializePackageContents();
+		theNotationPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		thePapyrusUMLNotationPackage.freeze();
+
+
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(PapyrusUMLNotationPackage.eNS_URI, thePapyrusUMLNotationPackage);
+		return thePapyrusUMLNotationPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getUMLDiagram() {
+		return umlDiagramEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getUMLFrame() {
+		return umlFrameEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getUMLShapeCompartment() {
+		return umlShapeCompartmentEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getUMLShapeCompartment_VerticalAlignment() {
+		return (EAttribute) umlShapeCompartmentEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getUMLShape() {
+		return umlShapeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getUMLConnector() {
+		return umlConnectorEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getUMLView() {
+		return umlViewEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getUMLView_ShowStereotype() {
+		return (EAttribute) umlViewEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getUMLView_ShowListVisibility() {
+		return (EAttribute) umlViewEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getUMLView_ShowListSignature() {
+		return (EAttribute) umlViewEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getUMLView_Alignment() {
+		return (EAttribute) umlViewEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getUMLView_ShowStereotypeAttributeCompartment() {
+		return (EAttribute) umlViewEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getUMLComponent() {
+		return umlComponentEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getUMLComponent_ShowWhitebox() {
+		return (EAttribute) umlComponentEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getUMLClassifierShape() {
+		return umlClassifierShapeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getUMLClassifierShape_UseClassifierShape() {
+		return (EAttribute) umlClassifierShapeEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public PapyrusUMLNotationFactory getPapyrusUMLNotationFactory() {
+		return (PapyrusUMLNotationFactory) getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package. This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) {
+			return;
+		}
+		isCreated = true;
+
+		// Create classes and their features
+		umlDiagramEClass = createEClass(UML_DIAGRAM);
+
+		umlFrameEClass = createEClass(UML_FRAME);
+
+		umlShapeCompartmentEClass = createEClass(UML_SHAPE_COMPARTMENT);
+		createEAttribute(umlShapeCompartmentEClass, UML_SHAPE_COMPARTMENT__VERTICAL_ALIGNMENT);
+
+		umlShapeEClass = createEClass(UML_SHAPE);
+
+		umlConnectorEClass = createEClass(UML_CONNECTOR);
+
+		umlViewEClass = createEClass(UML_VIEW);
+		createEAttribute(umlViewEClass, UML_VIEW__SHOW_STEREOTYPE);
+		createEAttribute(umlViewEClass, UML_VIEW__SHOW_LIST_VISIBILITY);
+		createEAttribute(umlViewEClass, UML_VIEW__SHOW_LIST_SIGNATURE);
+		createEAttribute(umlViewEClass, UML_VIEW__ALIGNMENT);
+		createEAttribute(umlViewEClass, UML_VIEW__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT);
+
+		umlComponentEClass = createEClass(UML_COMPONENT);
+		createEAttribute(umlComponentEClass, UML_COMPONENT__SHOW_WHITEBOX);
+
+		umlClassifierShapeEClass = createEClass(UML_CLASSIFIER_SHAPE);
+		createEAttribute(umlClassifierShapeEClass, UML_CLASSIFIER_SHAPE__USE_CLASSIFIER_SHAPE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model. This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) {
+			return;
+		}
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		NotationPackage theNotationPackage = (NotationPackage) EPackage.Registry.INSTANCE.getEPackage(NotationPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		umlDiagramEClass.getESuperTypes().add(theNotationPackage.getDiagram());
+		umlDiagramEClass.getESuperTypes().add(this.getUMLView());
+		umlFrameEClass.getESuperTypes().add(this.getUMLShape());
+		umlShapeCompartmentEClass.getESuperTypes().add(theNotationPackage.getCompartment());
+		umlShapeCompartmentEClass.getESuperTypes().add(this.getUMLView());
+		umlShapeEClass.getESuperTypes().add(theNotationPackage.getShape());
+		umlShapeEClass.getESuperTypes().add(this.getUMLView());
+		umlConnectorEClass.getESuperTypes().add(theNotationPackage.getConnector());
+		umlConnectorEClass.getESuperTypes().add(theNotationPackage.getFontStyle());
+		umlConnectorEClass.getESuperTypes().add(this.getUMLView());
+		umlViewEClass.getESuperTypes().add(theNotationPackage.getView());
+		umlComponentEClass.getESuperTypes().add(this.getUMLShape());
+		umlClassifierShapeEClass.getESuperTypes().add(this.getUMLShape());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(umlDiagramEClass, UMLDiagram.class, "UMLDiagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(umlFrameEClass, UMLFrame.class, "UMLFrame", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(umlShapeCompartmentEClass, UMLShapeCompartment.class, "UMLShapeCompartment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getUMLShapeCompartment_VerticalAlignment(), ecorePackage.getEBoolean(), "verticalAlignment", "true", 0, 1, UMLShapeCompartment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(umlShapeEClass, UMLShape.class, "UMLShape", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(umlConnectorEClass, UMLConnector.class, "UMLConnector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(umlViewEClass, UMLView.class, "UMLView", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getUMLView_ShowStereotype(), ecorePackage.getEString(), "showStereotype", null, 0, 1, UMLView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getUMLView_ShowListVisibility(), ecorePackage.getEString(), "showListVisibility", "None", 0, 1, UMLView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getUMLView_ShowListSignature(), ecorePackage.getEBoolean(), "showListSignature", "true", 0, 1, UMLView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getUMLView_Alignment(), ecorePackage.getEString(), "alignment", null, 0, 1, UMLView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getUMLView_ShowStereotypeAttributeCompartment(), ecorePackage.getEString(), "showStereotypeAttributeCompartment", null, 0, 1, UMLView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+
+		initEClass(umlComponentEClass, UMLComponent.class, "UMLComponent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getUMLComponent_ShowWhitebox(), ecorePackage.getEBoolean(), "showWhitebox", null, 0, 1, UMLComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(umlClassifierShapeEClass, UMLClassifierShape.class, "UMLClassifierShape", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getUMLClassifierShape_UseClassifierShape(), ecorePackage.getEBoolean(), "useClassifierShape", null, 0, 1, UMLClassifierShape.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} // PapyrusUMLNotationPackageImpl
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLClassifierShapeImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLClassifierShapeImpl.java
new file mode 100644
index 00000000000..4e6ba7e634c
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLClassifierShapeImpl.java
@@ -0,0 +1,185 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlnotation.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage;

+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLClassifierShape;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>UML Classifier Shape</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLClassifierShapeImpl#isUseClassifierShape <em>Use Classifier Shape</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class UMLClassifierShapeImpl extends UMLShapeImpl implements UMLClassifierShape {

+

+	/**

+	 * The default value of the '{@link #isUseClassifierShape() <em>Use Classifier Shape</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isUseClassifierShape()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean USE_CLASSIFIER_SHAPE_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isUseClassifierShape() <em>Use Classifier Shape</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isUseClassifierShape()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean useClassifierShape = USE_CLASSIFIER_SHAPE_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected UMLClassifierShapeImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return PapyrusUMLNotationPackage.Literals.UML_CLASSIFIER_SHAPE;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean isUseClassifierShape() {

+		return useClassifierShape;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setUseClassifierShape(boolean newUseClassifierShape) {

+		boolean oldUseClassifierShape = useClassifierShape;

+		useClassifierShape = newUseClassifierShape;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_CLASSIFIER_SHAPE__USE_CLASSIFIER_SHAPE, oldUseClassifierShape, useClassifierShape));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case PapyrusUMLNotationPackage.UML_CLASSIFIER_SHAPE__USE_CLASSIFIER_SHAPE:

+			return isUseClassifierShape();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case PapyrusUMLNotationPackage.UML_CLASSIFIER_SHAPE__USE_CLASSIFIER_SHAPE:

+			setUseClassifierShape((Boolean) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case PapyrusUMLNotationPackage.UML_CLASSIFIER_SHAPE__USE_CLASSIFIER_SHAPE:

+			setUseClassifierShape(USE_CLASSIFIER_SHAPE_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case PapyrusUMLNotationPackage.UML_CLASSIFIER_SHAPE__USE_CLASSIFIER_SHAPE:

+			return useClassifierShape != USE_CLASSIFIER_SHAPE_EDEFAULT;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (useClassifierShape: ");

+		result.append(useClassifierShape);

+		result.append(')');

+		return result.toString();

+	}

+

+} // UMLClassifierShapeImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLComponentImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLComponentImpl.java
new file mode 100644
index 00000000000..f86551b86ae
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLComponentImpl.java
@@ -0,0 +1,184 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlnotation.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage;

+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLComponent;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>UML Component</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLComponentImpl#isShowWhitebox <em>Show Whitebox</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class UMLComponentImpl extends UMLShapeImpl implements UMLComponent {

+

+	/**

+	 * The default value of the '{@link #isShowWhitebox() <em>Show Whitebox</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isShowWhitebox()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean SHOW_WHITEBOX_EDEFAULT = false;

+	/**

+	 * The cached value of the '{@link #isShowWhitebox() <em>Show Whitebox</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isShowWhitebox()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean showWhitebox = SHOW_WHITEBOX_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected UMLComponentImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return PapyrusUMLNotationPackage.Literals.UML_COMPONENT;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean isShowWhitebox() {

+		return showWhitebox;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setShowWhitebox(boolean newShowWhitebox) {

+		boolean oldShowWhitebox = showWhitebox;

+		showWhitebox = newShowWhitebox;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_COMPONENT__SHOW_WHITEBOX, oldShowWhitebox, showWhitebox));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case PapyrusUMLNotationPackage.UML_COMPONENT__SHOW_WHITEBOX:

+			return isShowWhitebox();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case PapyrusUMLNotationPackage.UML_COMPONENT__SHOW_WHITEBOX:

+			setShowWhitebox((Boolean) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case PapyrusUMLNotationPackage.UML_COMPONENT__SHOW_WHITEBOX:

+			setShowWhitebox(SHOW_WHITEBOX_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case PapyrusUMLNotationPackage.UML_COMPONENT__SHOW_WHITEBOX:

+			return showWhitebox != SHOW_WHITEBOX_EDEFAULT;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (showWhitebox: ");

+		result.append(showWhitebox);

+		result.append(')');

+		return result.toString();

+	}

+

+} // UMLComponentImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLConnectorImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLConnectorImpl.java
new file mode 100644
index 00000000000..148af0dcc48
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLConnectorImpl.java
@@ -0,0 +1,954 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.umlnotation.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.impl.ConnectorImpl;
+import org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLConnector;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLView;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>UML Connector</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLConnectorImpl#getFontColor <em>Font Color</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLConnectorImpl#getFontName <em>Font Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLConnectorImpl#getFontHeight <em>Font Height</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLConnectorImpl#isBold <em>Bold</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLConnectorImpl#isItalic <em>Italic</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLConnectorImpl#isUnderline <em>Underline</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLConnectorImpl#isStrikeThrough <em>Strike Through</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLConnectorImpl#getShowStereotype <em>Show Stereotype</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLConnectorImpl#getShowListVisibility <em>Show List Visibility</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLConnectorImpl#isShowListSignature <em>Show List Signature</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLConnectorImpl#getAlignment <em>Alignment</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLConnectorImpl#getShowStereotypeAttributeCompartment <em>Show Stereotype Attribute Compartment</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class UMLConnectorImpl extends ConnectorImpl implements UMLConnector {
+
+	/**
+	 * The default value of the '{@link #getFontColor() <em>Font Color</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getFontColor()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int FONT_COLOR_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getFontColor() <em>Font Color</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getFontColor()
+	 * @generated
+	 * @ordered
+	 */
+	protected int fontColor = FONT_COLOR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFontName() <em>Font Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getFontName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FONT_NAME_EDEFAULT = "Tahoma";
+
+	/**
+	 * The cached value of the '{@link #getFontName() <em>Font Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getFontName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String fontName = FONT_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFontHeight() <em>Font Height</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getFontHeight()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int FONT_HEIGHT_EDEFAULT = 9;
+
+	/**
+	 * The cached value of the '{@link #getFontHeight() <em>Font Height</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getFontHeight()
+	 * @generated
+	 * @ordered
+	 */
+	protected int fontHeight = FONT_HEIGHT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isBold() <em>Bold</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isBold()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean BOLD_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isBold() <em>Bold</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isBold()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean bold = BOLD_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isItalic() <em>Italic</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isItalic()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean ITALIC_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isItalic() <em>Italic</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isItalic()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean italic = ITALIC_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isUnderline() <em>Underline</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isUnderline()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean UNDERLINE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isUnderline() <em>Underline</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isUnderline()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean underline = UNDERLINE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isStrikeThrough() <em>Strike Through</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isStrikeThrough()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean STRIKE_THROUGH_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isStrikeThrough() <em>Strike Through</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isStrikeThrough()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean strikeThrough = STRIKE_THROUGH_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getShowStereotype() <em>Show Stereotype</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotype()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SHOW_STEREOTYPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getShowStereotype() <em>Show Stereotype</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotype()
+	 * @generated
+	 * @ordered
+	 */
+	protected String showStereotype = SHOW_STEREOTYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getShowListVisibility() <em>Show List Visibility</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowListVisibility()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SHOW_LIST_VISIBILITY_EDEFAULT = "None";
+
+	/**
+	 * The cached value of the '{@link #getShowListVisibility() <em>Show List Visibility</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowListVisibility()
+	 * @generated
+	 * @ordered
+	 */
+	protected String showListVisibility = SHOW_LIST_VISIBILITY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isShowListSignature() <em>Show List Signature</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isShowListSignature()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean SHOW_LIST_SIGNATURE_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isShowListSignature() <em>Show List Signature</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isShowListSignature()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean showListSignature = SHOW_LIST_SIGNATURE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ALIGNMENT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected String alignment = ALIGNMENT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getShowStereotypeAttributeCompartment() <em>Show Stereotype Attribute Compartment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotypeAttributeCompartment()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getShowStereotypeAttributeCompartment() <em>Show Stereotype Attribute Compartment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotypeAttributeCompartment()
+	 * @generated
+	 * @ordered
+	 */
+	protected String showStereotypeAttributeCompartment = SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected UMLConnectorImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return PapyrusUMLNotationPackage.Literals.UML_CONNECTOR;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int getFontColor() {
+		return fontColor;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setFontColor(int newFontColor) {
+		int oldFontColor = fontColor;
+		fontColor = newFontColor;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_COLOR, oldFontColor, fontColor));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getFontName() {
+		return fontName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setFontName(String newFontName) {
+		String oldFontName = fontName;
+		fontName = newFontName;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_NAME, oldFontName, fontName));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int getFontHeight() {
+		return fontHeight;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setFontHeight(int newFontHeight) {
+		int oldFontHeight = fontHeight;
+		fontHeight = newFontHeight;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_HEIGHT, oldFontHeight, fontHeight));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean isBold() {
+		return bold;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setBold(boolean newBold) {
+		boolean oldBold = bold;
+		bold = newBold;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_CONNECTOR__BOLD, oldBold, bold));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean isItalic() {
+		return italic;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setItalic(boolean newItalic) {
+		boolean oldItalic = italic;
+		italic = newItalic;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_CONNECTOR__ITALIC, oldItalic, italic));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean isUnderline() {
+		return underline;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setUnderline(boolean newUnderline) {
+		boolean oldUnderline = underline;
+		underline = newUnderline;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_CONNECTOR__UNDERLINE, oldUnderline, underline));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean isStrikeThrough() {
+		return strikeThrough;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setStrikeThrough(boolean newStrikeThrough) {
+		boolean oldStrikeThrough = strikeThrough;
+		strikeThrough = newStrikeThrough;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_CONNECTOR__STRIKE_THROUGH, oldStrikeThrough, strikeThrough));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getShowStereotype() {
+		return showStereotype;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowStereotype(String newShowStereotype) {
+		String oldShowStereotype = showStereotype;
+		showStereotype = newShowStereotype;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_STEREOTYPE, oldShowStereotype, showStereotype));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getShowListVisibility() {
+		return showListVisibility;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowListVisibility(String newShowListVisibility) {
+		String oldShowListVisibility = showListVisibility;
+		showListVisibility = newShowListVisibility;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_LIST_VISIBILITY, oldShowListVisibility, showListVisibility));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean isShowListSignature() {
+		return showListSignature;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowListSignature(boolean newShowListSignature) {
+		boolean oldShowListSignature = showListSignature;
+		showListSignature = newShowListSignature;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_LIST_SIGNATURE, oldShowListSignature, showListSignature));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getAlignment() {
+		return alignment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setAlignment(String newAlignment) {
+		String oldAlignment = alignment;
+		alignment = newAlignment;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_CONNECTOR__ALIGNMENT, oldAlignment, alignment));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getShowStereotypeAttributeCompartment() {
+		return showStereotypeAttributeCompartment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowStereotypeAttributeCompartment(String newShowStereotypeAttributeCompartment) {
+		String oldShowStereotypeAttributeCompartment = showStereotypeAttributeCompartment;
+		showStereotypeAttributeCompartment = newShowStereotypeAttributeCompartment;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT, oldShowStereotypeAttributeCompartment, showStereotypeAttributeCompartment));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_COLOR:
+			return getFontColor();
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_NAME:
+			return getFontName();
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_HEIGHT:
+			return getFontHeight();
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__BOLD:
+			return isBold();
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__ITALIC:
+			return isItalic();
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__UNDERLINE:
+			return isUnderline();
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__STRIKE_THROUGH:
+			return isStrikeThrough();
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_STEREOTYPE:
+			return getShowStereotype();
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_LIST_VISIBILITY:
+			return getShowListVisibility();
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_LIST_SIGNATURE:
+			return isShowListSignature();
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__ALIGNMENT:
+			return getAlignment();
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			return getShowStereotypeAttributeCompartment();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_COLOR:
+			setFontColor((Integer) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_NAME:
+			setFontName((String) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_HEIGHT:
+			setFontHeight((Integer) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__BOLD:
+			setBold((Boolean) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__ITALIC:
+			setItalic((Boolean) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__UNDERLINE:
+			setUnderline((Boolean) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__STRIKE_THROUGH:
+			setStrikeThrough((Boolean) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_STEREOTYPE:
+			setShowStereotype((String) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_LIST_VISIBILITY:
+			setShowListVisibility((String) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_LIST_SIGNATURE:
+			setShowListSignature((Boolean) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__ALIGNMENT:
+			setAlignment((String) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			setShowStereotypeAttributeCompartment((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_COLOR:
+			setFontColor(FONT_COLOR_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_NAME:
+			setFontName(FONT_NAME_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_HEIGHT:
+			setFontHeight(FONT_HEIGHT_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__BOLD:
+			setBold(BOLD_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__ITALIC:
+			setItalic(ITALIC_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__UNDERLINE:
+			setUnderline(UNDERLINE_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__STRIKE_THROUGH:
+			setStrikeThrough(STRIKE_THROUGH_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_STEREOTYPE:
+			setShowStereotype(SHOW_STEREOTYPE_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_LIST_VISIBILITY:
+			setShowListVisibility(SHOW_LIST_VISIBILITY_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_LIST_SIGNATURE:
+			setShowListSignature(SHOW_LIST_SIGNATURE_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__ALIGNMENT:
+			setAlignment(ALIGNMENT_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			setShowStereotypeAttributeCompartment(SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_COLOR:
+			return fontColor != FONT_COLOR_EDEFAULT;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_NAME:
+			return FONT_NAME_EDEFAULT == null ? fontName != null : !FONT_NAME_EDEFAULT.equals(fontName);
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_HEIGHT:
+			return fontHeight != FONT_HEIGHT_EDEFAULT;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__BOLD:
+			return bold != BOLD_EDEFAULT;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__ITALIC:
+			return italic != ITALIC_EDEFAULT;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__UNDERLINE:
+			return underline != UNDERLINE_EDEFAULT;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__STRIKE_THROUGH:
+			return strikeThrough != STRIKE_THROUGH_EDEFAULT;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_STEREOTYPE:
+			return SHOW_STEREOTYPE_EDEFAULT == null ? showStereotype != null : !SHOW_STEREOTYPE_EDEFAULT.equals(showStereotype);
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_LIST_VISIBILITY:
+			return SHOW_LIST_VISIBILITY_EDEFAULT == null ? showListVisibility != null : !SHOW_LIST_VISIBILITY_EDEFAULT.equals(showListVisibility);
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_LIST_SIGNATURE:
+			return showListSignature != SHOW_LIST_SIGNATURE_EDEFAULT;
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__ALIGNMENT:
+			return ALIGNMENT_EDEFAULT == null ? alignment != null : !ALIGNMENT_EDEFAULT.equals(alignment);
+		case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			return SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT == null ? showStereotypeAttributeCompartment != null : !SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT.equals(showStereotypeAttributeCompartment);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
+		if (baseClass == FontStyle.class) {
+			switch (derivedFeatureID) {
+			case PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_COLOR:
+				return NotationPackage.FONT_STYLE__FONT_COLOR;
+			case PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_NAME:
+				return NotationPackage.FONT_STYLE__FONT_NAME;
+			case PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_HEIGHT:
+				return NotationPackage.FONT_STYLE__FONT_HEIGHT;
+			case PapyrusUMLNotationPackage.UML_CONNECTOR__BOLD:
+				return NotationPackage.FONT_STYLE__BOLD;
+			case PapyrusUMLNotationPackage.UML_CONNECTOR__ITALIC:
+				return NotationPackage.FONT_STYLE__ITALIC;
+			case PapyrusUMLNotationPackage.UML_CONNECTOR__UNDERLINE:
+				return NotationPackage.FONT_STYLE__UNDERLINE;
+			case PapyrusUMLNotationPackage.UML_CONNECTOR__STRIKE_THROUGH:
+				return NotationPackage.FONT_STYLE__STRIKE_THROUGH;
+			default:
+				return -1;
+			}
+		}
+		if (baseClass == UMLView.class) {
+			switch (derivedFeatureID) {
+			case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_STEREOTYPE:
+				return PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE;
+			case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_LIST_VISIBILITY:
+				return PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_VISIBILITY;
+			case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_LIST_SIGNATURE:
+				return PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_SIGNATURE;
+			case PapyrusUMLNotationPackage.UML_CONNECTOR__ALIGNMENT:
+				return PapyrusUMLNotationPackage.UML_VIEW__ALIGNMENT;
+			case PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+				return PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT;
+			default:
+				return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
+		if (baseClass == FontStyle.class) {
+			switch (baseFeatureID) {
+			case NotationPackage.FONT_STYLE__FONT_COLOR:
+				return PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_COLOR;
+			case NotationPackage.FONT_STYLE__FONT_NAME:
+				return PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_NAME;
+			case NotationPackage.FONT_STYLE__FONT_HEIGHT:
+				return PapyrusUMLNotationPackage.UML_CONNECTOR__FONT_HEIGHT;
+			case NotationPackage.FONT_STYLE__BOLD:
+				return PapyrusUMLNotationPackage.UML_CONNECTOR__BOLD;
+			case NotationPackage.FONT_STYLE__ITALIC:
+				return PapyrusUMLNotationPackage.UML_CONNECTOR__ITALIC;
+			case NotationPackage.FONT_STYLE__UNDERLINE:
+				return PapyrusUMLNotationPackage.UML_CONNECTOR__UNDERLINE;
+			case NotationPackage.FONT_STYLE__STRIKE_THROUGH:
+				return PapyrusUMLNotationPackage.UML_CONNECTOR__STRIKE_THROUGH;
+			default:
+				return -1;
+			}
+		}
+		if (baseClass == UMLView.class) {
+			switch (baseFeatureID) {
+			case PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE:
+				return PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_STEREOTYPE;
+			case PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_VISIBILITY:
+				return PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_LIST_VISIBILITY;
+			case PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_SIGNATURE:
+				return PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_LIST_SIGNATURE;
+			case PapyrusUMLNotationPackage.UML_VIEW__ALIGNMENT:
+				return PapyrusUMLNotationPackage.UML_CONNECTOR__ALIGNMENT;
+			case PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+				return PapyrusUMLNotationPackage.UML_CONNECTOR__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT;
+			default:
+				return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (fontColor: ");
+		result.append(fontColor);
+		result.append(", fontName: ");
+		result.append(fontName);
+		result.append(", fontHeight: ");
+		result.append(fontHeight);
+		result.append(", bold: ");
+		result.append(bold);
+		result.append(", italic: ");
+		result.append(italic);
+		result.append(", underline: ");
+		result.append(underline);
+		result.append(", strikeThrough: ");
+		result.append(strikeThrough);
+		result.append(", showStereotype: ");
+		result.append(showStereotype);
+		result.append(", showListVisibility: ");
+		result.append(showListVisibility);
+		result.append(", showListSignature: ");
+		result.append(showListSignature);
+		result.append(", alignment: ");
+		result.append(alignment);
+		result.append(", showStereotypeAttributeCompartment: ");
+		result.append(showStereotypeAttributeCompartment);
+		result.append(')');
+		return result.toString();
+	}
+
+} // UMLConnectorImpl
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLDiagramImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLDiagramImpl.java
new file mode 100644
index 00000000000..5f6922c3e53
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLDiagramImpl.java
@@ -0,0 +1,485 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.umlnotation.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.gmf.runtime.notation.impl.DiagramImpl;
+import org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLDiagram;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLView;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>UML Diagram</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLDiagramImpl#getShowStereotype <em>Show Stereotype</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLDiagramImpl#getShowListVisibility <em>Show List Visibility</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLDiagramImpl#isShowListSignature <em>Show List Signature</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLDiagramImpl#getAlignment <em>Alignment</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLDiagramImpl#getShowStereotypeAttributeCompartment <em>Show Stereotype Attribute Compartment</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class UMLDiagramImpl extends DiagramImpl implements UMLDiagram {
+
+	/**
+	 * The default value of the '{@link #getShowStereotype() <em>Show Stereotype</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotype()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SHOW_STEREOTYPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getShowStereotype() <em>Show Stereotype</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotype()
+	 * @generated
+	 * @ordered
+	 */
+	protected String showStereotype = SHOW_STEREOTYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getShowListVisibility() <em>Show List Visibility</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowListVisibility()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SHOW_LIST_VISIBILITY_EDEFAULT = "None";
+
+	/**
+	 * The cached value of the '{@link #getShowListVisibility() <em>Show List Visibility</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowListVisibility()
+	 * @generated
+	 * @ordered
+	 */
+	protected String showListVisibility = SHOW_LIST_VISIBILITY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isShowListSignature() <em>Show List Signature</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isShowListSignature()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean SHOW_LIST_SIGNATURE_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isShowListSignature() <em>Show List Signature</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isShowListSignature()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean showListSignature = SHOW_LIST_SIGNATURE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ALIGNMENT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected String alignment = ALIGNMENT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getShowStereotypeAttributeCompartment() <em>Show Stereotype Attribute Compartment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotypeAttributeCompartment()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getShowStereotypeAttributeCompartment() <em>Show Stereotype Attribute Compartment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotypeAttributeCompartment()
+	 * @generated
+	 * @ordered
+	 */
+	protected String showStereotypeAttributeCompartment = SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected UMLDiagramImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return PapyrusUMLNotationPackage.Literals.UML_DIAGRAM;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getShowStereotype() {
+		return showStereotype;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowStereotype(String newShowStereotype) {
+		String oldShowStereotype = showStereotype;
+		showStereotype = newShowStereotype;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_STEREOTYPE, oldShowStereotype, showStereotype));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getShowListVisibility() {
+		return showListVisibility;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowListVisibility(String newShowListVisibility) {
+		String oldShowListVisibility = showListVisibility;
+		showListVisibility = newShowListVisibility;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_LIST_VISIBILITY, oldShowListVisibility, showListVisibility));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean isShowListSignature() {
+		return showListSignature;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowListSignature(boolean newShowListSignature) {
+		boolean oldShowListSignature = showListSignature;
+		showListSignature = newShowListSignature;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_LIST_SIGNATURE, oldShowListSignature, showListSignature));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getAlignment() {
+		return alignment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setAlignment(String newAlignment) {
+		String oldAlignment = alignment;
+		alignment = newAlignment;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_DIAGRAM__ALIGNMENT, oldAlignment, alignment));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getShowStereotypeAttributeCompartment() {
+		return showStereotypeAttributeCompartment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowStereotypeAttributeCompartment(String newShowStereotypeAttributeCompartment) {
+		String oldShowStereotypeAttributeCompartment = showStereotypeAttributeCompartment;
+		showStereotypeAttributeCompartment = newShowStereotypeAttributeCompartment;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT, oldShowStereotypeAttributeCompartment, showStereotypeAttributeCompartment));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_STEREOTYPE:
+			return getShowStereotype();
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_LIST_VISIBILITY:
+			return getShowListVisibility();
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_LIST_SIGNATURE:
+			return isShowListSignature();
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__ALIGNMENT:
+			return getAlignment();
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			return getShowStereotypeAttributeCompartment();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_STEREOTYPE:
+			setShowStereotype((String) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_LIST_VISIBILITY:
+			setShowListVisibility((String) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_LIST_SIGNATURE:
+			setShowListSignature((Boolean) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__ALIGNMENT:
+			setAlignment((String) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			setShowStereotypeAttributeCompartment((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_STEREOTYPE:
+			setShowStereotype(SHOW_STEREOTYPE_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_LIST_VISIBILITY:
+			setShowListVisibility(SHOW_LIST_VISIBILITY_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_LIST_SIGNATURE:
+			setShowListSignature(SHOW_LIST_SIGNATURE_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__ALIGNMENT:
+			setAlignment(ALIGNMENT_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			setShowStereotypeAttributeCompartment(SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_STEREOTYPE:
+			return SHOW_STEREOTYPE_EDEFAULT == null ? showStereotype != null : !SHOW_STEREOTYPE_EDEFAULT.equals(showStereotype);
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_LIST_VISIBILITY:
+			return SHOW_LIST_VISIBILITY_EDEFAULT == null ? showListVisibility != null : !SHOW_LIST_VISIBILITY_EDEFAULT.equals(showListVisibility);
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_LIST_SIGNATURE:
+			return showListSignature != SHOW_LIST_SIGNATURE_EDEFAULT;
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__ALIGNMENT:
+			return ALIGNMENT_EDEFAULT == null ? alignment != null : !ALIGNMENT_EDEFAULT.equals(alignment);
+		case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			return SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT == null ? showStereotypeAttributeCompartment != null : !SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT.equals(showStereotypeAttributeCompartment);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == UMLView.class) {
+			switch (derivedFeatureID) {
+			case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_STEREOTYPE:
+				return PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE;
+			case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_LIST_VISIBILITY:
+				return PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_VISIBILITY;
+			case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_LIST_SIGNATURE:
+				return PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_SIGNATURE;
+			case PapyrusUMLNotationPackage.UML_DIAGRAM__ALIGNMENT:
+				return PapyrusUMLNotationPackage.UML_VIEW__ALIGNMENT;
+			case PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+				return PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT;
+			default:
+				return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == UMLView.class) {
+			switch (baseFeatureID) {
+			case PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE:
+				return PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_STEREOTYPE;
+			case PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_VISIBILITY:
+				return PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_LIST_VISIBILITY;
+			case PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_SIGNATURE:
+				return PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_LIST_SIGNATURE;
+			case PapyrusUMLNotationPackage.UML_VIEW__ALIGNMENT:
+				return PapyrusUMLNotationPackage.UML_DIAGRAM__ALIGNMENT;
+			case PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+				return PapyrusUMLNotationPackage.UML_DIAGRAM__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT;
+			default:
+				return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (showStereotype: ");
+		result.append(showStereotype);
+		result.append(", showListVisibility: ");
+		result.append(showListVisibility);
+		result.append(", showListSignature: ");
+		result.append(showListSignature);
+		result.append(", alignment: ");
+		result.append(alignment);
+		result.append(", showStereotypeAttributeCompartment: ");
+		result.append(showStereotypeAttributeCompartment);
+		result.append(')');
+		return result.toString();
+	}
+
+} // UMLDiagramImpl
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLFrameImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLFrameImpl.java
new file mode 100644
index 00000000000..e9e21b4cc21
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLFrameImpl.java
@@ -0,0 +1,50 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.umlnotation.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLFrame;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>UML Frame</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class UMLFrameImpl extends UMLShapeImpl implements UMLFrame {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected UMLFrameImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return PapyrusUMLNotationPackage.Literals.UML_FRAME;
+	}
+
+} // UMLFrameImpl
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLShapeCompartmentImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLShapeCompartmentImpl.java
new file mode 100644
index 00000000000..2788e3767fe
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLShapeCompartmentImpl.java
@@ -0,0 +1,546 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.umlnotation.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.gmf.runtime.notation.impl.CompartmentImpl;
+import org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLShapeCompartment;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLView;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>UML Shape Compartment</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLShapeCompartmentImpl#getShowStereotype <em>Show Stereotype</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLShapeCompartmentImpl#getShowListVisibility <em>Show List Visibility</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLShapeCompartmentImpl#isShowListSignature <em>Show List Signature</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLShapeCompartmentImpl#getAlignment <em>Alignment</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLShapeCompartmentImpl#getShowStereotypeAttributeCompartment <em>Show Stereotype Attribute Compartment</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLShapeCompartmentImpl#isVerticalAlignment <em>Vertical Alignment</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class UMLShapeCompartmentImpl extends CompartmentImpl implements UMLShapeCompartment {
+
+	/**
+	 * The default value of the '{@link #getShowStereotype() <em>Show Stereotype</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotype()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SHOW_STEREOTYPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getShowStereotype() <em>Show Stereotype</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotype()
+	 * @generated
+	 * @ordered
+	 */
+	protected String showStereotype = SHOW_STEREOTYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getShowListVisibility() <em>Show List Visibility</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowListVisibility()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SHOW_LIST_VISIBILITY_EDEFAULT = "None";
+
+	/**
+	 * The cached value of the '{@link #getShowListVisibility() <em>Show List Visibility</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowListVisibility()
+	 * @generated
+	 * @ordered
+	 */
+	protected String showListVisibility = SHOW_LIST_VISIBILITY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isShowListSignature() <em>Show List Signature</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isShowListSignature()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean SHOW_LIST_SIGNATURE_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isShowListSignature() <em>Show List Signature</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isShowListSignature()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean showListSignature = SHOW_LIST_SIGNATURE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ALIGNMENT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected String alignment = ALIGNMENT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getShowStereotypeAttributeCompartment() <em>Show Stereotype Attribute Compartment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotypeAttributeCompartment()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getShowStereotypeAttributeCompartment() <em>Show Stereotype Attribute Compartment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotypeAttributeCompartment()
+	 * @generated
+	 * @ordered
+	 */
+	protected String showStereotypeAttributeCompartment = SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isVerticalAlignment() <em>Vertical Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isVerticalAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean VERTICAL_ALIGNMENT_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isVerticalAlignment() <em>Vertical Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isVerticalAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean verticalAlignment = VERTICAL_ALIGNMENT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected UMLShapeCompartmentImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return PapyrusUMLNotationPackage.Literals.UML_SHAPE_COMPARTMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getShowStereotype() {
+		return showStereotype;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowStereotype(String newShowStereotype) {
+		String oldShowStereotype = showStereotype;
+		showStereotype = newShowStereotype;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_STEREOTYPE, oldShowStereotype, showStereotype));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getShowListVisibility() {
+		return showListVisibility;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowListVisibility(String newShowListVisibility) {
+		String oldShowListVisibility = showListVisibility;
+		showListVisibility = newShowListVisibility;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_LIST_VISIBILITY, oldShowListVisibility, showListVisibility));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean isShowListSignature() {
+		return showListSignature;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowListSignature(boolean newShowListSignature) {
+		boolean oldShowListSignature = showListSignature;
+		showListSignature = newShowListSignature;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_LIST_SIGNATURE, oldShowListSignature, showListSignature));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getAlignment() {
+		return alignment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setAlignment(String newAlignment) {
+		String oldAlignment = alignment;
+		alignment = newAlignment;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__ALIGNMENT, oldAlignment, alignment));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getShowStereotypeAttributeCompartment() {
+		return showStereotypeAttributeCompartment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowStereotypeAttributeCompartment(String newShowStereotypeAttributeCompartment) {
+		String oldShowStereotypeAttributeCompartment = showStereotypeAttributeCompartment;
+		showStereotypeAttributeCompartment = newShowStereotypeAttributeCompartment;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT, oldShowStereotypeAttributeCompartment, showStereotypeAttributeCompartment));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean isVerticalAlignment() {
+		return verticalAlignment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setVerticalAlignment(boolean newVerticalAlignment) {
+		boolean oldVerticalAlignment = verticalAlignment;
+		verticalAlignment = newVerticalAlignment;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__VERTICAL_ALIGNMENT, oldVerticalAlignment, verticalAlignment));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_STEREOTYPE:
+			return getShowStereotype();
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_LIST_VISIBILITY:
+			return getShowListVisibility();
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_LIST_SIGNATURE:
+			return isShowListSignature();
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__ALIGNMENT:
+			return getAlignment();
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			return getShowStereotypeAttributeCompartment();
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__VERTICAL_ALIGNMENT:
+			return isVerticalAlignment();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_STEREOTYPE:
+			setShowStereotype((String) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_LIST_VISIBILITY:
+			setShowListVisibility((String) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_LIST_SIGNATURE:
+			setShowListSignature((Boolean) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__ALIGNMENT:
+			setAlignment((String) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			setShowStereotypeAttributeCompartment((String) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__VERTICAL_ALIGNMENT:
+			setVerticalAlignment((Boolean) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_STEREOTYPE:
+			setShowStereotype(SHOW_STEREOTYPE_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_LIST_VISIBILITY:
+			setShowListVisibility(SHOW_LIST_VISIBILITY_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_LIST_SIGNATURE:
+			setShowListSignature(SHOW_LIST_SIGNATURE_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__ALIGNMENT:
+			setAlignment(ALIGNMENT_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			setShowStereotypeAttributeCompartment(SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__VERTICAL_ALIGNMENT:
+			setVerticalAlignment(VERTICAL_ALIGNMENT_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_STEREOTYPE:
+			return SHOW_STEREOTYPE_EDEFAULT == null ? showStereotype != null : !SHOW_STEREOTYPE_EDEFAULT.equals(showStereotype);
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_LIST_VISIBILITY:
+			return SHOW_LIST_VISIBILITY_EDEFAULT == null ? showListVisibility != null : !SHOW_LIST_VISIBILITY_EDEFAULT.equals(showListVisibility);
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_LIST_SIGNATURE:
+			return showListSignature != SHOW_LIST_SIGNATURE_EDEFAULT;
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__ALIGNMENT:
+			return ALIGNMENT_EDEFAULT == null ? alignment != null : !ALIGNMENT_EDEFAULT.equals(alignment);
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			return SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT == null ? showStereotypeAttributeCompartment != null : !SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT.equals(showStereotypeAttributeCompartment);
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__VERTICAL_ALIGNMENT:
+			return verticalAlignment != VERTICAL_ALIGNMENT_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
+		if (baseClass == UMLView.class) {
+			switch (derivedFeatureID) {
+			case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_STEREOTYPE:
+				return PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE;
+			case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_LIST_VISIBILITY:
+				return PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_VISIBILITY;
+			case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_LIST_SIGNATURE:
+				return PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_SIGNATURE;
+			case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__ALIGNMENT:
+				return PapyrusUMLNotationPackage.UML_VIEW__ALIGNMENT;
+			case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+				return PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT;
+			default:
+				return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
+		if (baseClass == UMLView.class) {
+			switch (baseFeatureID) {
+			case PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE:
+				return PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_STEREOTYPE;
+			case PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_VISIBILITY:
+				return PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_LIST_VISIBILITY;
+			case PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_SIGNATURE:
+				return PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_LIST_SIGNATURE;
+			case PapyrusUMLNotationPackage.UML_VIEW__ALIGNMENT:
+				return PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__ALIGNMENT;
+			case PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+				return PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT;
+			default:
+				return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (showStereotype: ");
+		result.append(showStereotype);
+		result.append(", showListVisibility: ");
+		result.append(showListVisibility);
+		result.append(", showListSignature: ");
+		result.append(showListSignature);
+		result.append(", alignment: ");
+		result.append(alignment);
+		result.append(", showStereotypeAttributeCompartment: ");
+		result.append(showStereotypeAttributeCompartment);
+		result.append(", verticalAlignment: ");
+		result.append(verticalAlignment);
+		result.append(')');
+		return result.toString();
+	}
+
+} // UMLShapeCompartmentImpl
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLShapeImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLShapeImpl.java
new file mode 100644
index 00000000000..8298f4e182c
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLShapeImpl.java
@@ -0,0 +1,485 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.umlnotation.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.gmf.runtime.notation.impl.ShapeImpl;
+import org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLShape;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLView;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>UML Shape</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLShapeImpl#getShowStereotype <em>Show Stereotype</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLShapeImpl#getShowListVisibility <em>Show List Visibility</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLShapeImpl#isShowListSignature <em>Show List Signature</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLShapeImpl#getAlignment <em>Alignment</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLShapeImpl#getShowStereotypeAttributeCompartment <em>Show Stereotype Attribute Compartment</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class UMLShapeImpl extends ShapeImpl implements UMLShape {
+
+	/**
+	 * The default value of the '{@link #getShowStereotype() <em>Show Stereotype</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotype()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SHOW_STEREOTYPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getShowStereotype() <em>Show Stereotype</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotype()
+	 * @generated
+	 * @ordered
+	 */
+	protected String showStereotype = SHOW_STEREOTYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getShowListVisibility() <em>Show List Visibility</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowListVisibility()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SHOW_LIST_VISIBILITY_EDEFAULT = "None";
+
+	/**
+	 * The cached value of the '{@link #getShowListVisibility() <em>Show List Visibility</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowListVisibility()
+	 * @generated
+	 * @ordered
+	 */
+	protected String showListVisibility = SHOW_LIST_VISIBILITY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isShowListSignature() <em>Show List Signature</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isShowListSignature()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean SHOW_LIST_SIGNATURE_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isShowListSignature() <em>Show List Signature</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isShowListSignature()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean showListSignature = SHOW_LIST_SIGNATURE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ALIGNMENT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected String alignment = ALIGNMENT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getShowStereotypeAttributeCompartment() <em>Show Stereotype Attribute Compartment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotypeAttributeCompartment()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getShowStereotypeAttributeCompartment() <em>Show Stereotype Attribute Compartment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotypeAttributeCompartment()
+	 * @generated
+	 * @ordered
+	 */
+	protected String showStereotypeAttributeCompartment = SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected UMLShapeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return PapyrusUMLNotationPackage.Literals.UML_SHAPE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getShowStereotype() {
+		return showStereotype;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowStereotype(String newShowStereotype) {
+		String oldShowStereotype = showStereotype;
+		showStereotype = newShowStereotype;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_SHAPE__SHOW_STEREOTYPE, oldShowStereotype, showStereotype));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getShowListVisibility() {
+		return showListVisibility;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowListVisibility(String newShowListVisibility) {
+		String oldShowListVisibility = showListVisibility;
+		showListVisibility = newShowListVisibility;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_SHAPE__SHOW_LIST_VISIBILITY, oldShowListVisibility, showListVisibility));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean isShowListSignature() {
+		return showListSignature;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowListSignature(boolean newShowListSignature) {
+		boolean oldShowListSignature = showListSignature;
+		showListSignature = newShowListSignature;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_SHAPE__SHOW_LIST_SIGNATURE, oldShowListSignature, showListSignature));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getAlignment() {
+		return alignment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setAlignment(String newAlignment) {
+		String oldAlignment = alignment;
+		alignment = newAlignment;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_SHAPE__ALIGNMENT, oldAlignment, alignment));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getShowStereotypeAttributeCompartment() {
+		return showStereotypeAttributeCompartment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowStereotypeAttributeCompartment(String newShowStereotypeAttributeCompartment) {
+		String oldShowStereotypeAttributeCompartment = showStereotypeAttributeCompartment;
+		showStereotypeAttributeCompartment = newShowStereotypeAttributeCompartment;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_SHAPE__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT, oldShowStereotypeAttributeCompartment, showStereotypeAttributeCompartment));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_STEREOTYPE:
+			return getShowStereotype();
+		case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_LIST_VISIBILITY:
+			return getShowListVisibility();
+		case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_LIST_SIGNATURE:
+			return isShowListSignature();
+		case PapyrusUMLNotationPackage.UML_SHAPE__ALIGNMENT:
+			return getAlignment();
+		case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			return getShowStereotypeAttributeCompartment();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_STEREOTYPE:
+			setShowStereotype((String) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_LIST_VISIBILITY:
+			setShowListVisibility((String) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_LIST_SIGNATURE:
+			setShowListSignature((Boolean) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_SHAPE__ALIGNMENT:
+			setAlignment((String) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			setShowStereotypeAttributeCompartment((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_STEREOTYPE:
+			setShowStereotype(SHOW_STEREOTYPE_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_LIST_VISIBILITY:
+			setShowListVisibility(SHOW_LIST_VISIBILITY_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_LIST_SIGNATURE:
+			setShowListSignature(SHOW_LIST_SIGNATURE_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_SHAPE__ALIGNMENT:
+			setAlignment(ALIGNMENT_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			setShowStereotypeAttributeCompartment(SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_STEREOTYPE:
+			return SHOW_STEREOTYPE_EDEFAULT == null ? showStereotype != null : !SHOW_STEREOTYPE_EDEFAULT.equals(showStereotype);
+		case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_LIST_VISIBILITY:
+			return SHOW_LIST_VISIBILITY_EDEFAULT == null ? showListVisibility != null : !SHOW_LIST_VISIBILITY_EDEFAULT.equals(showListVisibility);
+		case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_LIST_SIGNATURE:
+			return showListSignature != SHOW_LIST_SIGNATURE_EDEFAULT;
+		case PapyrusUMLNotationPackage.UML_SHAPE__ALIGNMENT:
+			return ALIGNMENT_EDEFAULT == null ? alignment != null : !ALIGNMENT_EDEFAULT.equals(alignment);
+		case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			return SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT == null ? showStereotypeAttributeCompartment != null : !SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT.equals(showStereotypeAttributeCompartment);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
+		if (baseClass == UMLView.class) {
+			switch (derivedFeatureID) {
+			case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_STEREOTYPE:
+				return PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE;
+			case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_LIST_VISIBILITY:
+				return PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_VISIBILITY;
+			case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_LIST_SIGNATURE:
+				return PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_SIGNATURE;
+			case PapyrusUMLNotationPackage.UML_SHAPE__ALIGNMENT:
+				return PapyrusUMLNotationPackage.UML_VIEW__ALIGNMENT;
+			case PapyrusUMLNotationPackage.UML_SHAPE__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+				return PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT;
+			default:
+				return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
+		if (baseClass == UMLView.class) {
+			switch (baseFeatureID) {
+			case PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE:
+				return PapyrusUMLNotationPackage.UML_SHAPE__SHOW_STEREOTYPE;
+			case PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_VISIBILITY:
+				return PapyrusUMLNotationPackage.UML_SHAPE__SHOW_LIST_VISIBILITY;
+			case PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_SIGNATURE:
+				return PapyrusUMLNotationPackage.UML_SHAPE__SHOW_LIST_SIGNATURE;
+			case PapyrusUMLNotationPackage.UML_VIEW__ALIGNMENT:
+				return PapyrusUMLNotationPackage.UML_SHAPE__ALIGNMENT;
+			case PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+				return PapyrusUMLNotationPackage.UML_SHAPE__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT;
+			default:
+				return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (showStereotype: ");
+		result.append(showStereotype);
+		result.append(", showListVisibility: ");
+		result.append(showListVisibility);
+		result.append(", showListSignature: ");
+		result.append(showListSignature);
+		result.append(", alignment: ");
+		result.append(alignment);
+		result.append(", showStereotypeAttributeCompartment: ");
+		result.append(showStereotypeAttributeCompartment);
+		result.append(')');
+		return result.toString();
+	}
+
+} // UMLShapeImpl
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLViewImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLViewImpl.java
new file mode 100644
index 00000000000..65a2e09d964
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/impl/UMLViewImpl.java
@@ -0,0 +1,430 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.umlnotation.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.gmf.runtime.notation.impl.ViewImpl;
+import org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLView;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>UML View</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLViewImpl#getShowStereotype <em>Show Stereotype</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLViewImpl#getShowListVisibility <em>Show List Visibility</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLViewImpl#isShowListSignature <em>Show List Signature</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLViewImpl#getAlignment <em>Alignment</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlnotation.impl.UMLViewImpl#getShowStereotypeAttributeCompartment <em>Show Stereotype Attribute Compartment</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class UMLViewImpl extends ViewImpl implements UMLView {
+
+	/**
+	 * The default value of the '{@link #getShowStereotype() <em>Show Stereotype</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotype()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SHOW_STEREOTYPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getShowStereotype() <em>Show Stereotype</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotype()
+	 * @generated
+	 * @ordered
+	 */
+	protected String showStereotype = SHOW_STEREOTYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getShowListVisibility() <em>Show List Visibility</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowListVisibility()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SHOW_LIST_VISIBILITY_EDEFAULT = "None";
+
+	/**
+	 * The cached value of the '{@link #getShowListVisibility() <em>Show List Visibility</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowListVisibility()
+	 * @generated
+	 * @ordered
+	 */
+	protected String showListVisibility = SHOW_LIST_VISIBILITY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isShowListSignature() <em>Show List Signature</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isShowListSignature()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean SHOW_LIST_SIGNATURE_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isShowListSignature() <em>Show List Signature</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isShowListSignature()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean showListSignature = SHOW_LIST_SIGNATURE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ALIGNMENT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected String alignment = ALIGNMENT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getShowStereotypeAttributeCompartment() <em>Show Stereotype Attribute Compartment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotypeAttributeCompartment()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getShowStereotypeAttributeCompartment() <em>Show Stereotype Attribute Compartment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getShowStereotypeAttributeCompartment()
+	 * @generated
+	 * @ordered
+	 */
+	protected String showStereotypeAttributeCompartment = SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected UMLViewImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return PapyrusUMLNotationPackage.Literals.UML_VIEW;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getShowStereotype() {
+		return showStereotype;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowStereotype(String newShowStereotype) {
+		String oldShowStereotype = showStereotype;
+		showStereotype = newShowStereotype;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE, oldShowStereotype, showStereotype));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getShowListVisibility() {
+		return showListVisibility;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowListVisibility(String newShowListVisibility) {
+		String oldShowListVisibility = showListVisibility;
+		showListVisibility = newShowListVisibility;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_VISIBILITY, oldShowListVisibility, showListVisibility));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean isShowListSignature() {
+		return showListSignature;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowListSignature(boolean newShowListSignature) {
+		boolean oldShowListSignature = showListSignature;
+		showListSignature = newShowListSignature;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_SIGNATURE, oldShowListSignature, showListSignature));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getAlignment() {
+		return alignment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setAlignment(String newAlignment) {
+		String oldAlignment = alignment;
+		alignment = newAlignment;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_VIEW__ALIGNMENT, oldAlignment, alignment));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getShowStereotypeAttributeCompartment() {
+		return showStereotypeAttributeCompartment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setShowStereotypeAttributeCompartment(String newShowStereotypeAttributeCompartment) {
+		String oldShowStereotypeAttributeCompartment = showStereotypeAttributeCompartment;
+		showStereotypeAttributeCompartment = newShowStereotypeAttributeCompartment;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT, oldShowStereotypeAttributeCompartment, showStereotypeAttributeCompartment));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE:
+			return getShowStereotype();
+		case PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_VISIBILITY:
+			return getShowListVisibility();
+		case PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_SIGNATURE:
+			return isShowListSignature();
+		case PapyrusUMLNotationPackage.UML_VIEW__ALIGNMENT:
+			return getAlignment();
+		case PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			return getShowStereotypeAttributeCompartment();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE:
+			setShowStereotype((String) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_VISIBILITY:
+			setShowListVisibility((String) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_SIGNATURE:
+			setShowListSignature((Boolean) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_VIEW__ALIGNMENT:
+			setAlignment((String) newValue);
+			return;
+		case PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			setShowStereotypeAttributeCompartment((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE:
+			setShowStereotype(SHOW_STEREOTYPE_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_VISIBILITY:
+			setShowListVisibility(SHOW_LIST_VISIBILITY_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_SIGNATURE:
+			setShowListSignature(SHOW_LIST_SIGNATURE_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_VIEW__ALIGNMENT:
+			setAlignment(ALIGNMENT_EDEFAULT);
+			return;
+		case PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			setShowStereotypeAttributeCompartment(SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE:
+			return SHOW_STEREOTYPE_EDEFAULT == null ? showStereotype != null : !SHOW_STEREOTYPE_EDEFAULT.equals(showStereotype);
+		case PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_VISIBILITY:
+			return SHOW_LIST_VISIBILITY_EDEFAULT == null ? showListVisibility != null : !SHOW_LIST_VISIBILITY_EDEFAULT.equals(showListVisibility);
+		case PapyrusUMLNotationPackage.UML_VIEW__SHOW_LIST_SIGNATURE:
+			return showListSignature != SHOW_LIST_SIGNATURE_EDEFAULT;
+		case PapyrusUMLNotationPackage.UML_VIEW__ALIGNMENT:
+			return ALIGNMENT_EDEFAULT == null ? alignment != null : !ALIGNMENT_EDEFAULT.equals(alignment);
+		case PapyrusUMLNotationPackage.UML_VIEW__SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT:
+			return SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT == null ? showStereotypeAttributeCompartment != null : !SHOW_STEREOTYPE_ATTRIBUTE_COMPARTMENT_EDEFAULT.equals(showStereotypeAttributeCompartment);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (showStereotype: ");
+		result.append(showStereotype);
+		result.append(", showListVisibility: ");
+		result.append(showListVisibility);
+		result.append(", showListSignature: ");
+		result.append(showListSignature);
+		result.append(", alignment: ");
+		result.append(alignment);
+		result.append(", showStereotypeAttributeCompartment: ");
+		result.append(showStereotypeAttributeCompartment);
+		result.append(')');
+		return result.toString();
+	}
+
+} // UMLViewImpl
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/util/PapyrusRSANotationAdapterFactory.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/util/PapyrusRSANotationAdapterFactory.java
new file mode 100644
index 00000000000..56aaa34c33b
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/util/PapyrusRSANotationAdapterFactory.java
@@ -0,0 +1,767 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.umlnotation.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.BasicCompartment;
+import org.eclipse.gmf.runtime.notation.BasicDecorationNode;
+import org.eclipse.gmf.runtime.notation.CanonicalStyle;
+import org.eclipse.gmf.runtime.notation.Compartment;
+import org.eclipse.gmf.runtime.notation.Connector;
+import org.eclipse.gmf.runtime.notation.ConnectorStyle;
+import org.eclipse.gmf.runtime.notation.DecorationNode;
+import org.eclipse.gmf.runtime.notation.DescriptionStyle;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.DrawerStyle;
+import org.eclipse.gmf.runtime.notation.Edge;
+import org.eclipse.gmf.runtime.notation.FillStyle;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.LineStyle;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.RoundedCornersStyle;
+import org.eclipse.gmf.runtime.notation.RoutingStyle;
+import org.eclipse.gmf.runtime.notation.Shape;
+import org.eclipse.gmf.runtime.notation.ShapeStyle;
+import org.eclipse.gmf.runtime.notation.Style;
+import org.eclipse.gmf.runtime.notation.TitleStyle;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLClassifierShape;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLComponent;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLConnector;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLDiagram;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLFrame;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLShape;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLShapeCompartment;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLView;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage
+ * @generated
+ */
+public class PapyrusRSANotationAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static PapyrusUMLNotationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public PapyrusRSANotationAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = PapyrusUMLNotationPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject) object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected PapyrusRSANotationSwitch<Adapter> modelSwitch =
+			new PapyrusRSANotationSwitch<Adapter>() {
+				@Override
+				public Adapter caseUMLDiagram(UMLDiagram object) {
+					return createUMLDiagramAdapter();
+				}
+
+				@Override
+				public Adapter caseUMLFrame(UMLFrame object) {
+					return createUMLFrameAdapter();
+				}
+
+				@Override
+				public Adapter caseUMLShapeCompartment(UMLShapeCompartment object) {
+					return createUMLShapeCompartmentAdapter();
+				}
+
+				@Override
+				public Adapter caseUMLShape(UMLShape object) {
+					return createUMLShapeAdapter();
+				}
+
+				@Override
+				public Adapter caseUMLConnector(UMLConnector object) {
+					return createUMLConnectorAdapter();
+				}
+
+				@Override
+				public Adapter caseUMLView(UMLView object) {
+					return createUMLViewAdapter();
+				}
+
+				@Override
+				public Adapter caseUMLComponent(UMLComponent object) {
+					return createUMLComponentAdapter();
+				}
+
+				@Override
+				public Adapter caseUMLClassifierShape(UMLClassifierShape object) {
+					return createUMLClassifierShapeAdapter();
+				}
+
+				@Override
+				public Adapter caseEModelElement(EModelElement object) {
+					return createEModelElementAdapter();
+				}
+
+				@Override
+				public Adapter caseView(View object) {
+					return createViewAdapter();
+				}
+
+				@Override
+				public Adapter caseDiagram(Diagram object) {
+					return createDiagramAdapter();
+				}
+
+				@Override
+				public Adapter caseNode(Node object) {
+					return createNodeAdapter();
+				}
+
+				@Override
+				public Adapter caseStyle(Style object) {
+					return createStyleAdapter();
+				}
+
+				@Override
+				public Adapter caseFontStyle(FontStyle object) {
+					return createFontStyleAdapter();
+				}
+
+				@Override
+				public Adapter caseDescriptionStyle(DescriptionStyle object) {
+					return createDescriptionStyleAdapter();
+				}
+
+				@Override
+				public Adapter caseFillStyle(FillStyle object) {
+					return createFillStyleAdapter();
+				}
+
+				@Override
+				public Adapter caseLineStyle(LineStyle object) {
+					return createLineStyleAdapter();
+				}
+
+				@Override
+				public Adapter caseRoundedCornersStyle(RoundedCornersStyle object) {
+					return createRoundedCornersStyleAdapter();
+				}
+
+				@Override
+				public Adapter caseShapeStyle(ShapeStyle object) {
+					return createShapeStyleAdapter();
+				}
+
+				@Override
+				public Adapter caseShape(Shape object) {
+					return createShapeAdapter();
+				}
+
+				@Override
+				public Adapter caseBasicDecorationNode(BasicDecorationNode object) {
+					return createBasicDecorationNodeAdapter();
+				}
+
+				@Override
+				public Adapter caseDecorationNode(DecorationNode object) {
+					return createDecorationNodeAdapter();
+				}
+
+				@Override
+				public Adapter caseDrawerStyle(DrawerStyle object) {
+					return createDrawerStyleAdapter();
+				}
+
+				@Override
+				public Adapter caseBasicCompartment(BasicCompartment object) {
+					return createBasicCompartmentAdapter();
+				}
+
+				@Override
+				public Adapter caseCanonicalStyle(CanonicalStyle object) {
+					return createCanonicalStyleAdapter();
+				}
+
+				@Override
+				public Adapter caseTitleStyle(TitleStyle object) {
+					return createTitleStyleAdapter();
+				}
+
+				@Override
+				public Adapter caseCompartment(Compartment object) {
+					return createCompartmentAdapter();
+				}
+
+				@Override
+				public Adapter caseEdge(Edge object) {
+					return createEdgeAdapter();
+				}
+
+				@Override
+				public Adapter caseRoutingStyle(RoutingStyle object) {
+					return createRoutingStyleAdapter();
+				}
+
+				@Override
+				public Adapter caseConnectorStyle(ConnectorStyle object) {
+					return createConnectorStyleAdapter();
+				}
+
+				@Override
+				public Adapter caseConnector(Connector object) {
+					return createConnectorAdapter();
+				}
+
+				@Override
+				public Adapter defaultCase(EObject object) {
+					return createEObjectAdapter();
+				}
+			};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param target
+	 *            the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject) target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLDiagram <em>UML Diagram</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLDiagram
+	 * @generated
+	 */
+	public Adapter createUMLDiagramAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLFrame <em>UML Frame</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLFrame
+	 * @generated
+	 */
+	public Adapter createUMLFrameAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLShapeCompartment <em>UML Shape Compartment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLShapeCompartment
+	 * @generated
+	 */
+	public Adapter createUMLShapeCompartmentAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLShape <em>UML Shape</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLShape
+	 * @generated
+	 */
+	public Adapter createUMLShapeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLConnector <em>UML Connector</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLConnector
+	 * @generated
+	 */
+	public Adapter createUMLConnectorAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLView <em>UML View</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLView
+	 * @generated
+	 */
+	public Adapter createUMLViewAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLComponent <em>UML Component</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLComponent
+	 * @generated
+	 */
+	public Adapter createUMLComponentAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLClassifierShape <em>UML Classifier Shape</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLClassifierShape
+	 * @generated
+	 */
+	public Adapter createUMLClassifierShapeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.View <em>View</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.View
+	 * @generated
+	 */
+	public Adapter createViewAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Diagram <em>Diagram</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.Diagram
+	 * @generated
+	 */
+	public Adapter createDiagramAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Node <em>Node</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.Node
+	 * @generated
+	 */
+	public Adapter createNodeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Style <em>Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.Style
+	 * @generated
+	 */
+	public Adapter createStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.FontStyle <em>Font Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.FontStyle
+	 * @generated
+	 */
+	public Adapter createFontStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.DescriptionStyle <em>Description Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.DescriptionStyle
+	 * @generated
+	 */
+	public Adapter createDescriptionStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.FillStyle <em>Fill Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.FillStyle
+	 * @generated
+	 */
+	public Adapter createFillStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.LineStyle <em>Line Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.LineStyle
+	 * @generated
+	 */
+	public Adapter createLineStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.RoundedCornersStyle <em>Rounded Corners Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.RoundedCornersStyle
+	 * @generated
+	 */
+	public Adapter createRoundedCornersStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.ShapeStyle <em>Shape Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.ShapeStyle
+	 * @generated
+	 */
+	public Adapter createShapeStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Shape <em>Shape</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.Shape
+	 * @generated
+	 */
+	public Adapter createShapeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.BasicDecorationNode <em>Basic Decoration Node</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.BasicDecorationNode
+	 * @generated
+	 */
+	public Adapter createBasicDecorationNodeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.DecorationNode <em>Decoration Node</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.DecorationNode
+	 * @generated
+	 */
+	public Adapter createDecorationNodeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.DrawerStyle <em>Drawer Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.DrawerStyle
+	 * @generated
+	 */
+	public Adapter createDrawerStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.BasicCompartment <em>Basic Compartment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.BasicCompartment
+	 * @generated
+	 */
+	public Adapter createBasicCompartmentAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.CanonicalStyle <em>Canonical Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.CanonicalStyle
+	 * @generated
+	 */
+	public Adapter createCanonicalStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.TitleStyle <em>Title Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.TitleStyle
+	 * @generated
+	 */
+	public Adapter createTitleStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Compartment <em>Compartment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.Compartment
+	 * @generated
+	 */
+	public Adapter createCompartmentAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Edge <em>Edge</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.Edge
+	 * @generated
+	 */
+	public Adapter createEdgeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.RoutingStyle <em>Routing Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.RoutingStyle
+	 * @generated
+	 */
+	public Adapter createRoutingStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.ConnectorStyle <em>Connector Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.ConnectorStyle
+	 * @generated
+	 */
+	public Adapter createConnectorStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Connector <em>Connector</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.runtime.notation.Connector
+	 * @generated
+	 */
+	public Adapter createConnectorAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} // PapyrusRSANotationAdapterFactory
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/util/PapyrusRSANotationSwitch.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/util/PapyrusRSANotationSwitch.java
new file mode 100644
index 00000000000..f276289fca4
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/util/PapyrusRSANotationSwitch.java
@@ -0,0 +1,965 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.umlnotation.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.gmf.runtime.notation.BasicCompartment;
+import org.eclipse.gmf.runtime.notation.BasicDecorationNode;
+import org.eclipse.gmf.runtime.notation.CanonicalStyle;
+import org.eclipse.gmf.runtime.notation.Compartment;
+import org.eclipse.gmf.runtime.notation.Connector;
+import org.eclipse.gmf.runtime.notation.ConnectorStyle;
+import org.eclipse.gmf.runtime.notation.DecorationNode;
+import org.eclipse.gmf.runtime.notation.DescriptionStyle;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.DrawerStyle;
+import org.eclipse.gmf.runtime.notation.Edge;
+import org.eclipse.gmf.runtime.notation.FillStyle;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.LineStyle;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.RoundedCornersStyle;
+import org.eclipse.gmf.runtime.notation.RoutingStyle;
+import org.eclipse.gmf.runtime.notation.Shape;
+import org.eclipse.gmf.runtime.notation.ShapeStyle;
+import org.eclipse.gmf.runtime.notation.Style;
+import org.eclipse.gmf.runtime.notation.TitleStyle;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLClassifierShape;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLComponent;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLConnector;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLDiagram;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLFrame;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLShape;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLShapeCompartment;
+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLView;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage
+ * @generated
+ */
+public class PapyrusRSANotationSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static PapyrusUMLNotationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public PapyrusRSANotationSwitch() {
+		if (modelPackage == null) {
+			modelPackage = PapyrusUMLNotationPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @parameter ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+		case PapyrusUMLNotationPackage.UML_DIAGRAM: {
+			UMLDiagram umlDiagram = (UMLDiagram) theEObject;
+			T result = caseUMLDiagram(umlDiagram);
+			if (result == null) {
+				result = caseDiagram(umlDiagram);
+			}
+			if (result == null) {
+				result = caseUMLView(umlDiagram);
+			}
+			if (result == null) {
+				result = caseView(umlDiagram);
+			}
+			if (result == null) {
+				result = caseEModelElement(umlDiagram);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case PapyrusUMLNotationPackage.UML_FRAME: {
+			UMLFrame umlFrame = (UMLFrame) theEObject;
+			T result = caseUMLFrame(umlFrame);
+			if (result == null) {
+				result = caseUMLShape(umlFrame);
+			}
+			if (result == null) {
+				result = caseShape(umlFrame);
+			}
+			if (result == null) {
+				result = caseUMLView(umlFrame);
+			}
+			if (result == null) {
+				result = caseNode(umlFrame);
+			}
+			if (result == null) {
+				result = caseShapeStyle(umlFrame);
+			}
+			if (result == null) {
+				result = caseView(umlFrame);
+			}
+			if (result == null) {
+				result = caseFontStyle(umlFrame);
+			}
+			if (result == null) {
+				result = caseDescriptionStyle(umlFrame);
+			}
+			if (result == null) {
+				result = caseFillStyle(umlFrame);
+			}
+			if (result == null) {
+				result = caseLineStyle(umlFrame);
+			}
+			if (result == null) {
+				result = caseRoundedCornersStyle(umlFrame);
+			}
+			if (result == null) {
+				result = caseEModelElement(umlFrame);
+			}
+			if (result == null) {
+				result = caseStyle(umlFrame);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT: {
+			UMLShapeCompartment umlShapeCompartment = (UMLShapeCompartment) theEObject;
+			T result = caseUMLShapeCompartment(umlShapeCompartment);
+			if (result == null) {
+				result = caseCompartment(umlShapeCompartment);
+			}
+			if (result == null) {
+				result = caseUMLView(umlShapeCompartment);
+			}
+			if (result == null) {
+				result = caseBasicCompartment(umlShapeCompartment);
+			}
+			if (result == null) {
+				result = caseCanonicalStyle(umlShapeCompartment);
+			}
+			if (result == null) {
+				result = caseTitleStyle(umlShapeCompartment);
+			}
+			if (result == null) {
+				result = caseDecorationNode(umlShapeCompartment);
+			}
+			if (result == null) {
+				result = caseDrawerStyle(umlShapeCompartment);
+			}
+			if (result == null) {
+				result = caseBasicDecorationNode(umlShapeCompartment);
+			}
+			if (result == null) {
+				result = caseStyle(umlShapeCompartment);
+			}
+			if (result == null) {
+				result = caseNode(umlShapeCompartment);
+			}
+			if (result == null) {
+				result = caseView(umlShapeCompartment);
+			}
+			if (result == null) {
+				result = caseEModelElement(umlShapeCompartment);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case PapyrusUMLNotationPackage.UML_SHAPE: {
+			UMLShape umlShape = (UMLShape) theEObject;
+			T result = caseUMLShape(umlShape);
+			if (result == null) {
+				result = caseShape(umlShape);
+			}
+			if (result == null) {
+				result = caseUMLView(umlShape);
+			}
+			if (result == null) {
+				result = caseNode(umlShape);
+			}
+			if (result == null) {
+				result = caseShapeStyle(umlShape);
+			}
+			if (result == null) {
+				result = caseView(umlShape);
+			}
+			if (result == null) {
+				result = caseFontStyle(umlShape);
+			}
+			if (result == null) {
+				result = caseDescriptionStyle(umlShape);
+			}
+			if (result == null) {
+				result = caseFillStyle(umlShape);
+			}
+			if (result == null) {
+				result = caseLineStyle(umlShape);
+			}
+			if (result == null) {
+				result = caseRoundedCornersStyle(umlShape);
+			}
+			if (result == null) {
+				result = caseEModelElement(umlShape);
+			}
+			if (result == null) {
+				result = caseStyle(umlShape);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case PapyrusUMLNotationPackage.UML_CONNECTOR: {
+			UMLConnector umlConnector = (UMLConnector) theEObject;
+			T result = caseUMLConnector(umlConnector);
+			if (result == null) {
+				result = caseConnector(umlConnector);
+			}
+			if (result == null) {
+				result = caseFontStyle(umlConnector);
+			}
+			if (result == null) {
+				result = caseUMLView(umlConnector);
+			}
+			if (result == null) {
+				result = caseEdge(umlConnector);
+			}
+			if (result == null) {
+				result = caseConnectorStyle(umlConnector);
+			}
+			if (result == null) {
+				result = caseView(umlConnector);
+			}
+			if (result == null) {
+				result = caseRoutingStyle(umlConnector);
+			}
+			if (result == null) {
+				result = caseLineStyle(umlConnector);
+			}
+			if (result == null) {
+				result = caseEModelElement(umlConnector);
+			}
+			if (result == null) {
+				result = caseRoundedCornersStyle(umlConnector);
+			}
+			if (result == null) {
+				result = caseStyle(umlConnector);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case PapyrusUMLNotationPackage.UML_VIEW: {
+			UMLView umlView = (UMLView) theEObject;
+			T result = caseUMLView(umlView);
+			if (result == null) {
+				result = caseView(umlView);
+			}
+			if (result == null) {
+				result = caseEModelElement(umlView);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case PapyrusUMLNotationPackage.UML_COMPONENT: {
+			UMLComponent umlComponent = (UMLComponent) theEObject;
+			T result = caseUMLComponent(umlComponent);
+			if (result == null) {
+				result = caseUMLShape(umlComponent);
+			}
+			if (result == null) {
+				result = caseShape(umlComponent);
+			}
+			if (result == null) {
+				result = caseUMLView(umlComponent);
+			}
+			if (result == null) {
+				result = caseNode(umlComponent);
+			}
+			if (result == null) {
+				result = caseShapeStyle(umlComponent);
+			}
+			if (result == null) {
+				result = caseView(umlComponent);
+			}
+			if (result == null) {
+				result = caseFontStyle(umlComponent);
+			}
+			if (result == null) {
+				result = caseDescriptionStyle(umlComponent);
+			}
+			if (result == null) {
+				result = caseFillStyle(umlComponent);
+			}
+			if (result == null) {
+				result = caseLineStyle(umlComponent);
+			}
+			if (result == null) {
+				result = caseRoundedCornersStyle(umlComponent);
+			}
+			if (result == null) {
+				result = caseEModelElement(umlComponent);
+			}
+			if (result == null) {
+				result = caseStyle(umlComponent);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case PapyrusUMLNotationPackage.UML_CLASSIFIER_SHAPE: {
+			UMLClassifierShape umlClassifierShape = (UMLClassifierShape) theEObject;
+			T result = caseUMLClassifierShape(umlClassifierShape);
+			if (result == null) {
+				result = caseUMLShape(umlClassifierShape);
+			}
+			if (result == null) {
+				result = caseShape(umlClassifierShape);
+			}
+			if (result == null) {
+				result = caseUMLView(umlClassifierShape);
+			}
+			if (result == null) {
+				result = caseNode(umlClassifierShape);
+			}
+			if (result == null) {
+				result = caseShapeStyle(umlClassifierShape);
+			}
+			if (result == null) {
+				result = caseView(umlClassifierShape);
+			}
+			if (result == null) {
+				result = caseFontStyle(umlClassifierShape);
+			}
+			if (result == null) {
+				result = caseDescriptionStyle(umlClassifierShape);
+			}
+			if (result == null) {
+				result = caseFillStyle(umlClassifierShape);
+			}
+			if (result == null) {
+				result = caseLineStyle(umlClassifierShape);
+			}
+			if (result == null) {
+				result = caseRoundedCornersStyle(umlClassifierShape);
+			}
+			if (result == null) {
+				result = caseEModelElement(umlClassifierShape);
+			}
+			if (result == null) {
+				result = caseStyle(umlClassifierShape);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>UML Diagram</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>UML Diagram</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseUMLDiagram(UMLDiagram object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>UML Frame</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>UML Frame</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseUMLFrame(UMLFrame object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>UML Shape Compartment</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>UML Shape Compartment</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseUMLShapeCompartment(UMLShapeCompartment object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>UML Shape</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>UML Shape</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseUMLShape(UMLShape object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>UML Connector</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>UML Connector</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseUMLConnector(UMLConnector object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>UML View</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>UML View</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseUMLView(UMLView object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>UML Component</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>UML Component</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseUMLComponent(UMLComponent object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>UML Classifier Shape</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>UML Classifier Shape</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseUMLClassifierShape(UMLClassifierShape object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>View</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>View</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseView(View object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Diagram</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Diagram</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDiagram(Diagram object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Node</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Node</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseNode(Node object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyle(Style object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Font Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Font Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFontStyle(FontStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Description Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Description Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDescriptionStyle(DescriptionStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Fill Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Fill Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFillStyle(FillStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Line Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Line Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseLineStyle(LineStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Rounded Corners Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Rounded Corners Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseRoundedCornersStyle(RoundedCornersStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Shape Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Shape Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseShapeStyle(ShapeStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Shape</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Shape</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseShape(Shape object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Basic Decoration Node</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Basic Decoration Node</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseBasicDecorationNode(BasicDecorationNode object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Decoration Node</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Decoration Node</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDecorationNode(DecorationNode object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Drawer Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Drawer Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDrawerStyle(DrawerStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Basic Compartment</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Basic Compartment</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseBasicCompartment(BasicCompartment object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Canonical Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Canonical Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCanonicalStyle(CanonicalStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Title Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Title Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTitleStyle(TitleStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Compartment</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Compartment</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCompartment(Compartment object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Edge</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Edge</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEdge(Edge object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Routing Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Routing Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseRoutingStyle(RoutingStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Connector Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Connector Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseConnectorStyle(ConnectorStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Connector</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Connector</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseConnector(Connector object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} // PapyrusRSANotationSwitch
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/util/PapyrusUMLNotationAdapterFactory.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/util/PapyrusUMLNotationAdapterFactory.java
new file mode 100644
index 00000000000..16eef8ddeea
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/util/PapyrusUMLNotationAdapterFactory.java
@@ -0,0 +1,767 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlnotation.util;

+

+import org.eclipse.emf.common.notify.Adapter;

+import org.eclipse.emf.common.notify.Notifier;

+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

+import org.eclipse.emf.ecore.EModelElement;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

+import org.eclipse.gmf.runtime.notation.BasicDecorationNode;

+import org.eclipse.gmf.runtime.notation.CanonicalStyle;

+import org.eclipse.gmf.runtime.notation.Compartment;

+import org.eclipse.gmf.runtime.notation.Connector;

+import org.eclipse.gmf.runtime.notation.ConnectorStyle;

+import org.eclipse.gmf.runtime.notation.DecorationNode;

+import org.eclipse.gmf.runtime.notation.DescriptionStyle;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.DrawerStyle;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.FillStyle;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.LineStyle;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.RoundedCornersStyle;

+import org.eclipse.gmf.runtime.notation.RoutingStyle;

+import org.eclipse.gmf.runtime.notation.Shape;

+import org.eclipse.gmf.runtime.notation.ShapeStyle;

+import org.eclipse.gmf.runtime.notation.Style;

+import org.eclipse.gmf.runtime.notation.TitleStyle;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage;

+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLClassifierShape;

+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLComponent;

+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLConnector;

+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLDiagram;

+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLFrame;

+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLShape;

+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLShapeCompartment;

+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLView;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Adapter Factory</b> for the model.

+ * It provides an adapter <code>createXXX</code> method for each class of the model.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage

+ * @generated

+ */

+public class PapyrusUMLNotationAdapterFactory extends AdapterFactoryImpl {

+	/**

+	 * The cached model package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected static PapyrusUMLNotationPackage modelPackage;

+

+	/**

+	 * Creates an instance of the adapter factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public PapyrusUMLNotationAdapterFactory() {

+		if (modelPackage == null) {

+			modelPackage = PapyrusUMLNotationPackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Returns whether this factory is applicable for the type of the object.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return whether this factory is applicable for the type of the object.

+	 * @generated

+	 */

+	@Override

+	public boolean isFactoryForType(Object object) {

+		if (object == modelPackage) {

+			return true;

+		}

+		if (object instanceof EObject) {

+			return ((EObject) object).eClass().getEPackage() == modelPackage;

+		}

+		return false;

+	}

+

+	/**

+	 * The switch that delegates to the <code>createXXX</code> methods.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected PapyrusUMLNotationSwitch<Adapter> modelSwitch =

+			new PapyrusUMLNotationSwitch<Adapter>() {

+				@Override

+				public Adapter caseUMLDiagram(UMLDiagram object) {

+					return createUMLDiagramAdapter();

+				}

+

+				@Override

+				public Adapter caseUMLFrame(UMLFrame object) {

+					return createUMLFrameAdapter();

+				}

+

+				@Override

+				public Adapter caseUMLShapeCompartment(UMLShapeCompartment object) {

+					return createUMLShapeCompartmentAdapter();

+				}

+

+				@Override

+				public Adapter caseUMLShape(UMLShape object) {

+					return createUMLShapeAdapter();

+				}

+

+				@Override

+				public Adapter caseUMLConnector(UMLConnector object) {

+					return createUMLConnectorAdapter();

+				}

+

+				@Override

+				public Adapter caseUMLView(UMLView object) {

+					return createUMLViewAdapter();

+				}

+

+				@Override

+				public Adapter caseUMLComponent(UMLComponent object) {

+					return createUMLComponentAdapter();

+				}

+

+				@Override

+				public Adapter caseUMLClassifierShape(UMLClassifierShape object) {

+					return createUMLClassifierShapeAdapter();

+				}

+

+				@Override

+				public Adapter caseEModelElement(EModelElement object) {

+					return createEModelElementAdapter();

+				}

+

+				@Override

+				public Adapter caseView(View object) {

+					return createViewAdapter();

+				}

+

+				@Override

+				public Adapter caseDiagram(Diagram object) {

+					return createDiagramAdapter();

+				}

+

+				@Override

+				public Adapter caseNode(Node object) {

+					return createNodeAdapter();

+				}

+

+				@Override

+				public Adapter caseStyle(Style object) {

+					return createStyleAdapter();

+				}

+

+				@Override

+				public Adapter caseFontStyle(FontStyle object) {

+					return createFontStyleAdapter();

+				}

+

+				@Override

+				public Adapter caseDescriptionStyle(DescriptionStyle object) {

+					return createDescriptionStyleAdapter();

+				}

+

+				@Override

+				public Adapter caseFillStyle(FillStyle object) {

+					return createFillStyleAdapter();

+				}

+

+				@Override

+				public Adapter caseLineStyle(LineStyle object) {

+					return createLineStyleAdapter();

+				}

+

+				@Override

+				public Adapter caseRoundedCornersStyle(RoundedCornersStyle object) {

+					return createRoundedCornersStyleAdapter();

+				}

+

+				@Override

+				public Adapter caseShapeStyle(ShapeStyle object) {

+					return createShapeStyleAdapter();

+				}

+

+				@Override

+				public Adapter caseShape(Shape object) {

+					return createShapeAdapter();

+				}

+

+				@Override

+				public Adapter caseBasicDecorationNode(BasicDecorationNode object) {

+					return createBasicDecorationNodeAdapter();

+				}

+

+				@Override

+				public Adapter caseDecorationNode(DecorationNode object) {

+					return createDecorationNodeAdapter();

+				}

+

+				@Override

+				public Adapter caseDrawerStyle(DrawerStyle object) {

+					return createDrawerStyleAdapter();

+				}

+

+				@Override

+				public Adapter caseBasicCompartment(BasicCompartment object) {

+					return createBasicCompartmentAdapter();

+				}

+

+				@Override

+				public Adapter caseCanonicalStyle(CanonicalStyle object) {

+					return createCanonicalStyleAdapter();

+				}

+

+				@Override

+				public Adapter caseTitleStyle(TitleStyle object) {

+					return createTitleStyleAdapter();

+				}

+

+				@Override

+				public Adapter caseCompartment(Compartment object) {

+					return createCompartmentAdapter();

+				}

+

+				@Override

+				public Adapter caseEdge(Edge object) {

+					return createEdgeAdapter();

+				}

+

+				@Override

+				public Adapter caseRoutingStyle(RoutingStyle object) {

+					return createRoutingStyleAdapter();

+				}

+

+				@Override

+				public Adapter caseConnectorStyle(ConnectorStyle object) {

+					return createConnectorStyleAdapter();

+				}

+

+				@Override

+				public Adapter caseConnector(Connector object) {

+					return createConnectorAdapter();

+				}

+

+				@Override

+				public Adapter defaultCase(EObject object) {

+					return createEObjectAdapter();

+				}

+			};

+

+	/**

+	 * Creates an adapter for the <code>target</code>.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param target

+	 *            the object to adapt.

+	 * @return the adapter for the <code>target</code>.

+	 * @generated

+	 */

+	@Override

+	public Adapter createAdapter(Notifier target) {

+		return modelSwitch.doSwitch((EObject) target);

+	}

+

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLDiagram <em>UML Diagram</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLDiagram

+	 * @generated

+	 */

+	public Adapter createUMLDiagramAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLFrame <em>UML Frame</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLFrame

+	 * @generated

+	 */

+	public Adapter createUMLFrameAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLShapeCompartment <em>UML Shape Compartment</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLShapeCompartment

+	 * @generated

+	 */

+	public Adapter createUMLShapeCompartmentAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLShape <em>UML Shape</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLShape

+	 * @generated

+	 */

+	public Adapter createUMLShapeAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLConnector <em>UML Connector</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLConnector

+	 * @generated

+	 */

+	public Adapter createUMLConnectorAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLView <em>UML View</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLView

+	 * @generated

+	 */

+	public Adapter createUMLViewAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLComponent <em>UML Component</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLComponent

+	 * @generated

+	 */

+	public Adapter createUMLComponentAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlnotation.UMLClassifierShape <em>UML Classifier Shape</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlnotation.UMLClassifierShape

+	 * @generated

+	 */

+	public Adapter createUMLClassifierShapeAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.emf.ecore.EModelElement

+	 * @generated

+	 */

+	public Adapter createEModelElementAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.View <em>View</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.View

+	 * @generated

+	 */

+	public Adapter createViewAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Diagram <em>Diagram</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.Diagram

+	 * @generated

+	 */

+	public Adapter createDiagramAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Node <em>Node</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.Node

+	 * @generated

+	 */

+	public Adapter createNodeAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Style <em>Style</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.Style

+	 * @generated

+	 */

+	public Adapter createStyleAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.FontStyle <em>Font Style</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.FontStyle

+	 * @generated

+	 */

+	public Adapter createFontStyleAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.DescriptionStyle <em>Description Style</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.DescriptionStyle

+	 * @generated

+	 */

+	public Adapter createDescriptionStyleAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.FillStyle <em>Fill Style</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.FillStyle

+	 * @generated

+	 */

+	public Adapter createFillStyleAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.LineStyle <em>Line Style</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.LineStyle

+	 * @generated

+	 */

+	public Adapter createLineStyleAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.RoundedCornersStyle <em>Rounded Corners Style</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.RoundedCornersStyle

+	 * @generated

+	 */

+	public Adapter createRoundedCornersStyleAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.ShapeStyle <em>Shape Style</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.ShapeStyle

+	 * @generated

+	 */

+	public Adapter createShapeStyleAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Shape <em>Shape</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.Shape

+	 * @generated

+	 */

+	public Adapter createShapeAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.BasicDecorationNode <em>Basic Decoration Node</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.BasicDecorationNode

+	 * @generated

+	 */

+	public Adapter createBasicDecorationNodeAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.DecorationNode <em>Decoration Node</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.DecorationNode

+	 * @generated

+	 */

+	public Adapter createDecorationNodeAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.DrawerStyle <em>Drawer Style</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.DrawerStyle

+	 * @generated

+	 */

+	public Adapter createDrawerStyleAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.BasicCompartment <em>Basic Compartment</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.BasicCompartment

+	 * @generated

+	 */

+	public Adapter createBasicCompartmentAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.CanonicalStyle <em>Canonical Style</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.CanonicalStyle

+	 * @generated

+	 */

+	public Adapter createCanonicalStyleAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.TitleStyle <em>Title Style</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.TitleStyle

+	 * @generated

+	 */

+	public Adapter createTitleStyleAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Compartment <em>Compartment</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.Compartment

+	 * @generated

+	 */

+	public Adapter createCompartmentAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Edge <em>Edge</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.Edge

+	 * @generated

+	 */

+	public Adapter createEdgeAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.RoutingStyle <em>Routing Style</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.RoutingStyle

+	 * @generated

+	 */

+	public Adapter createRoutingStyleAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.ConnectorStyle <em>Connector Style</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.ConnectorStyle

+	 * @generated

+	 */

+	public Adapter createConnectorStyleAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Connector <em>Connector</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.gmf.runtime.notation.Connector

+	 * @generated

+	 */

+	public Adapter createConnectorAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for the default case.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @generated

+	 */

+	public Adapter createEObjectAdapter() {

+		return null;

+	}

+

+} // PapyrusUMLNotationAdapterFactory

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/util/PapyrusUMLNotationSwitch.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/util/PapyrusUMLNotationSwitch.java
new file mode 100644
index 00000000000..f2f12f13c2e
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlnotation/util/PapyrusUMLNotationSwitch.java
@@ -0,0 +1,965 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlnotation.util;

+

+import org.eclipse.emf.ecore.EModelElement;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.util.Switch;

+import org.eclipse.gmf.runtime.notation.BasicCompartment;

+import org.eclipse.gmf.runtime.notation.BasicDecorationNode;

+import org.eclipse.gmf.runtime.notation.CanonicalStyle;

+import org.eclipse.gmf.runtime.notation.Compartment;

+import org.eclipse.gmf.runtime.notation.Connector;

+import org.eclipse.gmf.runtime.notation.ConnectorStyle;

+import org.eclipse.gmf.runtime.notation.DecorationNode;

+import org.eclipse.gmf.runtime.notation.DescriptionStyle;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.DrawerStyle;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.FillStyle;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.LineStyle;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.RoundedCornersStyle;

+import org.eclipse.gmf.runtime.notation.RoutingStyle;

+import org.eclipse.gmf.runtime.notation.Shape;

+import org.eclipse.gmf.runtime.notation.ShapeStyle;

+import org.eclipse.gmf.runtime.notation.Style;

+import org.eclipse.gmf.runtime.notation.TitleStyle;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage;

+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLClassifierShape;

+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLComponent;

+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLConnector;

+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLDiagram;

+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLFrame;

+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLShape;

+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLShapeCompartment;

+import org.eclipse.papyrus.migration.rsa.umlnotation.UMLView;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Switch</b> for the model's inheritance hierarchy.

+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

+ * starting with the actual class of the object

+ * and proceeding up the inheritance hierarchy

+ * until a non-null result is returned,

+ * which is the result of the switch.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlnotation.PapyrusUMLNotationPackage

+ * @generated

+ */

+public class PapyrusUMLNotationSwitch<T> extends Switch<T> {

+	/**

+	 * The cached model package

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected static PapyrusUMLNotationPackage modelPackage;

+

+	/**

+	 * Creates an instance of the switch.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public PapyrusUMLNotationSwitch() {

+		if (modelPackage == null) {

+			modelPackage = PapyrusUMLNotationPackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Checks whether this is a switch for the given package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @parameter ePackage the package in question.

+	 * @return whether this is a switch for the given package.

+	 * @generated

+	 */

+	@Override

+	protected boolean isSwitchFor(EPackage ePackage) {

+		return ePackage == modelPackage;

+	}

+

+	/**

+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the first non-null result returned by a <code>caseXXX</code> call.

+	 * @generated

+	 */

+	@Override

+	protected T doSwitch(int classifierID, EObject theEObject) {

+		switch (classifierID) {

+		case PapyrusUMLNotationPackage.UML_DIAGRAM: {

+			UMLDiagram umlDiagram = (UMLDiagram) theEObject;

+			T result = caseUMLDiagram(umlDiagram);

+			if (result == null) {

+				result = caseDiagram(umlDiagram);

+			}

+			if (result == null) {

+				result = caseUMLView(umlDiagram);

+			}

+			if (result == null) {

+				result = caseView(umlDiagram);

+			}

+			if (result == null) {

+				result = caseEModelElement(umlDiagram);

+			}

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case PapyrusUMLNotationPackage.UML_FRAME: {

+			UMLFrame umlFrame = (UMLFrame) theEObject;

+			T result = caseUMLFrame(umlFrame);

+			if (result == null) {

+				result = caseUMLShape(umlFrame);

+			}

+			if (result == null) {

+				result = caseShape(umlFrame);

+			}

+			if (result == null) {

+				result = caseUMLView(umlFrame);

+			}

+			if (result == null) {

+				result = caseNode(umlFrame);

+			}

+			if (result == null) {

+				result = caseShapeStyle(umlFrame);

+			}

+			if (result == null) {

+				result = caseView(umlFrame);

+			}

+			if (result == null) {

+				result = caseFontStyle(umlFrame);

+			}

+			if (result == null) {

+				result = caseDescriptionStyle(umlFrame);

+			}

+			if (result == null) {

+				result = caseFillStyle(umlFrame);

+			}

+			if (result == null) {

+				result = caseLineStyle(umlFrame);

+			}

+			if (result == null) {

+				result = caseRoundedCornersStyle(umlFrame);

+			}

+			if (result == null) {

+				result = caseEModelElement(umlFrame);

+			}

+			if (result == null) {

+				result = caseStyle(umlFrame);

+			}

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case PapyrusUMLNotationPackage.UML_SHAPE_COMPARTMENT: {

+			UMLShapeCompartment umlShapeCompartment = (UMLShapeCompartment) theEObject;

+			T result = caseUMLShapeCompartment(umlShapeCompartment);

+			if (result == null) {

+				result = caseCompartment(umlShapeCompartment);

+			}

+			if (result == null) {

+				result = caseUMLView(umlShapeCompartment);

+			}

+			if (result == null) {

+				result = caseBasicCompartment(umlShapeCompartment);

+			}

+			if (result == null) {

+				result = caseCanonicalStyle(umlShapeCompartment);

+			}

+			if (result == null) {

+				result = caseTitleStyle(umlShapeCompartment);

+			}

+			if (result == null) {

+				result = caseDecorationNode(umlShapeCompartment);

+			}

+			if (result == null) {

+				result = caseDrawerStyle(umlShapeCompartment);

+			}

+			if (result == null) {

+				result = caseBasicDecorationNode(umlShapeCompartment);

+			}

+			if (result == null) {

+				result = caseStyle(umlShapeCompartment);

+			}

+			if (result == null) {

+				result = caseNode(umlShapeCompartment);

+			}

+			if (result == null) {

+				result = caseView(umlShapeCompartment);

+			}

+			if (result == null) {

+				result = caseEModelElement(umlShapeCompartment);

+			}

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case PapyrusUMLNotationPackage.UML_SHAPE: {

+			UMLShape umlShape = (UMLShape) theEObject;

+			T result = caseUMLShape(umlShape);

+			if (result == null) {

+				result = caseShape(umlShape);

+			}

+			if (result == null) {

+				result = caseUMLView(umlShape);

+			}

+			if (result == null) {

+				result = caseNode(umlShape);

+			}

+			if (result == null) {

+				result = caseShapeStyle(umlShape);

+			}

+			if (result == null) {

+				result = caseView(umlShape);

+			}

+			if (result == null) {

+				result = caseFontStyle(umlShape);

+			}

+			if (result == null) {

+				result = caseDescriptionStyle(umlShape);

+			}

+			if (result == null) {

+				result = caseFillStyle(umlShape);

+			}

+			if (result == null) {

+				result = caseLineStyle(umlShape);

+			}

+			if (result == null) {

+				result = caseRoundedCornersStyle(umlShape);

+			}

+			if (result == null) {

+				result = caseEModelElement(umlShape);

+			}

+			if (result == null) {

+				result = caseStyle(umlShape);

+			}

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case PapyrusUMLNotationPackage.UML_CONNECTOR: {

+			UMLConnector umlConnector = (UMLConnector) theEObject;

+			T result = caseUMLConnector(umlConnector);

+			if (result == null) {

+				result = caseConnector(umlConnector);

+			}

+			if (result == null) {

+				result = caseFontStyle(umlConnector);

+			}

+			if (result == null) {

+				result = caseUMLView(umlConnector);

+			}

+			if (result == null) {

+				result = caseEdge(umlConnector);

+			}

+			if (result == null) {

+				result = caseConnectorStyle(umlConnector);

+			}

+			if (result == null) {

+				result = caseView(umlConnector);

+			}

+			if (result == null) {

+				result = caseRoutingStyle(umlConnector);

+			}

+			if (result == null) {

+				result = caseLineStyle(umlConnector);

+			}

+			if (result == null) {

+				result = caseEModelElement(umlConnector);

+			}

+			if (result == null) {

+				result = caseRoundedCornersStyle(umlConnector);

+			}

+			if (result == null) {

+				result = caseStyle(umlConnector);

+			}

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case PapyrusUMLNotationPackage.UML_VIEW: {

+			UMLView umlView = (UMLView) theEObject;

+			T result = caseUMLView(umlView);

+			if (result == null) {

+				result = caseView(umlView);

+			}

+			if (result == null) {

+				result = caseEModelElement(umlView);

+			}

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case PapyrusUMLNotationPackage.UML_COMPONENT: {

+			UMLComponent umlComponent = (UMLComponent) theEObject;

+			T result = caseUMLComponent(umlComponent);

+			if (result == null) {

+				result = caseUMLShape(umlComponent);

+			}

+			if (result == null) {

+				result = caseShape(umlComponent);

+			}

+			if (result == null) {

+				result = caseUMLView(umlComponent);

+			}

+			if (result == null) {

+				result = caseNode(umlComponent);

+			}

+			if (result == null) {

+				result = caseShapeStyle(umlComponent);

+			}

+			if (result == null) {

+				result = caseView(umlComponent);

+			}

+			if (result == null) {

+				result = caseFontStyle(umlComponent);

+			}

+			if (result == null) {

+				result = caseDescriptionStyle(umlComponent);

+			}

+			if (result == null) {

+				result = caseFillStyle(umlComponent);

+			}

+			if (result == null) {

+				result = caseLineStyle(umlComponent);

+			}

+			if (result == null) {

+				result = caseRoundedCornersStyle(umlComponent);

+			}

+			if (result == null) {

+				result = caseEModelElement(umlComponent);

+			}

+			if (result == null) {

+				result = caseStyle(umlComponent);

+			}

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case PapyrusUMLNotationPackage.UML_CLASSIFIER_SHAPE: {

+			UMLClassifierShape umlClassifierShape = (UMLClassifierShape) theEObject;

+			T result = caseUMLClassifierShape(umlClassifierShape);

+			if (result == null) {

+				result = caseUMLShape(umlClassifierShape);

+			}

+			if (result == null) {

+				result = caseShape(umlClassifierShape);

+			}

+			if (result == null) {

+				result = caseUMLView(umlClassifierShape);

+			}

+			if (result == null) {

+				result = caseNode(umlClassifierShape);

+			}

+			if (result == null) {

+				result = caseShapeStyle(umlClassifierShape);

+			}

+			if (result == null) {

+				result = caseView(umlClassifierShape);

+			}

+			if (result == null) {

+				result = caseFontStyle(umlClassifierShape);

+			}

+			if (result == null) {

+				result = caseDescriptionStyle(umlClassifierShape);

+			}

+			if (result == null) {

+				result = caseFillStyle(umlClassifierShape);

+			}

+			if (result == null) {

+				result = caseLineStyle(umlClassifierShape);

+			}

+			if (result == null) {

+				result = caseRoundedCornersStyle(umlClassifierShape);

+			}

+			if (result == null) {

+				result = caseEModelElement(umlClassifierShape);

+			}

+			if (result == null) {

+				result = caseStyle(umlClassifierShape);

+			}

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		default:

+			return defaultCase(theEObject);

+		}

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>UML Diagram</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>UML Diagram</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseUMLDiagram(UMLDiagram object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>UML Frame</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>UML Frame</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseUMLFrame(UMLFrame object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>UML Shape Compartment</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>UML Shape Compartment</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseUMLShapeCompartment(UMLShapeCompartment object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>UML Shape</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>UML Shape</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseUMLShape(UMLShape object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>UML Connector</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>UML Connector</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseUMLConnector(UMLConnector object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>UML View</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>UML View</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseUMLView(UMLView object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>UML Component</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>UML Component</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseUMLComponent(UMLComponent object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>UML Classifier Shape</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>UML Classifier Shape</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseUMLClassifierShape(UMLClassifierShape object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseEModelElement(EModelElement object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>View</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>View</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseView(View object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Diagram</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Diagram</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseDiagram(Diagram object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Node</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Node</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseNode(Node object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Style</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Style</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseStyle(Style object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Font Style</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Font Style</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseFontStyle(FontStyle object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Description Style</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Description Style</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseDescriptionStyle(DescriptionStyle object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Fill Style</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Fill Style</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseFillStyle(FillStyle object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Line Style</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Line Style</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseLineStyle(LineStyle object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Rounded Corners Style</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Rounded Corners Style</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseRoundedCornersStyle(RoundedCornersStyle object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Shape Style</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Shape Style</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseShapeStyle(ShapeStyle object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Shape</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Shape</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseShape(Shape object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Basic Decoration Node</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Basic Decoration Node</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseBasicDecorationNode(BasicDecorationNode object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Decoration Node</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Decoration Node</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseDecorationNode(DecorationNode object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Drawer Style</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Drawer Style</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseDrawerStyle(DrawerStyle object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Basic Compartment</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Basic Compartment</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseBasicCompartment(BasicCompartment object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Canonical Style</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Canonical Style</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseCanonicalStyle(CanonicalStyle object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Title Style</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Title Style</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseTitleStyle(TitleStyle object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Compartment</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Compartment</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseCompartment(Compartment object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Edge</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Edge</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseEdge(Edge object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Routing Style</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Routing Style</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseRoutingStyle(RoutingStyle object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Connector Style</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Connector Style</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseConnectorStyle(ConnectorStyle object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Connector</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Connector</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseConnector(Connector object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch, but this is the last case anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

+	 * @generated

+	 */

+	@Override

+	public T defaultCase(EObject object) {

+		return null;

+	}

+

+} // PapyrusUMLNotationSwitch

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/AbstractEvent.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/AbstractEvent.java
new file mode 100644
index 00000000000..88bbba54aae
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/AbstractEvent.java
@@ -0,0 +1,62 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.uml2.uml.CallEvent;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Abstract Event</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.AbstractEvent#getBase_CallEvent <em>Base Call Event</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getAbstractEvent()

+ * @model abstract="true"

+ * @generated

+ */

+public interface AbstractEvent extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Base Call Event</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Call Event</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Base Call Event</em>' reference.

+	 * @see #setBase_CallEvent(CallEvent)

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getAbstractEvent_Base_CallEvent()

+	 * @model required="true"

+	 * @generated

+	 */

+	CallEvent getBase_CallEvent();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlrt.AbstractEvent#getBase_CallEvent <em>Base Call Event</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Base Call Event</em>' reference.

+	 * @see #getBase_CallEvent()

+	 * @generated

+	 */

+	void setBase_CallEvent(CallEvent value);

+

+} // AbstractEvent

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Capsule.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Capsule.java
new file mode 100644
index 00000000000..1d16593f36e
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Capsule.java
@@ -0,0 +1,61 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt;

+

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Capsule</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.Capsule#getBase_Class <em>Base Class</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getCapsule()

+ * @model

+ * @generated

+ */

+public interface Capsule extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Base Class</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Base Class</em>' reference.

+	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getCapsule_Base_Class()

+	 * @model required="true"

+	 * @generated

+	 */

+	org.eclipse.uml2.uml.Class getBase_Class();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlrt.Capsule#getBase_Class <em>Base Class</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Base Class</em>' reference.

+	 * @see #getBase_Class()

+	 * @generated

+	 */

+	void setBase_Class(org.eclipse.uml2.uml.Class value);

+

+} // Capsule

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/CapsulePart.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/CapsulePart.java
new file mode 100644
index 00000000000..63d816eb44e
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/CapsulePart.java
@@ -0,0 +1,62 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.uml2.uml.Property;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Capsule Part</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.CapsulePart#getBase_Property <em>Base Property</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getCapsulePart()

+ * @model

+ * @generated

+ */

+public interface CapsulePart extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Base Property</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Property</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Base Property</em>' reference.

+	 * @see #setBase_Property(Property)

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getCapsulePart_Base_Property()

+	 * @model required="true"

+	 * @generated

+	 */

+	Property getBase_Property();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlrt.CapsulePart#getBase_Property <em>Base Property</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Base Property</em>' reference.

+	 * @see #getBase_Property()

+	 * @generated

+	 */

+	void setBase_Property(Property value);

+

+} // CapsulePart

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Coregion.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Coregion.java
new file mode 100644
index 00000000000..2421f349187
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Coregion.java
@@ -0,0 +1,27 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt;

+

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Coregion</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getCoregion()

+ * @model

+ * @generated

+ */

+public interface Coregion extends EObject {

+} // Coregion

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/HistoryKind.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/HistoryKind.java
new file mode 100644
index 00000000000..913d64acc47
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/HistoryKind.java
@@ -0,0 +1,238 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt;

+

+import java.util.Arrays;

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.emf.common.util.Enumerator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the literals of the enumeration '<em><b>History Kind</b></em>',

+ * and utility methods for working with them.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getHistoryKind()

+ * @model

+ * @generated

+ */

+public enum HistoryKind implements Enumerator {

+	/**

+	 * The '<em><b>Deep</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #DEEP_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	DEEP(0, "Deep", "Deep"),

+

+	/**

+	 * The '<em><b>Shallow</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #SHALLOW_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	SHALLOW(1, "Shallow", "Shallow");

+

+	/**

+	 * The '<em><b>Deep</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>Deep</b></em>' literal object isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #DEEP

+	 * @model name="Deep"

+	 * @generated

+	 * @ordered

+	 */

+	public static final int DEEP_VALUE = 0;

+

+	/**

+	 * The '<em><b>Shallow</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>Shallow</b></em>' literal object isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #SHALLOW

+	 * @model name="Shallow"

+	 * @generated

+	 * @ordered

+	 */

+	public static final int SHALLOW_VALUE = 1;

+

+	/**

+	 * An array of all the '<em><b>History Kind</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private static final HistoryKind[] VALUES_ARRAY =

+			new HistoryKind[] {

+					DEEP,

+					SHALLOW,

+			};

+

+	/**

+	 * A public read-only list of all the '<em><b>History Kind</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static final List<HistoryKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

+

+	/**

+	 * Returns the '<em><b>History Kind</b></em>' literal with the specified literal value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static HistoryKind get(String literal) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+			HistoryKind result = VALUES_ARRAY[i];

+			if (result.toString().equals(literal)) {

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>History Kind</b></em>' literal with the specified name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static HistoryKind getByName(String name) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+			HistoryKind result = VALUES_ARRAY[i];

+			if (result.getName().equals(name)) {

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>History Kind</b></em>' literal with the specified integer value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static HistoryKind get(int value) {

+		switch (value) {

+		case DEEP_VALUE:

+			return DEEP;

+		case SHALLOW_VALUE:

+			return SHALLOW;

+		}

+		return null;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private final int value;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private final String name;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private final String literal;

+

+	/**

+	 * Only this class can construct instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private HistoryKind(int value, String name, String literal) {

+		this.value = value;

+		this.name = name;

+		this.literal = literal;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public int getValue() {

+		return value;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getName() {

+		return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getLiteral() {

+		return literal;

+	}

+

+	/**

+	 * Returns the literal value of the enumerator, which is its string representation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		return literal;

+	}

+

+} // HistoryKind

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/InEvent.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/InEvent.java
new file mode 100644
index 00000000000..698ef28df1c
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/InEvent.java
@@ -0,0 +1,26 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>In Event</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getInEvent()

+ * @model

+ * @generated

+ */

+public interface InEvent extends AbstractEvent {

+} // InEvent

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/OutEvent.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/OutEvent.java
new file mode 100644
index 00000000000..e04265ad272
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/OutEvent.java
@@ -0,0 +1,26 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Out Event</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getOutEvent()

+ * @model

+ * @generated

+ */

+public interface OutEvent extends AbstractEvent {

+} // OutEvent

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/PortRegistrationType.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/PortRegistrationType.java
new file mode 100644
index 00000000000..89f87d6f0cd
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/PortRegistrationType.java
@@ -0,0 +1,259 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt;

+

+import java.util.Arrays;

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.emf.common.util.Enumerator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the literals of the enumeration '<em><b>Port Registration Type</b></em>',

+ * and utility methods for working with them.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getPortRegistrationType()

+ * @model

+ * @generated

+ */

+public enum PortRegistrationType implements Enumerator {

+	/**

+	 * The '<em><b>Automatic</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #AUTOMATIC_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	AUTOMATIC(0, "Automatic", "Automatic"),

+	/**

+	 * The '<em><b>Application</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #APPLICATION_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	APPLICATION(1, "Application", "Application"),

+	/**

+	 * The '<em><b>Automatic (locked)</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #AUTOMATIC_LOCKED_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	AUTOMATIC_LOCKED(2, "Automatic (locked)", "Automatic (locked)");

+

+	/**

+	 * The '<em><b>Automatic</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>Automatic</b></em>' literal object isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #AUTOMATIC

+	 * @model name="Automatic"

+	 * @generated

+	 * @ordered

+	 */

+	public static final int AUTOMATIC_VALUE = 0;

+

+	/**

+	 * The '<em><b>Application</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>Application</b></em>' literal object isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #APPLICATION

+	 * @model name="Application"

+	 * @generated

+	 * @ordered

+	 */

+	public static final int APPLICATION_VALUE = 1;

+

+	/**

+	 * The '<em><b>Automatic (locked)</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>Automatic (locked)</b></em>' literal object isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #AUTOMATIC_LOCKED

+	 * @model name="Automatic (locked)"

+	 * @generated

+	 * @ordered

+	 */

+	public static final int AUTOMATIC_LOCKED_VALUE = 2;

+

+	/**

+	 * An array of all the '<em><b>Port Registration Type</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private static final PortRegistrationType[] VALUES_ARRAY = new PortRegistrationType[] { AUTOMATIC, APPLICATION, AUTOMATIC_LOCKED, };

+

+	/**

+	 * A public read-only list of all the '<em><b>Port Registration Type</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static final List<PortRegistrationType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

+

+	/**

+	 * Returns the '<em><b>Port Registration Type</b></em>' literal with the specified literal value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static PortRegistrationType get(String literal) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+			PortRegistrationType result = VALUES_ARRAY[i];

+			if (result.toString().equals(literal)) {

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>Port Registration Type</b></em>' literal with the specified name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static PortRegistrationType getByName(String name) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+			PortRegistrationType result = VALUES_ARRAY[i];

+			if (result.getName().equals(name)) {

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>Port Registration Type</b></em>' literal with the specified integer value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static PortRegistrationType get(int value) {

+		switch (value) {

+		case AUTOMATIC_VALUE:

+			return AUTOMATIC;

+		case APPLICATION_VALUE:

+			return APPLICATION;

+		case AUTOMATIC_LOCKED_VALUE:

+			return AUTOMATIC_LOCKED;

+		}

+		return null;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private final int value;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private final String name;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private final String literal;

+

+	/**

+	 * Only this class can construct instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private PortRegistrationType(int value, String name, String literal) {

+		this.value = value;

+		this.name = name;

+		this.literal = literal;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public int getValue() {

+		return value;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getName() {

+		return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getLiteral() {

+		return literal;

+	}

+

+	/**

+	 * Returns the literal value of the enumerator, which is its string representation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		return literal;

+	}

+} // PortRegistrationType

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Protocol.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Protocol.java
new file mode 100644
index 00000000000..309b385ccf1
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Protocol.java
@@ -0,0 +1,62 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.uml2.uml.Collaboration;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Protocol</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.Protocol#getBase_Collaboration <em>Base Collaboration</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getProtocol()

+ * @model

+ * @generated

+ */

+public interface Protocol extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Base Collaboration</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Collaboration</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Base Collaboration</em>' reference.

+	 * @see #setBase_Collaboration(Collaboration)

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getProtocol_Base_Collaboration()

+	 * @model required="true"

+	 * @generated

+	 */

+	Collaboration getBase_Collaboration();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlrt.Protocol#getBase_Collaboration <em>Base Collaboration</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Base Collaboration</em>' reference.

+	 * @see #getBase_Collaboration()

+	 * @generated

+	 */

+	void setBase_Collaboration(Collaboration value);

+

+} // Protocol

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/ProtocolContainer.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/ProtocolContainer.java
new file mode 100644
index 00000000000..25cb87597a4
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/ProtocolContainer.java
@@ -0,0 +1,61 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt;

+

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Protocol Container</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.ProtocolContainer#getBase_Package <em>Base Package</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getProtocolContainer()

+ * @model

+ * @generated

+ */

+public interface ProtocolContainer extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Base Package</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Base Package</em>' reference.

+	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getProtocolContainer_Base_Package()

+	 * @model required="true"

+	 * @generated

+	 */

+	org.eclipse.uml2.uml.Package getBase_Package();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlrt.ProtocolContainer#getBase_Package <em>Base Package</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Base Package</em>' reference.

+	 * @see #getBase_Package()

+	 * @generated

+	 */

+	void setBase_Package(org.eclipse.uml2.uml.Package value);

+

+} // ProtocolContainer

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTConnector.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTConnector.java
new file mode 100644
index 00000000000..c0d2a048d07
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTConnector.java
@@ -0,0 +1,62 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.uml2.uml.Connector;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>RT Connector</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTConnector#getBase_Connector <em>Base Connector</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTConnector()

+ * @model

+ * @generated

+ */

+public interface RTConnector extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Base Connector</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Connector</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Base Connector</em>' reference.

+	 * @see #setBase_Connector(Connector)

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTConnector_Base_Connector()

+	 * @model required="true"

+	 * @generated

+	 */

+	Connector getBase_Connector();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTConnector#getBase_Connector <em>Base Connector</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Base Connector</em>' reference.

+	 * @see #getBase_Connector()

+	 * @generated

+	 */

+	void setBase_Connector(Connector value);

+

+} // RTConnector

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTHistorystate.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTHistorystate.java
new file mode 100644
index 00000000000..b879660e19a
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTHistorystate.java
@@ -0,0 +1,95 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.uml2.uml.Pseudostate;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>RT Historystate</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate#getBase_Pseudostate <em>Base Pseudostate</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate#getHistoryKind <em>History Kind</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTHistorystate()

+ * @model

+ * @generated

+ */

+public interface RTHistorystate extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Base Pseudostate</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Pseudostate</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Base Pseudostate</em>' reference.

+	 * @see #setBase_Pseudostate(Pseudostate)

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTHistorystate_Base_Pseudostate()

+	 * @model required="true"

+	 * @generated

+	 */

+	Pseudostate getBase_Pseudostate();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate#getBase_Pseudostate <em>Base Pseudostate</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Base Pseudostate</em>' reference.

+	 * @see #getBase_Pseudostate()

+	 * @generated

+	 */

+	void setBase_Pseudostate(Pseudostate value);

+

+	/**

+	 * Returns the value of the '<em><b>History Kind</b></em>' attribute.

+	 * The default value is <code>"Deep"</code>.

+	 * The literals are from the enumeration {@link org.eclipse.papyrus.migration.rsa.umlrt.HistoryKind}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>History Kind</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>History Kind</em>' attribute.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.HistoryKind

+	 * @see #setHistoryKind(HistoryKind)

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTHistorystate_HistoryKind()

+	 * @model default="Deep"

+	 * @generated

+	 */

+	HistoryKind getHistoryKind();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate#getHistoryKind <em>History Kind</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>History Kind</em>' attribute.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.HistoryKind

+	 * @see #getHistoryKind()

+	 * @generated

+	 */

+	void setHistoryKind(HistoryKind value);

+

+} // RTHistorystate

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTPort.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTPort.java
new file mode 100644
index 00000000000..f34fc9086fd
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTPort.java
@@ -0,0 +1,241 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.uml2.uml.Port;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>RT Port</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#getBase_Port <em>Base Port</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#isIsConjugate <em>Is Conjugate</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#isIsNotification <em>Is Notification</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#isIsPublish <em>Is Publish</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#isIsWired <em>Is Wired</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#getRegistration <em>Registration</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#getRegistrationOverride <em>Registration Override</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTPort()

+ * @model

+ * @generated

+ */

+public interface RTPort extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Base Port</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Port</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Base Port</em>' reference.

+	 * @see #setBase_Port(Port)

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTPort_Base_Port()

+	 * @model required="true"

+	 * @generated

+	 */

+	Port getBase_Port();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#getBase_Port <em>Base Port</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Base Port</em>' reference.

+	 * @see #getBase_Port()

+	 * @generated

+	 */

+	void setBase_Port(Port value);

+

+	/**

+	 * Returns the value of the '<em><b>Is Conjugate</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Is Conjugate</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Is Conjugate</em>' attribute.

+	 * @see #setIsConjugate(boolean)

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTPort_IsConjugate()

+	 * @model

+	 * @generated

+	 */

+	boolean isIsConjugate();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#isIsConjugate <em>Is Conjugate</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Is Conjugate</em>' attribute.

+	 * @see #isIsConjugate()

+	 * @generated

+	 */

+	void setIsConjugate(boolean value);

+

+	/**

+	 * Returns the value of the '<em><b>Is Notification</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Is Notification</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Is Notification</em>' attribute.

+	 * @see #setIsNotification(boolean)

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTPort_IsNotification()

+	 * @model

+	 * @generated

+	 */

+	boolean isIsNotification();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#isIsNotification <em>Is Notification</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Is Notification</em>' attribute.

+	 * @see #isIsNotification()

+	 * @generated

+	 */

+	void setIsNotification(boolean value);

+

+	/**

+	 * Returns the value of the '<em><b>Is Publish</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Is Publish</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Is Publish</em>' attribute.

+	 * @see #setIsPublish(boolean)

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTPort_IsPublish()

+	 * @model

+	 * @generated

+	 */

+	boolean isIsPublish();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#isIsPublish <em>Is Publish</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Is Publish</em>' attribute.

+	 * @see #isIsPublish()

+	 * @generated

+	 */

+	void setIsPublish(boolean value);

+

+	/**

+	 * Returns the value of the '<em><b>Is Wired</b></em>' attribute.

+	 * The default value is <code>"true"</code>.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Is Wired</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Is Wired</em>' attribute.

+	 * @see #setIsWired(boolean)

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTPort_IsWired()

+	 * @model default="true"

+	 * @generated

+	 */

+	boolean isIsWired();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#isIsWired <em>Is Wired</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Is Wired</em>' attribute.

+	 * @see #isIsWired()

+	 * @generated

+	 */

+	void setIsWired(boolean value);

+

+	/**

+	 * Returns the value of the '<em><b>Registration</b></em>' attribute.

+	 * The default value is <code>"Automatic"</code>.

+	 * The literals are from the enumeration {@link org.eclipse.papyrus.migration.rsa.umlrt.PortRegistrationType}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Registration</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Registration</em>' attribute.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.PortRegistrationType

+	 * @see #setRegistration(PortRegistrationType)

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTPort_Registration()

+	 * @model default="Automatic"

+	 * @generated

+	 */

+	PortRegistrationType getRegistration();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#getRegistration <em>Registration</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Registration</em>' attribute.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.PortRegistrationType

+	 * @see #getRegistration()

+	 * @generated

+	 */

+	void setRegistration(PortRegistrationType value);

+

+	/**

+	 * Returns the value of the '<em><b>Registration Override</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Registration Override</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Registration Override</em>' attribute.

+	 * @see #setRegistrationOverride(String)

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTPort_RegistrationOverride()

+	 * @model

+	 * @generated

+	 */

+	String getRegistrationOverride();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#getRegistrationOverride <em>Registration Override</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Registration Override</em>' attribute.

+	 * @see #getRegistrationOverride()

+	 * @generated

+	 */

+	void setRegistrationOverride(String value);

+

+} // RTPort

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTRedefinableElement.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTRedefinableElement.java
new file mode 100644
index 00000000000..f36d0e70cf1
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTRedefinableElement.java
@@ -0,0 +1,62 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.uml2.uml.RedefinableElement;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>RT Redefinable Element</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTRedefinableElement#getBase_RedefinableElement <em>Base Redefinable Element</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTRedefinableElement()

+ * @model

+ * @generated

+ */

+public interface RTRedefinableElement extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Base Redefinable Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Redefinable Element</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Base Redefinable Element</em>' reference.

+	 * @see #setBase_RedefinableElement(RedefinableElement)

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTRedefinableElement_Base_RedefinableElement()

+	 * @model required="true"

+	 * @generated

+	 */

+	RedefinableElement getBase_RedefinableElement();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTRedefinableElement#getBase_RedefinableElement <em>Base Redefinable Element</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Base Redefinable Element</em>' reference.

+	 * @see #getBase_RedefinableElement()

+	 * @generated

+	 */

+	void setBase_RedefinableElement(RedefinableElement value);

+

+} // RTRedefinableElement

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Trigger.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Trigger.java
new file mode 100644
index 00000000000..e2b7eac8ee4
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Trigger.java
@@ -0,0 +1,62 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.uml2.uml.Operation;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Trigger</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.Trigger#getBase_Operation <em>Base Operation</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getTrigger()

+ * @model

+ * @generated

+ */

+public interface Trigger extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Base Operation</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Operation</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Base Operation</em>' reference.

+	 * @see #setBase_Operation(Operation)

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getTrigger_Base_Operation()

+	 * @model required="true"

+	 * @generated

+	 */

+	Operation getBase_Operation();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlrt.Trigger#getBase_Operation <em>Base Operation</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Base Operation</em>' reference.

+	 * @see #getBase_Operation()

+	 * @generated

+	 */

+	void setBase_Operation(Operation value);

+

+} // Trigger

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/UMLRealTimeFactory.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/UMLRealTimeFactory.java
new file mode 100644
index 00000000000..e5f2006dd83
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/UMLRealTimeFactory.java
@@ -0,0 +1,165 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt;

+

+import org.eclipse.emf.ecore.EFactory;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Factory</b> for the model.

+ * It provides a create method for each non-abstract class of the model.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage

+ * @generated

+ */

+public interface UMLRealTimeFactory extends EFactory {

+	/**

+	 * The singleton instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	UMLRealTimeFactory eINSTANCE = org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimeFactoryImpl.init();

+

+	/**

+	 * Returns a new object of class '<em>Capsule</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Capsule</em>'.

+	 * @generated

+	 */

+	Capsule createCapsule();

+

+	/**

+	 * Returns a new object of class '<em>Capsule Part</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Capsule Part</em>'.

+	 * @generated

+	 */

+	CapsulePart createCapsulePart();

+

+	/**

+	 * Returns a new object of class '<em>Coregion</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Coregion</em>'.

+	 * @generated

+	 */

+	Coregion createCoregion();

+

+	/**

+	 * Returns a new object of class '<em>In Event</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>In Event</em>'.

+	 * @generated

+	 */

+	InEvent createInEvent();

+

+	/**

+	 * Returns a new object of class '<em>Out Event</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Out Event</em>'.

+	 * @generated

+	 */

+	OutEvent createOutEvent();

+

+	/**

+	 * Returns a new object of class '<em>Protocol</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Protocol</em>'.

+	 * @generated

+	 */

+	Protocol createProtocol();

+

+	/**

+	 * Returns a new object of class '<em>Protocol Container</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Protocol Container</em>'.

+	 * @generated

+	 */

+	ProtocolContainer createProtocolContainer();

+

+	/**

+	 * Returns a new object of class '<em>RT Connector</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>RT Connector</em>'.

+	 * @generated

+	 */

+	RTConnector createRTConnector();

+

+	/**

+	 * Returns a new object of class '<em>RT Historystate</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>RT Historystate</em>'.

+	 * @generated

+	 */

+	RTHistorystate createRTHistorystate();

+

+	/**

+	 * Returns a new object of class '<em>RT Port</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>RT Port</em>'.

+	 * @generated

+	 */

+	RTPort createRTPort();

+

+	/**

+	 * Returns a new object of class '<em>RT Redefinable Element</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>RT Redefinable Element</em>'.

+	 * @generated

+	 */

+	RTRedefinableElement createRTRedefinableElement();

+

+	/**

+	 * Returns a new object of class '<em>Trigger</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Trigger</em>'.

+	 * @generated

+	 */

+	Trigger createTrigger();

+

+	/**

+	 * Returns the package supported by this factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the package supported by this factory.

+	 * @generated

+	 */

+	UMLRealTimePackage getUMLRealTimePackage();

+

+} // UMLRealTimeFactory

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/UMLRealTimePackage.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/UMLRealTimePackage.java
new file mode 100644
index 00000000000..345f87b5cd9
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/UMLRealTimePackage.java
@@ -0,0 +1,1404 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt;

+

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EEnum;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.EReference;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Package</b> for the model.

+ * It contains accessors for the meta objects to represent

+ * <ul>

+ * <li>each class,</li>

+ * <li>each feature of each class,</li>

+ * <li>each operation of each class,</li>

+ * <li>each enum,</li>

+ * <li>and each data type</li>

+ * </ul>

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimeFactory

+ * @model kind="package"

+ * @generated

+ */

+public interface UMLRealTimePackage extends EPackage {

+	/**

+	 * The package name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	String eNAME = "umlrt";

+

+	/**

+	 * The package namespace URI.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	String eNS_URI = "http://www.eclipse.org/papyrus/profile/umlrt";

+

+	/**

+	 * The package namespace name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	String eNS_PREFIX = "UMLRealTime";

+

+	/**

+	 * The singleton instance of the package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	UMLRealTimePackage eINSTANCE = org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl.init();

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.AbstractEventImpl <em>Abstract Event</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.AbstractEventImpl

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getAbstractEvent()

+	 * @generated

+	 */

+	int ABSTRACT_EVENT = 0;

+

+	/**

+	 * The feature id for the '<em><b>Base Call Event</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int ABSTRACT_EVENT__BASE_CALL_EVENT = 0;

+

+	/**

+	 * The number of structural features of the '<em>Abstract Event</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int ABSTRACT_EVENT_FEATURE_COUNT = 1;

+

+	/**

+	 * The number of operations of the '<em>Abstract Event</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int ABSTRACT_EVENT_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.CapsuleImpl <em>Capsule</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.CapsuleImpl

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getCapsule()

+	 * @generated

+	 */

+	int CAPSULE = 1;

+

+	/**

+	 * The feature id for the '<em><b>Base Class</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CAPSULE__BASE_CLASS = 0;

+

+	/**

+	 * The number of structural features of the '<em>Capsule</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CAPSULE_FEATURE_COUNT = 1;

+

+	/**

+	 * The number of operations of the '<em>Capsule</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CAPSULE_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.CapsulePartImpl <em>Capsule Part</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.CapsulePartImpl

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getCapsulePart()

+	 * @generated

+	 */

+	int CAPSULE_PART = 2;

+

+	/**

+	 * The feature id for the '<em><b>Base Property</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CAPSULE_PART__BASE_PROPERTY = 0;

+

+	/**

+	 * The number of structural features of the '<em>Capsule Part</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CAPSULE_PART_FEATURE_COUNT = 1;

+

+	/**

+	 * The number of operations of the '<em>Capsule Part</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CAPSULE_PART_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.CoregionImpl <em>Coregion</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.CoregionImpl

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getCoregion()

+	 * @generated

+	 */

+	int COREGION = 3;

+

+	/**

+	 * The number of structural features of the '<em>Coregion</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int COREGION_FEATURE_COUNT = 0;

+

+	/**

+	 * The number of operations of the '<em>Coregion</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int COREGION_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.InEventImpl <em>In Event</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.InEventImpl

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getInEvent()

+	 * @generated

+	 */

+	int IN_EVENT = 4;

+

+	/**

+	 * The feature id for the '<em><b>Base Call Event</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int IN_EVENT__BASE_CALL_EVENT = ABSTRACT_EVENT__BASE_CALL_EVENT;

+

+	/**

+	 * The number of structural features of the '<em>In Event</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int IN_EVENT_FEATURE_COUNT = ABSTRACT_EVENT_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of operations of the '<em>In Event</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int IN_EVENT_OPERATION_COUNT = ABSTRACT_EVENT_OPERATION_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.OutEventImpl <em>Out Event</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.OutEventImpl

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getOutEvent()

+	 * @generated

+	 */

+	int OUT_EVENT = 5;

+

+	/**

+	 * The feature id for the '<em><b>Base Call Event</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int OUT_EVENT__BASE_CALL_EVENT = ABSTRACT_EVENT__BASE_CALL_EVENT;

+

+	/**

+	 * The number of structural features of the '<em>Out Event</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int OUT_EVENT_FEATURE_COUNT = ABSTRACT_EVENT_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of operations of the '<em>Out Event</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int OUT_EVENT_OPERATION_COUNT = ABSTRACT_EVENT_OPERATION_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.ProtocolImpl <em>Protocol</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.ProtocolImpl

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getProtocol()

+	 * @generated

+	 */

+	int PROTOCOL = 6;

+

+	/**

+	 * The feature id for the '<em><b>Base Collaboration</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PROTOCOL__BASE_COLLABORATION = 0;

+

+	/**

+	 * The number of structural features of the '<em>Protocol</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PROTOCOL_FEATURE_COUNT = 1;

+

+	/**

+	 * The number of operations of the '<em>Protocol</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PROTOCOL_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.ProtocolContainerImpl <em>Protocol Container</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.ProtocolContainerImpl

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getProtocolContainer()

+	 * @generated

+	 */

+	int PROTOCOL_CONTAINER = 7;

+

+	/**

+	 * The feature id for the '<em><b>Base Package</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PROTOCOL_CONTAINER__BASE_PACKAGE = 0;

+

+	/**

+	 * The number of structural features of the '<em>Protocol Container</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PROTOCOL_CONTAINER_FEATURE_COUNT = 1;

+

+	/**

+	 * The number of operations of the '<em>Protocol Container</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PROTOCOL_CONTAINER_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTConnectorImpl <em>RT Connector</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.RTConnectorImpl

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getRTConnector()

+	 * @generated

+	 */

+	int RT_CONNECTOR = 8;

+

+	/**

+	 * The feature id for the '<em><b>Base Connector</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RT_CONNECTOR__BASE_CONNECTOR = 0;

+

+	/**

+	 * The number of structural features of the '<em>RT Connector</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RT_CONNECTOR_FEATURE_COUNT = 1;

+

+	/**

+	 * The number of operations of the '<em>RT Connector</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RT_CONNECTOR_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTHistorystateImpl <em>RT Historystate</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.RTHistorystateImpl

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getRTHistorystate()

+	 * @generated

+	 */

+	int RT_HISTORYSTATE = 9;

+

+	/**

+	 * The feature id for the '<em><b>Base Pseudostate</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RT_HISTORYSTATE__BASE_PSEUDOSTATE = 0;

+

+	/**

+	 * The feature id for the '<em><b>History Kind</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RT_HISTORYSTATE__HISTORY_KIND = 1;

+

+	/**

+	 * The number of structural features of the '<em>RT Historystate</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RT_HISTORYSTATE_FEATURE_COUNT = 2;

+

+	/**

+	 * The number of operations of the '<em>RT Historystate</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RT_HISTORYSTATE_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTPortImpl <em>RT Port</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.RTPortImpl

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getRTPort()

+	 * @generated

+	 */

+	int RT_PORT = 10;

+

+	/**

+	 * The feature id for the '<em><b>Base Port</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RT_PORT__BASE_PORT = 0;

+

+	/**

+	 * The feature id for the '<em><b>Is Conjugate</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RT_PORT__IS_CONJUGATE = 1;

+

+	/**

+	 * The feature id for the '<em><b>Is Notification</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RT_PORT__IS_NOTIFICATION = 2;

+

+	/**

+	 * The feature id for the '<em><b>Is Publish</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RT_PORT__IS_PUBLISH = 3;

+

+	/**

+	 * The feature id for the '<em><b>Is Wired</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RT_PORT__IS_WIRED = 4;

+

+	/**

+	 * The feature id for the '<em><b>Registration</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RT_PORT__REGISTRATION = 5;

+

+	/**

+	 * The feature id for the '<em><b>Registration Override</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RT_PORT__REGISTRATION_OVERRIDE = 6;

+

+	/**

+	 * The number of structural features of the '<em>RT Port</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RT_PORT_FEATURE_COUNT = 7;

+

+	/**

+	 * The number of operations of the '<em>RT Port</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RT_PORT_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTRedefinableElementImpl <em>RT Redefinable Element</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.RTRedefinableElementImpl

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getRTRedefinableElement()

+	 * @generated

+	 */

+	int RT_REDEFINABLE_ELEMENT = 11;

+

+	/**

+	 * The feature id for the '<em><b>Base Redefinable Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RT_REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT = 0;

+

+	/**

+	 * The number of structural features of the '<em>RT Redefinable Element</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RT_REDEFINABLE_ELEMENT_FEATURE_COUNT = 1;

+

+	/**

+	 * The number of operations of the '<em>RT Redefinable Element</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RT_REDEFINABLE_ELEMENT_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.TriggerImpl <em>Trigger</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.TriggerImpl

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getTrigger()

+	 * @generated

+	 */

+	int TRIGGER = 12;

+

+	/**

+	 * The feature id for the '<em><b>Base Operation</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int TRIGGER__BASE_OPERATION = 0;

+

+	/**

+	 * The number of structural features of the '<em>Trigger</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int TRIGGER_FEATURE_COUNT = 1;

+

+	/**

+	 * The number of operations of the '<em>Trigger</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int TRIGGER_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.PortRegistrationType <em>Port Registration Type</em>}' enum.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.PortRegistrationType

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getPortRegistrationType()

+	 * @generated

+	 */

+	int PORT_REGISTRATION_TYPE = 13;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.HistoryKind <em>History Kind</em>}' enum.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.HistoryKind

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getHistoryKind()

+	 * @generated

+	 */

+	int HISTORY_KIND = 14;

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlrt.AbstractEvent <em>Abstract Event</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Abstract Event</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.AbstractEvent

+	 * @generated

+	 */

+	EClass getAbstractEvent();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.migration.rsa.umlrt.AbstractEvent#getBase_CallEvent <em>Base Call Event</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the reference '<em>Base Call Event</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.AbstractEvent#getBase_CallEvent()

+	 * @see #getAbstractEvent()

+	 * @generated

+	 */

+	EReference getAbstractEvent_Base_CallEvent();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlrt.Capsule <em>Capsule</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Capsule</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.Capsule

+	 * @generated

+	 */

+	EClass getCapsule();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.migration.rsa.umlrt.Capsule#getBase_Class <em>Base Class</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the reference '<em>Base Class</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.Capsule#getBase_Class()

+	 * @see #getCapsule()

+	 * @generated

+	 */

+	EReference getCapsule_Base_Class();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlrt.CapsulePart <em>Capsule Part</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Capsule Part</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.CapsulePart

+	 * @generated

+	 */

+	EClass getCapsulePart();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.migration.rsa.umlrt.CapsulePart#getBase_Property <em>Base Property</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the reference '<em>Base Property</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.CapsulePart#getBase_Property()

+	 * @see #getCapsulePart()

+	 * @generated

+	 */

+	EReference getCapsulePart_Base_Property();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlrt.Coregion <em>Coregion</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Coregion</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.Coregion

+	 * @generated

+	 */

+	EClass getCoregion();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlrt.InEvent <em>In Event</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>In Event</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.InEvent

+	 * @generated

+	 */

+	EClass getInEvent();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlrt.OutEvent <em>Out Event</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Out Event</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.OutEvent

+	 * @generated

+	 */

+	EClass getOutEvent();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlrt.Protocol <em>Protocol</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Protocol</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.Protocol

+	 * @generated

+	 */

+	EClass getProtocol();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.migration.rsa.umlrt.Protocol#getBase_Collaboration <em>Base Collaboration</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the reference '<em>Base Collaboration</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.Protocol#getBase_Collaboration()

+	 * @see #getProtocol()

+	 * @generated

+	 */

+	EReference getProtocol_Base_Collaboration();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlrt.ProtocolContainer <em>Protocol Container</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Protocol Container</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.ProtocolContainer

+	 * @generated

+	 */

+	EClass getProtocolContainer();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.migration.rsa.umlrt.ProtocolContainer#getBase_Package <em>Base Package</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the reference '<em>Base Package</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.ProtocolContainer#getBase_Package()

+	 * @see #getProtocolContainer()

+	 * @generated

+	 */

+	EReference getProtocolContainer_Base_Package();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTConnector <em>RT Connector</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>RT Connector</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.RTConnector

+	 * @generated

+	 */

+	EClass getRTConnector();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTConnector#getBase_Connector <em>Base Connector</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the reference '<em>Base Connector</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.RTConnector#getBase_Connector()

+	 * @see #getRTConnector()

+	 * @generated

+	 */

+	EReference getRTConnector_Base_Connector();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate <em>RT Historystate</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>RT Historystate</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate

+	 * @generated

+	 */

+	EClass getRTHistorystate();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate#getBase_Pseudostate <em>Base Pseudostate</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the reference '<em>Base Pseudostate</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate#getBase_Pseudostate()

+	 * @see #getRTHistorystate()

+	 * @generated

+	 */

+	EReference getRTHistorystate_Base_Pseudostate();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate#getHistoryKind <em>History Kind</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>History Kind</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate#getHistoryKind()

+	 * @see #getRTHistorystate()

+	 * @generated

+	 */

+	EAttribute getRTHistorystate_HistoryKind();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort <em>RT Port</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>RT Port</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.RTPort

+	 * @generated

+	 */

+	EClass getRTPort();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#getBase_Port <em>Base Port</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the reference '<em>Base Port</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.RTPort#getBase_Port()

+	 * @see #getRTPort()

+	 * @generated

+	 */

+	EReference getRTPort_Base_Port();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#isIsConjugate <em>Is Conjugate</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Is Conjugate</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.RTPort#isIsConjugate()

+	 * @see #getRTPort()

+	 * @generated

+	 */

+	EAttribute getRTPort_IsConjugate();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#isIsNotification <em>Is Notification</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Is Notification</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.RTPort#isIsNotification()

+	 * @see #getRTPort()

+	 * @generated

+	 */

+	EAttribute getRTPort_IsNotification();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#isIsPublish <em>Is Publish</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Is Publish</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.RTPort#isIsPublish()

+	 * @see #getRTPort()

+	 * @generated

+	 */

+	EAttribute getRTPort_IsPublish();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#isIsWired <em>Is Wired</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Is Wired</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.RTPort#isIsWired()

+	 * @see #getRTPort()

+	 * @generated

+	 */

+	EAttribute getRTPort_IsWired();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#getRegistration <em>Registration</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Registration</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.RTPort#getRegistration()

+	 * @see #getRTPort()

+	 * @generated

+	 */

+	EAttribute getRTPort_Registration();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#getRegistrationOverride <em>Registration Override</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Registration Override</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.RTPort#getRegistrationOverride()

+	 * @see #getRTPort()

+	 * @generated

+	 */

+	EAttribute getRTPort_RegistrationOverride();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTRedefinableElement <em>RT Redefinable Element</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>RT Redefinable Element</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.RTRedefinableElement

+	 * @generated

+	 */

+	EClass getRTRedefinableElement();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTRedefinableElement#getBase_RedefinableElement <em>Base Redefinable Element</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the reference '<em>Base Redefinable Element</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.RTRedefinableElement#getBase_RedefinableElement()

+	 * @see #getRTRedefinableElement()

+	 * @generated

+	 */

+	EReference getRTRedefinableElement_Base_RedefinableElement();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlrt.Trigger <em>Trigger</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Trigger</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.Trigger

+	 * @generated

+	 */

+	EClass getTrigger();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.migration.rsa.umlrt.Trigger#getBase_Operation <em>Base Operation</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the reference '<em>Base Operation</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.Trigger#getBase_Operation()

+	 * @see #getTrigger()

+	 * @generated

+	 */

+	EReference getTrigger_Base_Operation();

+

+	/**

+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.migration.rsa.umlrt.PortRegistrationType <em>Port Registration Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for enum '<em>Port Registration Type</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.PortRegistrationType

+	 * @generated

+	 */

+	EEnum getPortRegistrationType();

+

+	/**

+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.migration.rsa.umlrt.HistoryKind <em>History Kind</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for enum '<em>History Kind</em>'.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.HistoryKind

+	 * @generated

+	 */

+	EEnum getHistoryKind();

+

+	/**

+	 * Returns the factory that creates the instances of the model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the factory that creates the instances of the model.

+	 * @generated

+	 */

+	UMLRealTimeFactory getUMLRealTimeFactory();

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * Defines literals for the meta objects that represent

+	 * <ul>

+	 * <li>each class,</li>

+	 * <li>each feature of each class,</li>

+	 * <li>each operation of each class,</li>

+	 * <li>each enum,</li>

+	 * <li>and each data type</li>

+	 * </ul>

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	interface Literals {

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.AbstractEventImpl <em>Abstract Event</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.AbstractEventImpl

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getAbstractEvent()

+		 * @generated

+		 */

+		EClass ABSTRACT_EVENT = eINSTANCE.getAbstractEvent();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Call Event</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference ABSTRACT_EVENT__BASE_CALL_EVENT = eINSTANCE.getAbstractEvent_Base_CallEvent();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.CapsuleImpl <em>Capsule</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.CapsuleImpl

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getCapsule()

+		 * @generated

+		 */

+		EClass CAPSULE = eINSTANCE.getCapsule();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference CAPSULE__BASE_CLASS = eINSTANCE.getCapsule_Base_Class();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.CapsulePartImpl <em>Capsule Part</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.CapsulePartImpl

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getCapsulePart()

+		 * @generated

+		 */

+		EClass CAPSULE_PART = eINSTANCE.getCapsulePart();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference CAPSULE_PART__BASE_PROPERTY = eINSTANCE.getCapsulePart_Base_Property();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.CoregionImpl <em>Coregion</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.CoregionImpl

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getCoregion()

+		 * @generated

+		 */

+		EClass COREGION = eINSTANCE.getCoregion();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.InEventImpl <em>In Event</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.InEventImpl

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getInEvent()

+		 * @generated

+		 */

+		EClass IN_EVENT = eINSTANCE.getInEvent();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.OutEventImpl <em>Out Event</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.OutEventImpl

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getOutEvent()

+		 * @generated

+		 */

+		EClass OUT_EVENT = eINSTANCE.getOutEvent();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.ProtocolImpl <em>Protocol</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.ProtocolImpl

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getProtocol()

+		 * @generated

+		 */

+		EClass PROTOCOL = eINSTANCE.getProtocol();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Collaboration</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference PROTOCOL__BASE_COLLABORATION = eINSTANCE.getProtocol_Base_Collaboration();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.ProtocolContainerImpl <em>Protocol Container</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.ProtocolContainerImpl

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getProtocolContainer()

+		 * @generated

+		 */

+		EClass PROTOCOL_CONTAINER = eINSTANCE.getProtocolContainer();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference PROTOCOL_CONTAINER__BASE_PACKAGE = eINSTANCE.getProtocolContainer_Base_Package();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTConnectorImpl <em>RT Connector</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.RTConnectorImpl

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getRTConnector()

+		 * @generated

+		 */

+		EClass RT_CONNECTOR = eINSTANCE.getRTConnector();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Connector</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference RT_CONNECTOR__BASE_CONNECTOR = eINSTANCE.getRTConnector_Base_Connector();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTHistorystateImpl <em>RT Historystate</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.RTHistorystateImpl

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getRTHistorystate()

+		 * @generated

+		 */

+		EClass RT_HISTORYSTATE = eINSTANCE.getRTHistorystate();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Pseudostate</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference RT_HISTORYSTATE__BASE_PSEUDOSTATE = eINSTANCE.getRTHistorystate_Base_Pseudostate();

+

+		/**

+		 * The meta object literal for the '<em><b>History Kind</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute RT_HISTORYSTATE__HISTORY_KIND = eINSTANCE.getRTHistorystate_HistoryKind();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTPortImpl <em>RT Port</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.RTPortImpl

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getRTPort()

+		 * @generated

+		 */

+		EClass RT_PORT = eINSTANCE.getRTPort();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Port</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference RT_PORT__BASE_PORT = eINSTANCE.getRTPort_Base_Port();

+

+		/**

+		 * The meta object literal for the '<em><b>Is Conjugate</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute RT_PORT__IS_CONJUGATE = eINSTANCE.getRTPort_IsConjugate();

+

+		/**

+		 * The meta object literal for the '<em><b>Is Notification</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute RT_PORT__IS_NOTIFICATION = eINSTANCE.getRTPort_IsNotification();

+

+		/**

+		 * The meta object literal for the '<em><b>Is Publish</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute RT_PORT__IS_PUBLISH = eINSTANCE.getRTPort_IsPublish();

+

+		/**

+		 * The meta object literal for the '<em><b>Is Wired</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute RT_PORT__IS_WIRED = eINSTANCE.getRTPort_IsWired();

+

+		/**

+		 * The meta object literal for the '<em><b>Registration</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute RT_PORT__REGISTRATION = eINSTANCE.getRTPort_Registration();

+

+		/**

+		 * The meta object literal for the '<em><b>Registration Override</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute RT_PORT__REGISTRATION_OVERRIDE = eINSTANCE.getRTPort_RegistrationOverride();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTRedefinableElementImpl <em>RT Redefinable Element</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.RTRedefinableElementImpl

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getRTRedefinableElement()

+		 * @generated

+		 */

+		EClass RT_REDEFINABLE_ELEMENT = eINSTANCE.getRTRedefinableElement();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Redefinable Element</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference RT_REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT = eINSTANCE.getRTRedefinableElement_Base_RedefinableElement();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.TriggerImpl <em>Trigger</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.TriggerImpl

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getTrigger()

+		 * @generated

+		 */

+		EClass TRIGGER = eINSTANCE.getTrigger();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Operation</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference TRIGGER__BASE_OPERATION = eINSTANCE.getTrigger_Base_Operation();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.PortRegistrationType <em>Port Registration Type</em>}' enum.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.PortRegistrationType

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getPortRegistrationType()

+		 * @generated

+		 */

+		EEnum PORT_REGISTRATION_TYPE = eINSTANCE.getPortRegistrationType();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.HistoryKind <em>History Kind</em>}' enum.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.HistoryKind

+		 * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getHistoryKind()

+		 * @generated

+		 */

+		EEnum HISTORY_KIND = eINSTANCE.getHistoryKind();

+

+	}

+

+} // UMLRealTimePackage

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/AbstractEventImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/AbstractEventImpl.java
new file mode 100644
index 00000000000..2a8832ff1f4
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/AbstractEventImpl.java
@@ -0,0 +1,179 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+import org.eclipse.papyrus.migration.rsa.umlrt.AbstractEvent;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage;

+import org.eclipse.uml2.uml.CallEvent;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Abstract Event</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.AbstractEventImpl#getBase_CallEvent <em>Base Call Event</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public abstract class AbstractEventImpl extends MinimalEObjectImpl.Container implements AbstractEvent {

+	/**

+	 * The cached value of the '{@link #getBase_CallEvent() <em>Base Call Event</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getBase_CallEvent()

+	 * @generated

+	 * @ordered

+	 */

+	protected CallEvent base_CallEvent;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected AbstractEventImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return UMLRealTimePackage.Literals.ABSTRACT_EVENT;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public CallEvent getBase_CallEvent() {

+		if (base_CallEvent != null && base_CallEvent.eIsProxy()) {

+			InternalEObject oldBase_CallEvent = (InternalEObject) base_CallEvent;

+			base_CallEvent = (CallEvent) eResolveProxy(oldBase_CallEvent);

+			if (base_CallEvent != oldBase_CallEvent) {

+				if (eNotificationRequired()) {

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.ABSTRACT_EVENT__BASE_CALL_EVENT, oldBase_CallEvent, base_CallEvent));

+				}

+			}

+		}

+		return base_CallEvent;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public CallEvent basicGetBase_CallEvent() {

+		return base_CallEvent;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setBase_CallEvent(CallEvent newBase_CallEvent) {

+		CallEvent oldBase_CallEvent = base_CallEvent;

+		base_CallEvent = newBase_CallEvent;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.ABSTRACT_EVENT__BASE_CALL_EVENT, oldBase_CallEvent, base_CallEvent));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case UMLRealTimePackage.ABSTRACT_EVENT__BASE_CALL_EVENT:

+			if (resolve) {

+				return getBase_CallEvent();

+			}

+			return basicGetBase_CallEvent();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case UMLRealTimePackage.ABSTRACT_EVENT__BASE_CALL_EVENT:

+			setBase_CallEvent((CallEvent) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.ABSTRACT_EVENT__BASE_CALL_EVENT:

+			setBase_CallEvent((CallEvent) null);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.ABSTRACT_EVENT__BASE_CALL_EVENT:

+			return base_CallEvent != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} // AbstractEventImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CapsuleImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CapsuleImpl.java
new file mode 100644
index 00000000000..a7fa5a83917
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CapsuleImpl.java
@@ -0,0 +1,178 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+import org.eclipse.papyrus.migration.rsa.umlrt.Capsule;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Capsule</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.CapsuleImpl#getBase_Class <em>Base Class</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class CapsuleImpl extends MinimalEObjectImpl.Container implements Capsule {

+	/**

+	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getBase_Class()

+	 * @generated

+	 * @ordered

+	 */

+	protected org.eclipse.uml2.uml.Class base_Class;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected CapsuleImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return UMLRealTimePackage.Literals.CAPSULE;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public org.eclipse.uml2.uml.Class getBase_Class() {

+		if (base_Class != null && base_Class.eIsProxy()) {

+			InternalEObject oldBase_Class = (InternalEObject) base_Class;

+			base_Class = (org.eclipse.uml2.uml.Class) eResolveProxy(oldBase_Class);

+			if (base_Class != oldBase_Class) {

+				if (eNotificationRequired()) {

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.CAPSULE__BASE_CLASS, oldBase_Class, base_Class));

+				}

+			}

+		}

+		return base_Class;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public org.eclipse.uml2.uml.Class basicGetBase_Class() {

+		return base_Class;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {

+		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;

+		base_Class = newBase_Class;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.CAPSULE__BASE_CLASS, oldBase_Class, base_Class));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case UMLRealTimePackage.CAPSULE__BASE_CLASS:

+			if (resolve) {

+				return getBase_Class();

+			}

+			return basicGetBase_Class();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case UMLRealTimePackage.CAPSULE__BASE_CLASS:

+			setBase_Class((org.eclipse.uml2.uml.Class) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.CAPSULE__BASE_CLASS:

+			setBase_Class((org.eclipse.uml2.uml.Class) null);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.CAPSULE__BASE_CLASS:

+			return base_Class != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} // CapsuleImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CapsulePartImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CapsulePartImpl.java
new file mode 100644
index 00000000000..a6270547cb1
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CapsulePartImpl.java
@@ -0,0 +1,179 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+import org.eclipse.papyrus.migration.rsa.umlrt.CapsulePart;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage;

+import org.eclipse.uml2.uml.Property;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Capsule Part</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.CapsulePartImpl#getBase_Property <em>Base Property</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class CapsulePartImpl extends MinimalEObjectImpl.Container implements CapsulePart {

+	/**

+	 * The cached value of the '{@link #getBase_Property() <em>Base Property</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getBase_Property()

+	 * @generated

+	 * @ordered

+	 */

+	protected Property base_Property;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected CapsulePartImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return UMLRealTimePackage.Literals.CAPSULE_PART;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Property getBase_Property() {

+		if (base_Property != null && base_Property.eIsProxy()) {

+			InternalEObject oldBase_Property = (InternalEObject) base_Property;

+			base_Property = (Property) eResolveProxy(oldBase_Property);

+			if (base_Property != oldBase_Property) {

+				if (eNotificationRequired()) {

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.CAPSULE_PART__BASE_PROPERTY, oldBase_Property, base_Property));

+				}

+			}

+		}

+		return base_Property;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public Property basicGetBase_Property() {

+		return base_Property;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setBase_Property(Property newBase_Property) {

+		Property oldBase_Property = base_Property;

+		base_Property = newBase_Property;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.CAPSULE_PART__BASE_PROPERTY, oldBase_Property, base_Property));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case UMLRealTimePackage.CAPSULE_PART__BASE_PROPERTY:

+			if (resolve) {

+				return getBase_Property();

+			}

+			return basicGetBase_Property();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case UMLRealTimePackage.CAPSULE_PART__BASE_PROPERTY:

+			setBase_Property((Property) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.CAPSULE_PART__BASE_PROPERTY:

+			setBase_Property((Property) null);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.CAPSULE_PART__BASE_PROPERTY:

+			return base_Property != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} // CapsulePartImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CoregionImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CoregionImpl.java
new file mode 100644
index 00000000000..1b8641e8503
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CoregionImpl.java
@@ -0,0 +1,50 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.impl;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+import org.eclipse.papyrus.migration.rsa.umlrt.Coregion;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Coregion</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * </p>

+ *

+ * @generated

+ */

+public class CoregionImpl extends MinimalEObjectImpl.Container implements Coregion {

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected CoregionImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return UMLRealTimePackage.Literals.COREGION;

+	}

+

+} // CoregionImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/InEventImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/InEventImpl.java
new file mode 100644
index 00000000000..2b22da2defe
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/InEventImpl.java
@@ -0,0 +1,49 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.impl;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.papyrus.migration.rsa.umlrt.InEvent;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>In Event</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * </p>

+ *

+ * @generated

+ */

+public class InEventImpl extends AbstractEventImpl implements InEvent {

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected InEventImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return UMLRealTimePackage.Literals.IN_EVENT;

+	}

+

+} // InEventImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/OutEventImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/OutEventImpl.java
new file mode 100644
index 00000000000..fab1fcd5e08
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/OutEventImpl.java
@@ -0,0 +1,49 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.impl;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.papyrus.migration.rsa.umlrt.OutEvent;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Out Event</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * </p>

+ *

+ * @generated

+ */

+public class OutEventImpl extends AbstractEventImpl implements OutEvent {

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected OutEventImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return UMLRealTimePackage.Literals.OUT_EVENT;

+	}

+

+} // OutEventImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/ProtocolContainerImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/ProtocolContainerImpl.java
new file mode 100644
index 00000000000..7722e54cf7b
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/ProtocolContainerImpl.java
@@ -0,0 +1,178 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+import org.eclipse.papyrus.migration.rsa.umlrt.ProtocolContainer;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Protocol Container</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.ProtocolContainerImpl#getBase_Package <em>Base Package</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class ProtocolContainerImpl extends MinimalEObjectImpl.Container implements ProtocolContainer {

+	/**

+	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getBase_Package()

+	 * @generated

+	 * @ordered

+	 */

+	protected org.eclipse.uml2.uml.Package base_Package;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected ProtocolContainerImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return UMLRealTimePackage.Literals.PROTOCOL_CONTAINER;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public org.eclipse.uml2.uml.Package getBase_Package() {

+		if (base_Package != null && base_Package.eIsProxy()) {

+			InternalEObject oldBase_Package = (InternalEObject) base_Package;

+			base_Package = (org.eclipse.uml2.uml.Package) eResolveProxy(oldBase_Package);

+			if (base_Package != oldBase_Package) {

+				if (eNotificationRequired()) {

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.PROTOCOL_CONTAINER__BASE_PACKAGE, oldBase_Package, base_Package));

+				}

+			}

+		}

+		return base_Package;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public org.eclipse.uml2.uml.Package basicGetBase_Package() {

+		return base_Package;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {

+		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;

+		base_Package = newBase_Package;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.PROTOCOL_CONTAINER__BASE_PACKAGE, oldBase_Package, base_Package));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case UMLRealTimePackage.PROTOCOL_CONTAINER__BASE_PACKAGE:

+			if (resolve) {

+				return getBase_Package();

+			}

+			return basicGetBase_Package();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case UMLRealTimePackage.PROTOCOL_CONTAINER__BASE_PACKAGE:

+			setBase_Package((org.eclipse.uml2.uml.Package) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.PROTOCOL_CONTAINER__BASE_PACKAGE:

+			setBase_Package((org.eclipse.uml2.uml.Package) null);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.PROTOCOL_CONTAINER__BASE_PACKAGE:

+			return base_Package != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} // ProtocolContainerImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/ProtocolImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/ProtocolImpl.java
new file mode 100644
index 00000000000..579398a436f
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/ProtocolImpl.java
@@ -0,0 +1,179 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+import org.eclipse.papyrus.migration.rsa.umlrt.Protocol;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage;

+import org.eclipse.uml2.uml.Collaboration;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Protocol</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.ProtocolImpl#getBase_Collaboration <em>Base Collaboration</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class ProtocolImpl extends MinimalEObjectImpl.Container implements Protocol {

+	/**

+	 * The cached value of the '{@link #getBase_Collaboration() <em>Base Collaboration</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getBase_Collaboration()

+	 * @generated

+	 * @ordered

+	 */

+	protected Collaboration base_Collaboration;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected ProtocolImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return UMLRealTimePackage.Literals.PROTOCOL;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Collaboration getBase_Collaboration() {

+		if (base_Collaboration != null && base_Collaboration.eIsProxy()) {

+			InternalEObject oldBase_Collaboration = (InternalEObject) base_Collaboration;

+			base_Collaboration = (Collaboration) eResolveProxy(oldBase_Collaboration);

+			if (base_Collaboration != oldBase_Collaboration) {

+				if (eNotificationRequired()) {

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.PROTOCOL__BASE_COLLABORATION, oldBase_Collaboration, base_Collaboration));

+				}

+			}

+		}

+		return base_Collaboration;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public Collaboration basicGetBase_Collaboration() {

+		return base_Collaboration;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setBase_Collaboration(Collaboration newBase_Collaboration) {

+		Collaboration oldBase_Collaboration = base_Collaboration;

+		base_Collaboration = newBase_Collaboration;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.PROTOCOL__BASE_COLLABORATION, oldBase_Collaboration, base_Collaboration));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case UMLRealTimePackage.PROTOCOL__BASE_COLLABORATION:

+			if (resolve) {

+				return getBase_Collaboration();

+			}

+			return basicGetBase_Collaboration();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case UMLRealTimePackage.PROTOCOL__BASE_COLLABORATION:

+			setBase_Collaboration((Collaboration) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.PROTOCOL__BASE_COLLABORATION:

+			setBase_Collaboration((Collaboration) null);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.PROTOCOL__BASE_COLLABORATION:

+			return base_Collaboration != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} // ProtocolImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTConnectorImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTConnectorImpl.java
new file mode 100644
index 00000000000..9577bb84bcd
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTConnectorImpl.java
@@ -0,0 +1,179 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTConnector;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage;

+import org.eclipse.uml2.uml.Connector;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>RT Connector</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTConnectorImpl#getBase_Connector <em>Base Connector</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class RTConnectorImpl extends MinimalEObjectImpl.Container implements RTConnector {

+	/**

+	 * The cached value of the '{@link #getBase_Connector() <em>Base Connector</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getBase_Connector()

+	 * @generated

+	 * @ordered

+	 */

+	protected Connector base_Connector;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected RTConnectorImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return UMLRealTimePackage.Literals.RT_CONNECTOR;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Connector getBase_Connector() {

+		if (base_Connector != null && base_Connector.eIsProxy()) {

+			InternalEObject oldBase_Connector = (InternalEObject) base_Connector;

+			base_Connector = (Connector) eResolveProxy(oldBase_Connector);

+			if (base_Connector != oldBase_Connector) {

+				if (eNotificationRequired()) {

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.RT_CONNECTOR__BASE_CONNECTOR, oldBase_Connector, base_Connector));

+				}

+			}

+		}

+		return base_Connector;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public Connector basicGetBase_Connector() {

+		return base_Connector;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setBase_Connector(Connector newBase_Connector) {

+		Connector oldBase_Connector = base_Connector;

+		base_Connector = newBase_Connector;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_CONNECTOR__BASE_CONNECTOR, oldBase_Connector, base_Connector));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case UMLRealTimePackage.RT_CONNECTOR__BASE_CONNECTOR:

+			if (resolve) {

+				return getBase_Connector();

+			}

+			return basicGetBase_Connector();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case UMLRealTimePackage.RT_CONNECTOR__BASE_CONNECTOR:

+			setBase_Connector((Connector) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.RT_CONNECTOR__BASE_CONNECTOR:

+			setBase_Connector((Connector) null);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.RT_CONNECTOR__BASE_CONNECTOR:

+			return base_Connector != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} // RTConnectorImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTHistorystateImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTHistorystateImpl.java
new file mode 100644
index 00000000000..ea144aa1bf3
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTHistorystateImpl.java
@@ -0,0 +1,258 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+import org.eclipse.papyrus.migration.rsa.umlrt.HistoryKind;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage;

+import org.eclipse.uml2.uml.Pseudostate;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>RT Historystate</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTHistorystateImpl#getBase_Pseudostate <em>Base Pseudostate</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTHistorystateImpl#getHistoryKind <em>History Kind</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class RTHistorystateImpl extends MinimalEObjectImpl.Container implements RTHistorystate {

+	/**

+	 * The cached value of the '{@link #getBase_Pseudostate() <em>Base Pseudostate</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getBase_Pseudostate()

+	 * @generated

+	 * @ordered

+	 */

+	protected Pseudostate base_Pseudostate;

+

+	/**

+	 * The default value of the '{@link #getHistoryKind() <em>History Kind</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getHistoryKind()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final HistoryKind HISTORY_KIND_EDEFAULT = HistoryKind.DEEP;

+

+	/**

+	 * The cached value of the '{@link #getHistoryKind() <em>History Kind</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getHistoryKind()

+	 * @generated

+	 * @ordered

+	 */

+	protected HistoryKind historyKind = HISTORY_KIND_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected RTHistorystateImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return UMLRealTimePackage.Literals.RT_HISTORYSTATE;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Pseudostate getBase_Pseudostate() {

+		if (base_Pseudostate != null && base_Pseudostate.eIsProxy()) {

+			InternalEObject oldBase_Pseudostate = (InternalEObject) base_Pseudostate;

+			base_Pseudostate = (Pseudostate) eResolveProxy(oldBase_Pseudostate);

+			if (base_Pseudostate != oldBase_Pseudostate) {

+				if (eNotificationRequired()) {

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.RT_HISTORYSTATE__BASE_PSEUDOSTATE, oldBase_Pseudostate, base_Pseudostate));

+				}

+			}

+		}

+		return base_Pseudostate;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public Pseudostate basicGetBase_Pseudostate() {

+		return base_Pseudostate;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setBase_Pseudostate(Pseudostate newBase_Pseudostate) {

+		Pseudostate oldBase_Pseudostate = base_Pseudostate;

+		base_Pseudostate = newBase_Pseudostate;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_HISTORYSTATE__BASE_PSEUDOSTATE, oldBase_Pseudostate, base_Pseudostate));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public HistoryKind getHistoryKind() {

+		return historyKind;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setHistoryKind(HistoryKind newHistoryKind) {

+		HistoryKind oldHistoryKind = historyKind;

+		historyKind = newHistoryKind == null ? HISTORY_KIND_EDEFAULT : newHistoryKind;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_HISTORYSTATE__HISTORY_KIND, oldHistoryKind, historyKind));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case UMLRealTimePackage.RT_HISTORYSTATE__BASE_PSEUDOSTATE:

+			if (resolve) {

+				return getBase_Pseudostate();

+			}

+			return basicGetBase_Pseudostate();

+		case UMLRealTimePackage.RT_HISTORYSTATE__HISTORY_KIND:

+			return getHistoryKind();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case UMLRealTimePackage.RT_HISTORYSTATE__BASE_PSEUDOSTATE:

+			setBase_Pseudostate((Pseudostate) newValue);

+			return;

+		case UMLRealTimePackage.RT_HISTORYSTATE__HISTORY_KIND:

+			setHistoryKind((HistoryKind) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.RT_HISTORYSTATE__BASE_PSEUDOSTATE:

+			setBase_Pseudostate((Pseudostate) null);

+			return;

+		case UMLRealTimePackage.RT_HISTORYSTATE__HISTORY_KIND:

+			setHistoryKind(HISTORY_KIND_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.RT_HISTORYSTATE__BASE_PSEUDOSTATE:

+			return base_Pseudostate != null;

+		case UMLRealTimePackage.RT_HISTORYSTATE__HISTORY_KIND:

+			return historyKind != HISTORY_KIND_EDEFAULT;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (historyKind: ");

+		result.append(historyKind);

+		result.append(')');

+		return result.toString();

+	}

+

+} // RTHistorystateImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTPortImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTPortImpl.java
new file mode 100644
index 00000000000..bca785b086e
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTPortImpl.java
@@ -0,0 +1,563 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+import org.eclipse.papyrus.migration.rsa.umlrt.PortRegistrationType;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTPort;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage;

+import org.eclipse.uml2.uml.Port;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>RT Port</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTPortImpl#getBase_Port <em>Base Port</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTPortImpl#isIsConjugate <em>Is Conjugate</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTPortImpl#isIsNotification <em>Is Notification</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTPortImpl#isIsPublish <em>Is Publish</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTPortImpl#isIsWired <em>Is Wired</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTPortImpl#getRegistration <em>Registration</em>}</li>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTPortImpl#getRegistrationOverride <em>Registration Override</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {

+	/**

+	 * The cached value of the '{@link #getBase_Port() <em>Base Port</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getBase_Port()

+	 * @generated

+	 * @ordered

+	 */

+	protected Port base_Port;

+

+	/**

+	 * The default value of the '{@link #isIsConjugate() <em>Is Conjugate</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isIsConjugate()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean IS_CONJUGATE_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isIsConjugate() <em>Is Conjugate</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isIsConjugate()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean isConjugate = IS_CONJUGATE_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #isIsNotification() <em>Is Notification</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isIsNotification()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean IS_NOTIFICATION_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isIsNotification() <em>Is Notification</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isIsNotification()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean isNotification = IS_NOTIFICATION_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #isIsPublish() <em>Is Publish</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isIsPublish()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean IS_PUBLISH_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isIsPublish() <em>Is Publish</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isIsPublish()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean isPublish = IS_PUBLISH_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #isIsWired() <em>Is Wired</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isIsWired()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean IS_WIRED_EDEFAULT = true;

+

+	/**

+	 * The cached value of the '{@link #isIsWired() <em>Is Wired</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isIsWired()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean isWired = IS_WIRED_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getRegistration() <em>Registration</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getRegistration()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final PortRegistrationType REGISTRATION_EDEFAULT = PortRegistrationType.AUTOMATIC;

+

+	/**

+	 * The cached value of the '{@link #getRegistration() <em>Registration</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getRegistration()

+	 * @generated

+	 * @ordered

+	 */

+	protected PortRegistrationType registration = REGISTRATION_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getRegistrationOverride() <em>Registration Override</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getRegistrationOverride()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String REGISTRATION_OVERRIDE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getRegistrationOverride() <em>Registration Override</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getRegistrationOverride()

+	 * @generated

+	 * @ordered

+	 */

+	protected String registrationOverride = REGISTRATION_OVERRIDE_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected RTPortImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return UMLRealTimePackage.Literals.RT_PORT;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Port getBase_Port() {

+		if (base_Port != null && base_Port.eIsProxy()) {

+			InternalEObject oldBase_Port = (InternalEObject) base_Port;

+			base_Port = (Port) eResolveProxy(oldBase_Port);

+			if (base_Port != oldBase_Port) {

+				if (eNotificationRequired()) {

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.RT_PORT__BASE_PORT, oldBase_Port, base_Port));

+				}

+			}

+		}

+		return base_Port;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public Port basicGetBase_Port() {

+		return base_Port;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setBase_Port(Port newBase_Port) {

+		Port oldBase_Port = base_Port;

+		base_Port = newBase_Port;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_PORT__BASE_PORT, oldBase_Port, base_Port));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean isIsConjugate() {

+		return isConjugate;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setIsConjugate(boolean newIsConjugate) {

+		boolean oldIsConjugate = isConjugate;

+		isConjugate = newIsConjugate;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_PORT__IS_CONJUGATE, oldIsConjugate, isConjugate));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean isIsNotification() {

+		return isNotification;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setIsNotification(boolean newIsNotification) {

+		boolean oldIsNotification = isNotification;

+		isNotification = newIsNotification;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_PORT__IS_NOTIFICATION, oldIsNotification, isNotification));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean isIsPublish() {

+		return isPublish;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setIsPublish(boolean newIsPublish) {

+		boolean oldIsPublish = isPublish;

+		isPublish = newIsPublish;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_PORT__IS_PUBLISH, oldIsPublish, isPublish));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean isIsWired() {

+		return isWired;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setIsWired(boolean newIsWired) {

+		boolean oldIsWired = isWired;

+		isWired = newIsWired;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_PORT__IS_WIRED, oldIsWired, isWired));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public PortRegistrationType getRegistration() {

+		return registration;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setRegistration(PortRegistrationType newRegistration) {

+		PortRegistrationType oldRegistration = registration;

+		registration = newRegistration == null ? REGISTRATION_EDEFAULT : newRegistration;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_PORT__REGISTRATION, oldRegistration, registration));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getRegistrationOverride() {

+		return registrationOverride;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setRegistrationOverride(String newRegistrationOverride) {

+		String oldRegistrationOverride = registrationOverride;

+		registrationOverride = newRegistrationOverride;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_PORT__REGISTRATION_OVERRIDE, oldRegistrationOverride, registrationOverride));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case UMLRealTimePackage.RT_PORT__BASE_PORT:

+			if (resolve) {

+				return getBase_Port();

+			}

+			return basicGetBase_Port();

+		case UMLRealTimePackage.RT_PORT__IS_CONJUGATE:

+			return isIsConjugate();

+		case UMLRealTimePackage.RT_PORT__IS_NOTIFICATION:

+			return isIsNotification();

+		case UMLRealTimePackage.RT_PORT__IS_PUBLISH:

+			return isIsPublish();

+		case UMLRealTimePackage.RT_PORT__IS_WIRED:

+			return isIsWired();

+		case UMLRealTimePackage.RT_PORT__REGISTRATION:

+			return getRegistration();

+		case UMLRealTimePackage.RT_PORT__REGISTRATION_OVERRIDE:

+			return getRegistrationOverride();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case UMLRealTimePackage.RT_PORT__BASE_PORT:

+			setBase_Port((Port) newValue);

+			return;

+		case UMLRealTimePackage.RT_PORT__IS_CONJUGATE:

+			setIsConjugate((Boolean) newValue);

+			return;

+		case UMLRealTimePackage.RT_PORT__IS_NOTIFICATION:

+			setIsNotification((Boolean) newValue);

+			return;

+		case UMLRealTimePackage.RT_PORT__IS_PUBLISH:

+			setIsPublish((Boolean) newValue);

+			return;

+		case UMLRealTimePackage.RT_PORT__IS_WIRED:

+			setIsWired((Boolean) newValue);

+			return;

+		case UMLRealTimePackage.RT_PORT__REGISTRATION:

+			setRegistration((PortRegistrationType) newValue);

+			return;

+		case UMLRealTimePackage.RT_PORT__REGISTRATION_OVERRIDE:

+			setRegistrationOverride((String) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.RT_PORT__BASE_PORT:

+			setBase_Port((Port) null);

+			return;

+		case UMLRealTimePackage.RT_PORT__IS_CONJUGATE:

+			setIsConjugate(IS_CONJUGATE_EDEFAULT);

+			return;

+		case UMLRealTimePackage.RT_PORT__IS_NOTIFICATION:

+			setIsNotification(IS_NOTIFICATION_EDEFAULT);

+			return;

+		case UMLRealTimePackage.RT_PORT__IS_PUBLISH:

+			setIsPublish(IS_PUBLISH_EDEFAULT);

+			return;

+		case UMLRealTimePackage.RT_PORT__IS_WIRED:

+			setIsWired(IS_WIRED_EDEFAULT);

+			return;

+		case UMLRealTimePackage.RT_PORT__REGISTRATION:

+			setRegistration(REGISTRATION_EDEFAULT);

+			return;

+		case UMLRealTimePackage.RT_PORT__REGISTRATION_OVERRIDE:

+			setRegistrationOverride(REGISTRATION_OVERRIDE_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.RT_PORT__BASE_PORT:

+			return base_Port != null;

+		case UMLRealTimePackage.RT_PORT__IS_CONJUGATE:

+			return isConjugate != IS_CONJUGATE_EDEFAULT;

+		case UMLRealTimePackage.RT_PORT__IS_NOTIFICATION:

+			return isNotification != IS_NOTIFICATION_EDEFAULT;

+		case UMLRealTimePackage.RT_PORT__IS_PUBLISH:

+			return isPublish != IS_PUBLISH_EDEFAULT;

+		case UMLRealTimePackage.RT_PORT__IS_WIRED:

+			return isWired != IS_WIRED_EDEFAULT;

+		case UMLRealTimePackage.RT_PORT__REGISTRATION:

+			return registration != REGISTRATION_EDEFAULT;

+		case UMLRealTimePackage.RT_PORT__REGISTRATION_OVERRIDE:

+			return REGISTRATION_OVERRIDE_EDEFAULT == null ? registrationOverride != null : !REGISTRATION_OVERRIDE_EDEFAULT.equals(registrationOverride);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (isConjugate: ");

+		result.append(isConjugate);

+		result.append(", isNotification: ");

+		result.append(isNotification);

+		result.append(", isPublish: ");

+		result.append(isPublish);

+		result.append(", isWired: ");

+		result.append(isWired);

+		result.append(", registration: ");

+		result.append(registration);

+		result.append(", registrationOverride: ");

+		result.append(registrationOverride);

+		result.append(')');

+		return result.toString();

+	}

+

+} // RTPortImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTRedefinableElementImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTRedefinableElementImpl.java
new file mode 100644
index 00000000000..b674fa8c8d6
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTRedefinableElementImpl.java
@@ -0,0 +1,179 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTRedefinableElement;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage;

+import org.eclipse.uml2.uml.RedefinableElement;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>RT Redefinable Element</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTRedefinableElementImpl#getBase_RedefinableElement <em>Base Redefinable Element</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class RTRedefinableElementImpl extends MinimalEObjectImpl.Container implements RTRedefinableElement {

+	/**

+	 * The cached value of the '{@link #getBase_RedefinableElement() <em>Base Redefinable Element</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getBase_RedefinableElement()

+	 * @generated

+	 * @ordered

+	 */

+	protected RedefinableElement base_RedefinableElement;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected RTRedefinableElementImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return UMLRealTimePackage.Literals.RT_REDEFINABLE_ELEMENT;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public RedefinableElement getBase_RedefinableElement() {

+		if (base_RedefinableElement != null && base_RedefinableElement.eIsProxy()) {

+			InternalEObject oldBase_RedefinableElement = (InternalEObject) base_RedefinableElement;

+			base_RedefinableElement = (RedefinableElement) eResolveProxy(oldBase_RedefinableElement);

+			if (base_RedefinableElement != oldBase_RedefinableElement) {

+				if (eNotificationRequired()) {

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.RT_REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT, oldBase_RedefinableElement, base_RedefinableElement));

+				}

+			}

+		}

+		return base_RedefinableElement;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public RedefinableElement basicGetBase_RedefinableElement() {

+		return base_RedefinableElement;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setBase_RedefinableElement(RedefinableElement newBase_RedefinableElement) {

+		RedefinableElement oldBase_RedefinableElement = base_RedefinableElement;

+		base_RedefinableElement = newBase_RedefinableElement;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT, oldBase_RedefinableElement, base_RedefinableElement));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case UMLRealTimePackage.RT_REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT:

+			if (resolve) {

+				return getBase_RedefinableElement();

+			}

+			return basicGetBase_RedefinableElement();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case UMLRealTimePackage.RT_REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT:

+			setBase_RedefinableElement((RedefinableElement) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.RT_REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT:

+			setBase_RedefinableElement((RedefinableElement) null);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.RT_REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT:

+			return base_RedefinableElement != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} // RTRedefinableElementImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/TriggerImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/TriggerImpl.java
new file mode 100644
index 00000000000..7fea13e4fba
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/TriggerImpl.java
@@ -0,0 +1,179 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+import org.eclipse.papyrus.migration.rsa.umlrt.Trigger;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage;

+import org.eclipse.uml2.uml.Operation;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Trigger</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.TriggerImpl#getBase_Operation <em>Base Operation</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class TriggerImpl extends MinimalEObjectImpl.Container implements Trigger {

+	/**

+	 * The cached value of the '{@link #getBase_Operation() <em>Base Operation</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getBase_Operation()

+	 * @generated

+	 * @ordered

+	 */

+	protected Operation base_Operation;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected TriggerImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return UMLRealTimePackage.Literals.TRIGGER;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Operation getBase_Operation() {

+		if (base_Operation != null && base_Operation.eIsProxy()) {

+			InternalEObject oldBase_Operation = (InternalEObject) base_Operation;

+			base_Operation = (Operation) eResolveProxy(oldBase_Operation);

+			if (base_Operation != oldBase_Operation) {

+				if (eNotificationRequired()) {

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.TRIGGER__BASE_OPERATION, oldBase_Operation, base_Operation));

+				}

+			}

+		}

+		return base_Operation;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public Operation basicGetBase_Operation() {

+		return base_Operation;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setBase_Operation(Operation newBase_Operation) {

+		Operation oldBase_Operation = base_Operation;

+		base_Operation = newBase_Operation;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.TRIGGER__BASE_OPERATION, oldBase_Operation, base_Operation));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+		case UMLRealTimePackage.TRIGGER__BASE_OPERATION:

+			if (resolve) {

+				return getBase_Operation();

+			}

+			return basicGetBase_Operation();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+		case UMLRealTimePackage.TRIGGER__BASE_OPERATION:

+			setBase_Operation((Operation) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.TRIGGER__BASE_OPERATION:

+			setBase_Operation((Operation) null);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+		case UMLRealTimePackage.TRIGGER__BASE_OPERATION:

+			return base_Operation != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} // TriggerImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/UMLRealTimeFactoryImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/UMLRealTimeFactoryImpl.java
new file mode 100644
index 00000000000..48b9483e746
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/UMLRealTimeFactoryImpl.java
@@ -0,0 +1,364 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.impl;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EDataType;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.impl.EFactoryImpl;

+import org.eclipse.emf.ecore.plugin.EcorePlugin;

+import org.eclipse.papyrus.migration.rsa.umlrt.Capsule;

+import org.eclipse.papyrus.migration.rsa.umlrt.CapsulePart;

+import org.eclipse.papyrus.migration.rsa.umlrt.Coregion;

+import org.eclipse.papyrus.migration.rsa.umlrt.HistoryKind;

+import org.eclipse.papyrus.migration.rsa.umlrt.InEvent;

+import org.eclipse.papyrus.migration.rsa.umlrt.OutEvent;

+import org.eclipse.papyrus.migration.rsa.umlrt.PortRegistrationType;

+import org.eclipse.papyrus.migration.rsa.umlrt.Protocol;

+import org.eclipse.papyrus.migration.rsa.umlrt.ProtocolContainer;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTConnector;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTPort;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTRedefinableElement;

+import org.eclipse.papyrus.migration.rsa.umlrt.Trigger;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimeFactory;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Factory</b>.

+ * <!-- end-user-doc -->

+ *

+ * @generated

+ */

+public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeFactory {

+	/**

+	 * Creates the default factory implementation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static UMLRealTimeFactory init() {

+		try {

+			UMLRealTimeFactory theUMLRealTimeFactory = (UMLRealTimeFactory) EPackage.Registry.INSTANCE.getEFactory(UMLRealTimePackage.eNS_URI);

+			if (theUMLRealTimeFactory != null) {

+				return theUMLRealTimeFactory;

+			}

+		} catch (Exception exception) {

+			EcorePlugin.INSTANCE.log(exception);

+		}

+		return new UMLRealTimeFactoryImpl();

+	}

+

+	/**

+	 * Creates an instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public UMLRealTimeFactoryImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EObject create(EClass eClass) {

+		switch (eClass.getClassifierID()) {

+		case UMLRealTimePackage.CAPSULE:

+			return createCapsule();

+		case UMLRealTimePackage.CAPSULE_PART:

+			return createCapsulePart();

+		case UMLRealTimePackage.COREGION:

+			return createCoregion();

+		case UMLRealTimePackage.IN_EVENT:

+			return createInEvent();

+		case UMLRealTimePackage.OUT_EVENT:

+			return createOutEvent();

+		case UMLRealTimePackage.PROTOCOL:

+			return createProtocol();

+		case UMLRealTimePackage.PROTOCOL_CONTAINER:

+			return createProtocolContainer();

+		case UMLRealTimePackage.RT_CONNECTOR:

+			return createRTConnector();

+		case UMLRealTimePackage.RT_HISTORYSTATE:

+			return createRTHistorystate();

+		case UMLRealTimePackage.RT_PORT:

+			return createRTPort();

+		case UMLRealTimePackage.RT_REDEFINABLE_ELEMENT:

+			return createRTRedefinableElement();

+		case UMLRealTimePackage.TRIGGER:

+			return createTrigger();

+		default:

+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object createFromString(EDataType eDataType, String initialValue) {

+		switch (eDataType.getClassifierID()) {

+		case UMLRealTimePackage.PORT_REGISTRATION_TYPE:

+			return createPortRegistrationTypeFromString(eDataType, initialValue);

+		case UMLRealTimePackage.HISTORY_KIND:

+			return createHistoryKindFromString(eDataType, initialValue);

+		default:

+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String convertToString(EDataType eDataType, Object instanceValue) {

+		switch (eDataType.getClassifierID()) {

+		case UMLRealTimePackage.PORT_REGISTRATION_TYPE:

+			return convertPortRegistrationTypeToString(eDataType, instanceValue);

+		case UMLRealTimePackage.HISTORY_KIND:

+			return convertHistoryKindToString(eDataType, instanceValue);

+		default:

+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Capsule createCapsule() {

+		CapsuleImpl capsule = new CapsuleImpl();

+		return capsule;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public CapsulePart createCapsulePart() {

+		CapsulePartImpl capsulePart = new CapsulePartImpl();

+		return capsulePart;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Coregion createCoregion() {

+		CoregionImpl coregion = new CoregionImpl();

+		return coregion;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public InEvent createInEvent() {

+		InEventImpl inEvent = new InEventImpl();

+		return inEvent;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public OutEvent createOutEvent() {

+		OutEventImpl outEvent = new OutEventImpl();

+		return outEvent;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Protocol createProtocol() {

+		ProtocolImpl protocol = new ProtocolImpl();

+		return protocol;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public ProtocolContainer createProtocolContainer() {

+		ProtocolContainerImpl protocolContainer = new ProtocolContainerImpl();

+		return protocolContainer;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public RTConnector createRTConnector() {

+		RTConnectorImpl rtConnector = new RTConnectorImpl();

+		return rtConnector;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public RTHistorystate createRTHistorystate() {

+		RTHistorystateImpl rtHistorystate = new RTHistorystateImpl();

+		return rtHistorystate;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public RTPort createRTPort() {

+		RTPortImpl rtPort = new RTPortImpl();

+		return rtPort;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public RTRedefinableElement createRTRedefinableElement() {

+		RTRedefinableElementImpl rtRedefinableElement = new RTRedefinableElementImpl();

+		return rtRedefinableElement;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Trigger createTrigger() {

+		TriggerImpl trigger = new TriggerImpl();

+		return trigger;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public PortRegistrationType createPortRegistrationTypeFromString(EDataType eDataType, String initialValue) {

+		PortRegistrationType result = PortRegistrationType.get(initialValue);

+		if (result == null) {

+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		}

+		return result;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public String convertPortRegistrationTypeToString(EDataType eDataType, Object instanceValue) {

+		return instanceValue == null ? null : instanceValue.toString();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public HistoryKind createHistoryKindFromString(EDataType eDataType, String initialValue) {

+		HistoryKind result = HistoryKind.get(initialValue);

+		if (result == null) {

+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		}

+		return result;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public String convertHistoryKindToString(EDataType eDataType, Object instanceValue) {

+		return instanceValue == null ? null : instanceValue.toString();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public UMLRealTimePackage getUMLRealTimePackage() {

+		return (UMLRealTimePackage) getEPackage();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @deprecated

+	 * @generated

+	 */

+	@Deprecated

+	public static UMLRealTimePackage getPackage() {

+		return UMLRealTimePackage.eINSTANCE;

+	}

+

+} // UMLRealTimeFactoryImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/UMLRealTimePackageImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/UMLRealTimePackageImpl.java
new file mode 100644
index 00000000000..a9eee4f9dbe
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/UMLRealTimePackageImpl.java
@@ -0,0 +1,770 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.impl;

+

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EEnum;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.EReference;

+import org.eclipse.emf.ecore.EcorePackage;

+import org.eclipse.emf.ecore.impl.EPackageImpl;

+import org.eclipse.papyrus.migration.rsa.umlrt.AbstractEvent;

+import org.eclipse.papyrus.migration.rsa.umlrt.Capsule;

+import org.eclipse.papyrus.migration.rsa.umlrt.CapsulePart;

+import org.eclipse.papyrus.migration.rsa.umlrt.Coregion;

+import org.eclipse.papyrus.migration.rsa.umlrt.HistoryKind;

+import org.eclipse.papyrus.migration.rsa.umlrt.InEvent;

+import org.eclipse.papyrus.migration.rsa.umlrt.OutEvent;

+import org.eclipse.papyrus.migration.rsa.umlrt.PortRegistrationType;

+import org.eclipse.papyrus.migration.rsa.umlrt.Protocol;

+import org.eclipse.papyrus.migration.rsa.umlrt.ProtocolContainer;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTConnector;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTPort;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTRedefinableElement;

+import org.eclipse.papyrus.migration.rsa.umlrt.Trigger;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimeFactory;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Package</b>.

+ * <!-- end-user-doc -->

+ *

+ * @generated

+ */

+public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimePackage {

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass abstractEventEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass capsuleEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass capsulePartEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass coregionEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass inEventEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass outEventEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass protocolEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass protocolContainerEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass rtConnectorEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass rtHistorystateEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass rtPortEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass rtRedefinableElementEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass triggerEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EEnum portRegistrationTypeEEnum = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EEnum historyKindEEnum = null;

+

+	/**

+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

+	 * package

+	 * package URI value.

+	 * <p>

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.emf.ecore.EPackage.Registry

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#eNS_URI

+	 * @see #init()

+	 * @generated

+	 */

+	private UMLRealTimePackageImpl() {

+		super(eNS_URI, UMLRealTimeFactory.eINSTANCE);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private static boolean isInited = false;

+

+	/**

+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

+	 *

+	 * <p>

+	 * This method is used to initialize {@link UMLRealTimePackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

+	 * @see #eNS_URI

+	 * @see #createPackageContents()

+	 * @see #initializePackageContents()

+	 * @generated

+	 */

+	public static UMLRealTimePackage init() {

+		if (isInited) {

+			return (UMLRealTimePackage) EPackage.Registry.INSTANCE.getEPackage(UMLRealTimePackage.eNS_URI);

+		}

+

+		// Obtain or create and register package

+		UMLRealTimePackageImpl theUMLRealTimePackage = (UMLRealTimePackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UMLRealTimePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UMLRealTimePackageImpl());

+

+		isInited = true;

+

+		// Initialize simple dependencies

+		UMLPackage.eINSTANCE.eClass();

+

+		// Create package meta-data objects

+		theUMLRealTimePackage.createPackageContents();

+

+		// Initialize created meta-data

+		theUMLRealTimePackage.initializePackageContents();

+

+		// Mark meta-data to indicate it can't be changed

+		theUMLRealTimePackage.freeze();

+

+

+		// Update the registry and return the package

+		EPackage.Registry.INSTANCE.put(UMLRealTimePackage.eNS_URI, theUMLRealTimePackage);

+		return theUMLRealTimePackage;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getAbstractEvent() {

+		return abstractEventEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getAbstractEvent_Base_CallEvent() {

+		return (EReference) abstractEventEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getCapsule() {

+		return capsuleEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getCapsule_Base_Class() {

+		return (EReference) capsuleEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getCapsulePart() {

+		return capsulePartEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getCapsulePart_Base_Property() {

+		return (EReference) capsulePartEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getCoregion() {

+		return coregionEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getInEvent() {

+		return inEventEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getOutEvent() {

+		return outEventEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getProtocol() {

+		return protocolEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getProtocol_Base_Collaboration() {

+		return (EReference) protocolEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getProtocolContainer() {

+		return protocolContainerEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getProtocolContainer_Base_Package() {

+		return (EReference) protocolContainerEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getRTConnector() {

+		return rtConnectorEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getRTConnector_Base_Connector() {

+		return (EReference) rtConnectorEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getRTHistorystate() {

+		return rtHistorystateEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getRTHistorystate_Base_Pseudostate() {

+		return (EReference) rtHistorystateEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getRTHistorystate_HistoryKind() {

+		return (EAttribute) rtHistorystateEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getRTPort() {

+		return rtPortEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getRTPort_Base_Port() {

+		return (EReference) rtPortEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getRTPort_IsConjugate() {

+		return (EAttribute) rtPortEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getRTPort_IsNotification() {

+		return (EAttribute) rtPortEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getRTPort_IsPublish() {

+		return (EAttribute) rtPortEClass.getEStructuralFeatures().get(3);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getRTPort_IsWired() {

+		return (EAttribute) rtPortEClass.getEStructuralFeatures().get(4);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getRTPort_Registration() {

+		return (EAttribute) rtPortEClass.getEStructuralFeatures().get(5);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getRTPort_RegistrationOverride() {

+		return (EAttribute) rtPortEClass.getEStructuralFeatures().get(6);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getRTRedefinableElement() {

+		return rtRedefinableElementEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getRTRedefinableElement_Base_RedefinableElement() {

+		return (EReference) rtRedefinableElementEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getTrigger() {

+		return triggerEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getTrigger_Base_Operation() {

+		return (EReference) triggerEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EEnum getPortRegistrationType() {

+		return portRegistrationTypeEEnum;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EEnum getHistoryKind() {

+		return historyKindEEnum;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public UMLRealTimeFactory getUMLRealTimeFactory() {

+		return (UMLRealTimeFactory) getEFactoryInstance();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private boolean isCreated = false;

+

+	/**

+	 * Creates the meta-model objects for the package. This method is

+	 * guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public void createPackageContents() {

+		if (isCreated) {

+			return;

+		}

+		isCreated = true;

+

+		// Create classes and their features

+		abstractEventEClass = createEClass(ABSTRACT_EVENT);

+		createEReference(abstractEventEClass, ABSTRACT_EVENT__BASE_CALL_EVENT);

+

+		capsuleEClass = createEClass(CAPSULE);

+		createEReference(capsuleEClass, CAPSULE__BASE_CLASS);

+

+		capsulePartEClass = createEClass(CAPSULE_PART);

+		createEReference(capsulePartEClass, CAPSULE_PART__BASE_PROPERTY);

+

+		coregionEClass = createEClass(COREGION);

+

+		inEventEClass = createEClass(IN_EVENT);

+

+		outEventEClass = createEClass(OUT_EVENT);

+

+		protocolEClass = createEClass(PROTOCOL);

+		createEReference(protocolEClass, PROTOCOL__BASE_COLLABORATION);

+

+		protocolContainerEClass = createEClass(PROTOCOL_CONTAINER);

+		createEReference(protocolContainerEClass, PROTOCOL_CONTAINER__BASE_PACKAGE);

+

+		rtConnectorEClass = createEClass(RT_CONNECTOR);

+		createEReference(rtConnectorEClass, RT_CONNECTOR__BASE_CONNECTOR);

+

+		rtHistorystateEClass = createEClass(RT_HISTORYSTATE);

+		createEReference(rtHistorystateEClass, RT_HISTORYSTATE__BASE_PSEUDOSTATE);

+		createEAttribute(rtHistorystateEClass, RT_HISTORYSTATE__HISTORY_KIND);

+

+		rtPortEClass = createEClass(RT_PORT);

+		createEReference(rtPortEClass, RT_PORT__BASE_PORT);

+		createEAttribute(rtPortEClass, RT_PORT__IS_CONJUGATE);

+		createEAttribute(rtPortEClass, RT_PORT__IS_NOTIFICATION);

+		createEAttribute(rtPortEClass, RT_PORT__IS_PUBLISH);

+		createEAttribute(rtPortEClass, RT_PORT__IS_WIRED);

+		createEAttribute(rtPortEClass, RT_PORT__REGISTRATION);

+		createEAttribute(rtPortEClass, RT_PORT__REGISTRATION_OVERRIDE);

+

+		rtRedefinableElementEClass = createEClass(RT_REDEFINABLE_ELEMENT);

+		createEReference(rtRedefinableElementEClass, RT_REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT);

+

+		triggerEClass = createEClass(TRIGGER);

+		createEReference(triggerEClass, TRIGGER__BASE_OPERATION);

+

+		// Create enums

+		portRegistrationTypeEEnum = createEEnum(PORT_REGISTRATION_TYPE);

+		historyKindEEnum = createEEnum(HISTORY_KIND);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private boolean isInitialized = false;

+

+	/**

+	 * Complete the initialization of the package and its meta-model. This

+	 * method is guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public void initializePackageContents() {

+		if (isInitialized) {

+			return;

+		}

+		isInitialized = true;

+

+		// Initialize package

+		setName(eNAME);

+		setNsPrefix(eNS_PREFIX);

+		setNsURI(eNS_URI);

+

+		// Obtain other dependent packages

+		UMLPackage theUMLPackage = (UMLPackage) EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

+		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

+

+		// Create type parameters

+

+		// Set bounds for type parameters

+

+		// Add supertypes to classes

+		inEventEClass.getESuperTypes().add(this.getAbstractEvent());

+		outEventEClass.getESuperTypes().add(this.getAbstractEvent());

+

+		// Initialize classes, features, and operations; add parameters

+		initEClass(abstractEventEClass, AbstractEvent.class, "AbstractEvent", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getAbstractEvent_Base_CallEvent(), theUMLPackage.getCallEvent(), null, "base_CallEvent", null, 1, 1, AbstractEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

+				!IS_DERIVED, IS_ORDERED);

+

+		initEClass(capsuleEClass, Capsule.class, "Capsule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getCapsule_Base_Class(), theUMLPackage.getClass_(), null, "base_Class", null, 1, 1, Capsule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(capsulePartEClass, CapsulePart.class, "CapsulePart", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getCapsulePart_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 1, 1, CapsulePart.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+				IS_ORDERED);

+

+		initEClass(coregionEClass, Coregion.class, "Coregion", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+		initEClass(inEventEClass, InEvent.class, "InEvent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+		initEClass(outEventEClass, OutEvent.class, "OutEvent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+		initEClass(protocolEClass, Protocol.class, "Protocol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getProtocol_Base_Collaboration(), theUMLPackage.getCollaboration(), null, "base_Collaboration", null, 1, 1, Protocol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

+				!IS_DERIVED, IS_ORDERED);

+

+		initEClass(protocolContainerEClass, ProtocolContainer.class, "ProtocolContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getProtocolContainer_Base_Package(), theUMLPackage.getPackage(), null, "base_Package", null, 1, 1, ProtocolContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

+				!IS_DERIVED, IS_ORDERED);

+

+		initEClass(rtConnectorEClass, RTConnector.class, "RTConnector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getRTConnector_Base_Connector(), theUMLPackage.getConnector(), null, "base_Connector", null, 1, 1, RTConnector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+				IS_ORDERED);

+

+		initEClass(rtHistorystateEClass, RTHistorystate.class, "RTHistorystate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getRTHistorystate_Base_Pseudostate(), theUMLPackage.getPseudostate(), null, "base_Pseudostate", null, 1, 1, RTHistorystate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

+				!IS_DERIVED, IS_ORDERED);

+		initEAttribute(getRTHistorystate_HistoryKind(), this.getHistoryKind(), "historyKind", "Deep", 0, 1, RTHistorystate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(rtPortEClass, RTPort.class, "RTPort", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getRTPort_Base_Port(), theUMLPackage.getPort(), null, "base_Port", null, 1, 1, RTPort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getRTPort_IsConjugate(), ecorePackage.getEBoolean(), "isConjugate", null, 0, 1, RTPort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getRTPort_IsNotification(), ecorePackage.getEBoolean(), "isNotification", null, 0, 1, RTPort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getRTPort_IsPublish(), ecorePackage.getEBoolean(), "isPublish", null, 0, 1, RTPort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getRTPort_IsWired(), ecorePackage.getEBoolean(), "isWired", "true", 0, 1, RTPort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getRTPort_Registration(), this.getPortRegistrationType(), "registration", "Automatic", 0, 1, RTPort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getRTPort_RegistrationOverride(), theEcorePackage.getEString(), "registrationOverride", null, 0, 1, RTPort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(rtRedefinableElementEClass, RTRedefinableElement.class, "RTRedefinableElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getRTRedefinableElement_Base_RedefinableElement(), theUMLPackage.getRedefinableElement(), null, "base_RedefinableElement", null, 1, 1, RTRedefinableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,

+				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(triggerEClass, Trigger.class, "Trigger", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getTrigger_Base_Operation(), theUMLPackage.getOperation(), null, "base_Operation", null, 1, 1, Trigger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+				IS_ORDERED);

+

+		// Initialize enums and add enum literals

+		initEEnum(portRegistrationTypeEEnum, PortRegistrationType.class, "PortRegistrationType");

+		addEEnumLiteral(portRegistrationTypeEEnum, PortRegistrationType.AUTOMATIC);

+		addEEnumLiteral(portRegistrationTypeEEnum, PortRegistrationType.APPLICATION);

+		addEEnumLiteral(portRegistrationTypeEEnum, PortRegistrationType.AUTOMATIC_LOCKED);

+

+		initEEnum(historyKindEEnum, HistoryKind.class, "HistoryKind");

+		addEEnumLiteral(historyKindEEnum, HistoryKind.DEEP);

+		addEEnumLiteral(historyKindEEnum, HistoryKind.SHALLOW);

+

+		// Create resource

+		createResource(eNS_URI);

+	}

+} // UMLRealTimePackageImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeAdapterFactory.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeAdapterFactory.java
new file mode 100644
index 00000000000..2185764b870
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeAdapterFactory.java
@@ -0,0 +1,389 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.util;

+

+import org.eclipse.emf.common.notify.Adapter;

+import org.eclipse.emf.common.notify.Notifier;

+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.papyrus.migration.rsa.umlrt.AbstractEvent;

+import org.eclipse.papyrus.migration.rsa.umlrt.Capsule;

+import org.eclipse.papyrus.migration.rsa.umlrt.CapsulePart;

+import org.eclipse.papyrus.migration.rsa.umlrt.Coregion;

+import org.eclipse.papyrus.migration.rsa.umlrt.InEvent;

+import org.eclipse.papyrus.migration.rsa.umlrt.OutEvent;

+import org.eclipse.papyrus.migration.rsa.umlrt.Protocol;

+import org.eclipse.papyrus.migration.rsa.umlrt.ProtocolContainer;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTConnector;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTPort;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTRedefinableElement;

+import org.eclipse.papyrus.migration.rsa.umlrt.Trigger;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Adapter Factory</b> for the model.

+ * It provides an adapter <code>createXXX</code> method for each class of the model.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage

+ * @generated

+ */

+public class UMLRealTimeAdapterFactory extends AdapterFactoryImpl {

+	/**

+	 * The cached model package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected static UMLRealTimePackage modelPackage;

+

+	/**

+	 * Creates an instance of the adapter factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public UMLRealTimeAdapterFactory() {

+		if (modelPackage == null) {

+			modelPackage = UMLRealTimePackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Returns whether this factory is applicable for the type of the object.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return whether this factory is applicable for the type of the object.

+	 * @generated

+	 */

+	@Override

+	public boolean isFactoryForType(Object object) {

+		if (object == modelPackage) {

+			return true;

+		}

+		if (object instanceof EObject) {

+			return ((EObject) object).eClass().getEPackage() == modelPackage;

+		}

+		return false;

+	}

+

+	/**

+	 * The switch that delegates to the <code>createXXX</code> methods.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected UMLRealTimeSwitch<Adapter> modelSwitch =

+			new UMLRealTimeSwitch<Adapter>() {

+				@Override

+				public Adapter caseAbstractEvent(AbstractEvent object) {

+					return createAbstractEventAdapter();

+				}

+

+				@Override

+				public Adapter caseCapsule(Capsule object) {

+					return createCapsuleAdapter();

+				}

+

+				@Override

+				public Adapter caseCapsulePart(CapsulePart object) {

+					return createCapsulePartAdapter();

+				}

+

+				@Override

+				public Adapter caseCoregion(Coregion object) {

+					return createCoregionAdapter();

+				}

+

+				@Override

+				public Adapter caseInEvent(InEvent object) {

+					return createInEventAdapter();

+				}

+

+				@Override

+				public Adapter caseOutEvent(OutEvent object) {

+					return createOutEventAdapter();

+				}

+

+				@Override

+				public Adapter caseProtocol(Protocol object) {

+					return createProtocolAdapter();

+				}

+

+				@Override

+				public Adapter caseProtocolContainer(ProtocolContainer object) {

+					return createProtocolContainerAdapter();

+				}

+

+				@Override

+				public Adapter caseRTConnector(RTConnector object) {

+					return createRTConnectorAdapter();

+				}

+

+				@Override

+				public Adapter caseRTHistorystate(RTHistorystate object) {

+					return createRTHistorystateAdapter();

+				}

+

+				@Override

+				public Adapter caseRTPort(RTPort object) {

+					return createRTPortAdapter();

+				}

+

+				@Override

+				public Adapter caseRTRedefinableElement(RTRedefinableElement object) {

+					return createRTRedefinableElementAdapter();

+				}

+

+				@Override

+				public Adapter caseTrigger(Trigger object) {

+					return createTriggerAdapter();

+				}

+

+				@Override

+				public Adapter defaultCase(EObject object) {

+					return createEObjectAdapter();

+				}

+			};

+

+	/**

+	 * Creates an adapter for the <code>target</code>.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param target

+	 *            the object to adapt.

+	 * @return the adapter for the <code>target</code>.

+	 * @generated

+	 */

+	@Override

+	public Adapter createAdapter(Notifier target) {

+		return modelSwitch.doSwitch((EObject) target);

+	}

+

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlrt.AbstractEvent <em>Abstract Event</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.AbstractEvent

+	 * @generated

+	 */

+	public Adapter createAbstractEventAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlrt.Capsule <em>Capsule</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.Capsule

+	 * @generated

+	 */

+	public Adapter createCapsuleAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlrt.CapsulePart <em>Capsule Part</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.CapsulePart

+	 * @generated

+	 */

+	public Adapter createCapsulePartAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlrt.Coregion <em>Coregion</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.Coregion

+	 * @generated

+	 */

+	public Adapter createCoregionAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlrt.InEvent <em>In Event</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.InEvent

+	 * @generated

+	 */

+	public Adapter createInEventAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlrt.OutEvent <em>Out Event</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.OutEvent

+	 * @generated

+	 */

+	public Adapter createOutEventAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlrt.Protocol <em>Protocol</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.Protocol

+	 * @generated

+	 */

+	public Adapter createProtocolAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlrt.ProtocolContainer <em>Protocol Container</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.ProtocolContainer

+	 * @generated

+	 */

+	public Adapter createProtocolContainerAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTConnector <em>RT Connector</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.RTConnector

+	 * @generated

+	 */

+	public Adapter createRTConnectorAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate <em>RT Historystate</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate

+	 * @generated

+	 */

+	public Adapter createRTHistorystateAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort <em>RT Port</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.RTPort

+	 * @generated

+	 */

+	public Adapter createRTPortAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTRedefinableElement <em>RT Redefinable Element</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.RTRedefinableElement

+	 * @generated

+	 */

+	public Adapter createRTRedefinableElementAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlrt.Trigger <em>Trigger</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.migration.rsa.umlrt.Trigger

+	 * @generated

+	 */

+	public Adapter createTriggerAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for the default case.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null.

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the new adapter.

+	 * @generated

+	 */

+	public Adapter createEObjectAdapter() {

+		return null;

+	}

+

+} // UMLRealTimeAdapterFactory

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeResourceFactoryImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeResourceFactoryImpl.java
new file mode 100644
index 00000000000..e858728ccbc
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeResourceFactoryImpl.java
@@ -0,0 +1,61 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.util;

+

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

+import org.eclipse.emf.ecore.xmi.XMLResource;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Resource Factory</b> associated with the package.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.util.UMLRealTimeResourceImpl

+ * @generated

+ */

+public class UMLRealTimeResourceFactoryImpl extends ResourceFactoryImpl {

+	/**

+	 * Creates an instance of the resource factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public UMLRealTimeResourceFactoryImpl() {

+		super();

+	}

+

+	/**

+	 * Creates an instance of the resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Resource createResource(URI uri) {

+		XMLResource result = new UMLRealTimeResourceImpl(uri);

+		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

+		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

+

+		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);

+

+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

+		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

+

+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);

+		return result;

+	}

+

+} // UMLRealTimeResourceFactoryImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeResourceImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeResourceImpl.java
new file mode 100644
index 00000000000..adf520bf769
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeResourceImpl.java
@@ -0,0 +1,39 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.util;

+

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Resource </b> associated with the package.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.util.UMLRealTimeResourceFactoryImpl

+ * @generated

+ */

+public class UMLRealTimeResourceImpl extends XMLResourceImpl {

+	/**

+	 * Creates an instance of the resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param uri

+	 *            the URI of the new resource.

+	 * @generated

+	 */

+	public UMLRealTimeResourceImpl(URI uri) {

+		super(uri);

+	}

+

+} // UMLRealTimeResourceImpl

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeSwitch.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeSwitch.java
new file mode 100644
index 00000000000..db5b1c91c8e
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeSwitch.java
@@ -0,0 +1,447 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.util;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.util.Switch;

+import org.eclipse.papyrus.migration.rsa.umlrt.AbstractEvent;

+import org.eclipse.papyrus.migration.rsa.umlrt.Capsule;

+import org.eclipse.papyrus.migration.rsa.umlrt.CapsulePart;

+import org.eclipse.papyrus.migration.rsa.umlrt.Coregion;

+import org.eclipse.papyrus.migration.rsa.umlrt.InEvent;

+import org.eclipse.papyrus.migration.rsa.umlrt.OutEvent;

+import org.eclipse.papyrus.migration.rsa.umlrt.Protocol;

+import org.eclipse.papyrus.migration.rsa.umlrt.ProtocolContainer;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTConnector;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTPort;

+import org.eclipse.papyrus.migration.rsa.umlrt.RTRedefinableElement;

+import org.eclipse.papyrus.migration.rsa.umlrt.Trigger;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Switch</b> for the model's inheritance hierarchy.

+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

+ * starting with the actual class of the object

+ * and proceeding up the inheritance hierarchy

+ * until a non-null result is returned,

+ * which is the result of the switch.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage

+ * @generated

+ */

+public class UMLRealTimeSwitch<T> extends Switch<T> {

+	/**

+	 * The cached model package

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected static UMLRealTimePackage modelPackage;

+

+	/**

+	 * Creates an instance of the switch.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public UMLRealTimeSwitch() {

+		if (modelPackage == null) {

+			modelPackage = UMLRealTimePackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Checks whether this is a switch for the given package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @parameter ePackage the package in question.

+	 * @return whether this is a switch for the given package.

+	 * @generated

+	 */

+	@Override

+	protected boolean isSwitchFor(EPackage ePackage) {

+		return ePackage == modelPackage;

+	}

+

+	/**

+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the first non-null result returned by a <code>caseXXX</code> call.

+	 * @generated

+	 */

+	@Override

+	protected T doSwitch(int classifierID, EObject theEObject) {

+		switch (classifierID) {

+		case UMLRealTimePackage.ABSTRACT_EVENT: {

+			AbstractEvent abstractEvent = (AbstractEvent) theEObject;

+			T result = caseAbstractEvent(abstractEvent);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case UMLRealTimePackage.CAPSULE: {

+			Capsule capsule = (Capsule) theEObject;

+			T result = caseCapsule(capsule);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case UMLRealTimePackage.CAPSULE_PART: {

+			CapsulePart capsulePart = (CapsulePart) theEObject;

+			T result = caseCapsulePart(capsulePart);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case UMLRealTimePackage.COREGION: {

+			Coregion coregion = (Coregion) theEObject;

+			T result = caseCoregion(coregion);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case UMLRealTimePackage.IN_EVENT: {

+			InEvent inEvent = (InEvent) theEObject;

+			T result = caseInEvent(inEvent);

+			if (result == null) {

+				result = caseAbstractEvent(inEvent);

+			}

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case UMLRealTimePackage.OUT_EVENT: {

+			OutEvent outEvent = (OutEvent) theEObject;

+			T result = caseOutEvent(outEvent);

+			if (result == null) {

+				result = caseAbstractEvent(outEvent);

+			}

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case UMLRealTimePackage.PROTOCOL: {

+			Protocol protocol = (Protocol) theEObject;

+			T result = caseProtocol(protocol);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case UMLRealTimePackage.PROTOCOL_CONTAINER: {

+			ProtocolContainer protocolContainer = (ProtocolContainer) theEObject;

+			T result = caseProtocolContainer(protocolContainer);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case UMLRealTimePackage.RT_CONNECTOR: {

+			RTConnector rtConnector = (RTConnector) theEObject;

+			T result = caseRTConnector(rtConnector);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case UMLRealTimePackage.RT_HISTORYSTATE: {

+			RTHistorystate rtHistorystate = (RTHistorystate) theEObject;

+			T result = caseRTHistorystate(rtHistorystate);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case UMLRealTimePackage.RT_PORT: {

+			RTPort rtPort = (RTPort) theEObject;

+			T result = caseRTPort(rtPort);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case UMLRealTimePackage.RT_REDEFINABLE_ELEMENT: {

+			RTRedefinableElement rtRedefinableElement = (RTRedefinableElement) theEObject;

+			T result = caseRTRedefinableElement(rtRedefinableElement);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case UMLRealTimePackage.TRIGGER: {

+			Trigger trigger = (Trigger) theEObject;

+			T result = caseTrigger(trigger);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		default:

+			return defaultCase(theEObject);

+		}

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Event</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Abstract Event</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseAbstractEvent(AbstractEvent object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Capsule</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Capsule</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseCapsule(Capsule object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Capsule Part</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Capsule Part</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseCapsulePart(CapsulePart object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Coregion</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Coregion</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseCoregion(Coregion object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>In Event</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>In Event</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseInEvent(InEvent object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Out Event</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Out Event</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseOutEvent(OutEvent object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Protocol</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Protocol</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseProtocol(Protocol object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Protocol Container</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Protocol Container</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseProtocolContainer(ProtocolContainer object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>RT Connector</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>RT Connector</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseRTConnector(RTConnector object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>RT Historystate</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>RT Historystate</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseRTHistorystate(RTHistorystate object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>RT Port</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>RT Port</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseRTPort(RTPort object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>RT Redefinable Element</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>RT Redefinable Element</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseRTRedefinableElement(RTRedefinableElement object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Trigger</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Trigger</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseTrigger(Trigger object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch, but this is the last case anyway.

+	 * <!-- end-user-doc -->

+	 *

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

+	 * @generated

+	 */

+	@Override

+	public T defaultCase(EObject object) {

+		return null;

+	}

+

+} // UMLRealTimeSwitch

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeXMLProcessor.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeXMLProcessor.java
new file mode 100644
index 00000000000..4c3443e3c90
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeXMLProcessor.java
@@ -0,0 +1,59 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.umlrt.util;

+

+import java.util.Map;

+

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

+import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage;

+

+/**

+ * This class contains helper methods to serialize and deserialize XML documents

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ *

+ * @generated

+ */

+public class UMLRealTimeXMLProcessor extends XMLProcessor {

+

+	/**

+	 * Public constructor to instantiate the helper.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public UMLRealTimeXMLProcessor() {

+		super((EPackage.Registry.INSTANCE));

+		UMLRealTimePackage.eINSTANCE.eClass();

+	}

+

+	/**

+	 * Register for "*" and "xml" file extensions the UMLRealTimeResourceFactoryImpl factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected Map<String, Resource.Factory> getRegistrations() {

+		if (registrations == null) {

+			super.getRegistrations();

+			registrations.put(XML_EXTENSION, new UMLRealTimeResourceFactoryImpl());

+			registrations.put(STAR_EXTENSION, new UMLRealTimeResourceFactoryImpl());

+		}

+		return registrations;

+	}

+

+} // UMLRealTimeXMLProcessor

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/Activator.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/Activator.java
new file mode 100644
index 00000000000..b74126b3b32
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/Activator.java
@@ -0,0 +1,69 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa;
+
+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.migration.rsa"; //$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/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/blackbox/ProfileBaseHelper.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/blackbox/ProfileBaseHelper.java
new file mode 100644
index 00000000000..3c55cedf0ed
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/blackbox/ProfileBaseHelper.java
@@ -0,0 +1,55 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.blackbox;

+

+

+import java.util.Properties;

+

+import org.eclipse.m2m.qvt.oml.blackbox.java.Operation;

+import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;

+import org.eclipse.m2m.qvt.oml.util.IContext;

+import org.eclipse.papyrus.migration.rsa.profilebase.ProfileConstraint;

+

+

+public class ProfileBaseHelper {

+

+	/** Key of the ConfigProperty containing the java.util.Properties for ProfileBase#messageKey mappings */

+	public static final String PROFILE_BASE_PROPERTIES = "profilebase.properties";

+

+	/**

+	 * Reads the constraint's message from the ProfileBase properties file

+	 * If the message is not found, the messageKey is returned

+	 *

+	 * @param context

+	 * @param constraint

+	 *        The ProfileConstraint element (From ProfileBase profile)

+	 * @return

+	 *         The ProfileConstraint's message (From the properties file), or the ProfileConstraint's messageKey if the message is not defined

+	 */

+	@Operation(contextual = true, kind = Kind.QUERY, withExecutionContext = true)

+	public String getConstraintMessage(IContext context, ProfileConstraint constraint) {

+		String key = constraint.getMessageKey();

+

+		if(key == null) {

+			return null;

+		}

+

+		Object propertiesObject = context.getConfigProperty(PROFILE_BASE_PROPERTIES);

+		if(propertiesObject instanceof Properties) {

+			Properties properties = (Properties)propertiesObject;

+			return properties.getProperty(key, key);

+		}

+

+		return key;

+	}

+

+}

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/blackbox/RTMappings.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/blackbox/RTMappings.java
new file mode 100644
index 00000000000..d8ab0f1b17c
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/blackbox/RTMappings.java
@@ -0,0 +1,109 @@
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 CEA LIST.

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.blackbox;

+

+import java.util.Collection;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.m2m.qvt.oml.blackbox.java.Operation;

+import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;

+import org.eclipse.m2m.qvt.oml.util.IContext;

+import org.eclipse.uml2.common.util.CacheAdapter;

+import org.eclipse.uml2.uml.CallEvent;

+import org.eclipse.uml2.uml.Collaboration;

+import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.LiteralString;

+import org.eclipse.uml2.uml.OpaqueExpression;

+import org.eclipse.uml2.uml.SignalEvent;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * Implements the Blackbox mappings for RSARTToPapyrusRT

+ *

+ * @author Camille Letavernier

+ *

+ */

+public class RTMappings {

+

+	@Operation(contextual = true, kind = Kind.MAPPING, withExecutionContext = true)

+	public static org.eclipse.uml2.uml.Class toClass(IContext context, Collaboration collaboration) {

+		return refactorType(context, collaboration, UMLPackage.eINSTANCE.getClass_(), org.eclipse.uml2.uml.Class.class);

+	}

+

+	@Operation(contextual = true, kind = Kind.MAPPING, withExecutionContext = true)

+	public static SignalEvent toSignalEvent(IContext context, CallEvent callEvent) {

+		return refactorType(context, callEvent, UMLPackage.eINSTANCE.getSignalEvent(), SignalEvent.class);

+	}

+

+	@Operation(contextual = true, kind = Kind.MAPPING, withExecutionContext = false)

+	public static LiteralString toLiteralString(OpaqueExpression expression) {

+		return refactorType(null, expression, UMLPackage.eINSTANCE.getLiteralString(), LiteralString.class);

+	}

+

+	//Not public to avoid confusing QVTo (Public methods are part of the Blackbox unit API)

+	private static <T extends Element> T refactorType(IContext context, EObject sourceElement, EClass targetEClass, java.lang.Class<T> resultType) {

+		//Retrieve the resource at the beginning, because the source element will be removed from its container at some point

+		//		Resource resource = sourceElement.eResource();

+

+		//Create a Class and maintain the features (Attributes and References)

+		T result = resultType.cast(UMLFactory.eINSTANCE.create(targetEClass));

+		for(EStructuralFeature sourceFeature : sourceElement.eClass().getEAllStructuralFeatures()) {

+			EStructuralFeature targetFeature = result.eClass().getEStructuralFeature(sourceFeature.getName());

+			if(targetFeature != null && targetFeature.isChangeable()) {

+				result.eSet(targetFeature, sourceElement.eGet(sourceFeature));

+			}

+		}

+

+		//Fix incoming references

+		Collection<EStructuralFeature.Setting> incomingReferences = CacheAdapter.getInstance().getInverseReferences(sourceElement);

+		for(EStructuralFeature.Setting setting : incomingReferences) {

+			EStructuralFeature feature = setting.getEStructuralFeature();

+			if(feature.isChangeable() && feature.getEType().isInstance(result)) {

+				if(feature.isMany()) {

+					Object value = setting.get(true);

+					if(value instanceof Collection<?>) {

+						List<Object> copy = new LinkedList<Object>((Collection<?>)value);

+

+						while(true) {

+							int index = copy.indexOf(sourceElement);

+							if(index < 0) {

+								break;

+							}

+

+							copy.remove(index);

+							copy.add(index, result);

+						}

+

+						setting.set(copy);

+					}

+				} else {

+					setting.set(result);

+				}

+			}

+		}

+

+		//TODO: Keep the same XMI ID

+		//This algorithm doesn't work here, because the object has been added to a temporary resource (ModelExtent), which doesn't support IDs mapping

+		//We need to track the mapping somewhere else

+

+		//		if(resource instanceof XMLResource) {

+		//			XMLResource xmlResource = (XMLResource)resource;

+		//			xmlResource.setID(result, xmlResource.getID(sourceElement));

+		//		}

+		return result;

+	}

+}

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/handler/ImportHandler.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/handler/ImportHandler.java
new file mode 100644
index 00000000000..0f96e8a114b
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/handler/ImportHandler.java
@@ -0,0 +1,227 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.handler;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.utils.DiResourceSet;
+import org.eclipse.papyrus.infra.emf.resource.DependencyManagementHelper;
+import org.eclipse.papyrus.migration.rsa.Activator;
+import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config;
+import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersFactory;
+import org.eclipse.papyrus.migration.rsa.transformation.ImportTransformation;
+import org.eclipse.papyrus.views.properties.creation.PropertyEditorFactory;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+
+public class ImportHandler extends AbstractHandler {
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		ISelection selection = HandlerUtil.getCurrentSelection(event);
+		if (selection == null || selection.isEmpty()) {
+			return null;
+		}
+
+		Set<IFile> filesToImport = new HashSet<IFile>();
+
+		if (selection instanceof IStructuredSelection) {
+			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
+			Iterator<?> selectionIterator = structuredSelection.iterator();
+			while (selectionIterator.hasNext()) {
+				Object selectedElement = selectionIterator.next();
+				if (selectedElement instanceof IAdaptable) {
+					IFile selectedFile = (IFile) ((IAdaptable) selectedElement).getAdapter(IFile.class);
+					if (selectedFile == null) {
+						Activator.log.warn("Element %s is not an IFile");
+						continue;
+					}
+
+					// EFX files can be selected (Makes it easier to select a set of files),
+					// but they will be imported by their parent model
+					String fileExtension = selectedFile.getFileExtension();
+					if ("epx".equals(fileExtension) || "emx".equals(fileExtension)) { //$NON-NLS-1$ //$NON-NLS-2$
+						filesToImport.add(selectedFile);
+					}
+				}
+			}
+		}
+
+		if (!filesToImport.isEmpty()) {
+			importFiles(filesToImport, event);
+		}
+
+		return null;
+	}
+
+	public void importFiles(Set<IFile> selectedFiles, ExecutionEvent event) {
+		Config config = getTransformationParameters(event);
+
+		if (config == null) {
+			return;
+		}
+
+		List<ImportTransformation> transformations = new LinkedList<ImportTransformation>();
+
+		for (IFile selectedFile : selectedFiles) {
+			URI uri = URI.createPlatformResourceURI(selectedFile.getFullPath().toString(), true);
+
+			ImportTransformation transformation = new ImportTransformation(uri, config);
+			transformation.run();
+
+			transformations.add(transformation);
+		}
+
+		if (selectedFiles.size() > 1) {
+			importModelDependencies(transformations);
+		}
+	}
+
+	public Config getTransformationParameters(ExecutionEvent event) {
+		Config config = RSAToPapyrusParametersFactory.eINSTANCE.createConfig();
+
+		Shell activeShell = HandlerUtil.getActiveShell(event);
+
+		final AtomicBoolean okPressed = new AtomicBoolean(true);
+		PropertyEditorFactory factory = new PropertyEditorFactory() {
+			@Override
+			public String getEditionDialogTitle(Object objectToEdit) {
+				return "Transformation parameters";
+			}
+
+			@Override
+			protected void handleEditCancelled(Control widget, Object source) {
+				okPressed.set(false);
+				super.handleEditCancelled(widget, source);
+			}
+		};
+
+		Object result = factory.edit(activeShell, config);
+
+		if (!okPressed.get()) {
+			return null;
+		}
+
+		// Result can be null, the source config, or a new config
+		if (result instanceof Config) {
+			config = (Config) result;
+		}
+
+		return config;
+	}
+
+	public void importModelDependencies(final List<ImportTransformation> transformations) {
+		Job importDependencies = new Job("Import model dependencies") {
+			@Override
+			protected IStatus run(IProgressMonitor monitor) {
+				monitor.setTaskName("Waiting for import tasks to complete...");
+				monitor.beginTask("Import model dependencies", transformations.size() * 2);
+
+				wait(transformations, monitor);
+
+				handleModelDependencies(transformations, monitor);
+
+				return Status.OK_STATUS;
+			}
+
+			// Wait for all import transformations to complete
+			protected void wait(List<ImportTransformation> transformations, IProgressMonitor monitor) {
+				for (ImportTransformation transformation : transformations) {
+					monitor.subTask("Waiting for " + transformation.getModelName() + " to complete...");
+					transformation.waitForCompletion();
+					monitor.worked(1);
+				}
+			}
+
+			// Convert all model dependencies (For "imported model -> emx library" to "imported model -> imported library")
+			protected void handleModelDependencies(List<ImportTransformation> transformations, IProgressMonitor monitor) {
+				Map<URI, URI> urisToReplace = new HashMap<URI, URI>();
+				for (ImportTransformation transformation : transformations) {
+					// Only transform EMX/EFX models. Profiles (epx) will be handled separately
+
+					for (Map.Entry<URI, URI> entry : transformation.getURIMappings().entrySet()) {
+						String fileExtension = entry.getKey().fileExtension();
+						if ("emx".equals(fileExtension) || "efx".equals(fileExtension)) {
+							urisToReplace.put(entry.getKey(), entry.getValue());
+						}
+					}
+				}
+
+				for (ImportTransformation transformation : transformations) {
+
+					monitor.subTask("Importing dependencies for " + transformation.getModelName());
+					final ModelSet modelSet = new DiResourceSet();
+					try {
+						modelSet.loadModels(transformation.getTargetURI());
+					} catch (ModelMultiException e) {
+						Activator.log.error(e);
+						continue;
+					}
+					final TransactionalEditingDomain domain = modelSet.getTransactionalEditingDomain();
+
+					for (final Map.Entry<URI, URI> entry : urisToReplace.entrySet()) {
+						domain.getCommandStack().execute(new RecordingCommand(domain, "Import dependencies") {
+
+							@Override
+							protected void doExecute() {
+								DependencyManagementHelper.updateDependencies(entry.getKey(), entry.getValue(), modelSet, domain);
+							}
+						});
+
+					}
+
+					try {
+						modelSet.save(new NullProgressMonitor());
+						monitor.worked(1);
+					} catch (IOException ex) {
+						Activator.log.error(ex);
+						continue;
+					}
+				}
+			}
+		};
+
+		importDependencies.setUser(true);
+		importDependencies.schedule();
+	}
+
+
+
+
+}
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/transformation/ImportTransformation.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/transformation/ImportTransformation.java
new file mode 100644
index 00000000000..e6aef3066e3
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/transformation/ImportTransformation.java
@@ -0,0 +1,949 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.migration.rsa.transformation;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.DiagnosticException;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.common.util.WrappedException;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.xmi.XMIResource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
+import org.eclipse.gmf.runtime.emf.core.resources.GMFResource;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.Style;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.m2m.qvt.oml.BasicModelExtent;
+import org.eclipse.m2m.qvt.oml.ExecutionContext;
+import org.eclipse.m2m.qvt.oml.ExecutionContextImpl;
+import org.eclipse.m2m.qvt.oml.ExecutionDiagnostic;
+import org.eclipse.m2m.qvt.oml.ModelExtent;
+import org.eclipse.m2m.qvt.oml.TransformationExecutor;
+import org.eclipse.m2m.qvt.oml.util.WriterLog;
+import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage;
+import org.eclipse.papyrus.infra.tools.util.ListHelper;
+import org.eclipse.papyrus.m2m.qvto.TransformationUI;
+import org.eclipse.papyrus.migration.rsa.Activator;
+import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config;
+import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersFactory;
+import org.eclipse.papyrus.migration.rsa.blackbox.ProfileBaseHelper;
+import org.eclipse.papyrus.uml.documentation.Documentation.DocumentationPackage;
+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.statushandlers.StatusManager;
+import org.eclipse.uml2.uml.OpaqueExpression;
+import org.eclipse.uml2.uml.resource.UMLResource;
+
+public class ImportTransformation {
+
+	protected final URI sourceURI;
+
+	protected ModelExtent outUML, outNotation, outSashModel, inParameters;
+
+	protected ResourceSet resourceSet;
+
+	protected boolean cacheTransformations;
+
+	protected Job job;
+
+	protected Resource umlResource;
+
+	protected Config parameters;
+
+	/** Source URI to Target URI map */
+	protected final Map<URI, URI> uriMappings = new HashMap<URI, URI>();
+
+	// The cache can be used to increase performances (For small and medium sized models, most of the execution time is spent in loading the transformation)
+	// Warning: using the cache prevents dynamic transformations (i.e. it should not be used in Debug Mode)
+	protected static final Map<URI, TransformationExecutor> sharedTransformations = new HashMap<URI, TransformationExecutor>();
+
+	// Separate local cache for preloading transformations if cacheTransformations = false (Mostly for debug purpose)
+	protected final Map<URI, TransformationExecutor> localTransformations = new HashMap<URI, TransformationExecutor>();
+
+	public ImportTransformation(URI sourceURI) {
+		this(sourceURI, RSAToPapyrusParametersFactory.eINSTANCE.createConfig());
+	}
+
+	public ImportTransformation(URI sourceURI, Config config) {
+		Assert.isNotNull(sourceURI);
+		this.sourceURI = sourceURI;
+		this.parameters = config;
+
+		this.cacheTransformations = true;
+	}
+
+	/**
+	 * Executes the transformation
+	 *
+	 * The transformation will be executed asynchronously in a Job
+	 */
+	public void run() {
+
+		job = new Job("Import " + getModelName()) {
+
+			@Override
+			protected IStatus run(IProgressMonitor monitor) {
+				return ImportTransformation.this.run(monitor);
+			}
+		};
+
+		job.setUser(true);
+
+		job.addJobChangeListener(new JobChangeAdapter() {
+
+			@Override
+			public void done(IJobChangeEvent event) {
+				if (event.getResult().getSeverity() == IStatus.OK) {
+					Display.getDefault().asyncExec(new Runnable() {
+
+						@Override
+						public void run() {
+							MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), job.getName(), String.format("Model %s has been successfully imported", getModelName()));
+						}
+					});
+
+				} else if (event.getResult().getSeverity() == IStatus.CANCEL) {
+					Display.getDefault().asyncExec(new Runnable() {
+
+						@Override
+						public void run() {
+							MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), job.getName(), String.format("Operation canceled", getModelName()));
+						}
+					});
+				} else {
+					StatusManager.getManager().handle(event.getResult(), StatusManager.SHOW);
+				}
+			}
+
+		});
+
+		job.schedule();
+	}
+
+	public void waitForCompletion() {
+		try {
+			job.join();
+		} catch (InterruptedException ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	public Map<URI, URI> getURIMappings() {
+		return uriMappings;
+	}
+
+	public URI getTargetURI() {
+		if (umlResource != null) {
+			return umlResource.getURI();
+		}
+		return null;
+	}
+
+	/**
+	 * Initializes the resource set, and resolve all dependencies
+	 */
+	protected void initResourceSet(IProgressMonitor monitor) {
+		resourceSet = new ResourceSetImpl();
+		resourceSet.getLoadOptions().put(XMLResource.OPTION_DEFER_ATTACHMENT, true);
+		resourceSet.getLoadOptions().put(XMLResource.OPTION_DEFER_IDREF_RESOLUTION, true);
+		resourceSet.getLoadOptions().put(XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);
+		resourceSet.getLoadOptions().put(XMLResource.OPTION_USE_PACKAGE_NS_URI_AS_LOCATION, Boolean.FALSE);
+
+		monitor.subTask("Loading source model " + getModelName());
+
+		try {
+			resourceSet.getResource(sourceURI, true);
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+
+		monitor.subTask("Resolving all dependencies...");
+
+		EcoreUtil.resolveAll(resourceSet);
+	}
+
+	/**
+	 * Returns the number of elements to be migrated (i.e. diagrams to be migrated + specific non-trivial elements)
+	 * Used to initialize the progress monitor
+	 *
+	 * @return
+	 *         The total number of elements to be migrated
+	 */
+	protected int countSupportedElements() {
+		int i = 0;
+
+		ModelExtent extent = getInOutUMLModel();
+		for (EObject eObject : extent.getContents()) {
+
+			// We already called ResolveAll, there is no need to try resolution again
+			TreeIterator<EObject> modelIterator = EcoreUtil.getAllContents(eObject, false);
+			while (modelIterator.hasNext()) {
+				EObject next = modelIterator.next();
+				if (next instanceof Diagram) {
+					Diagram diagram = (Diagram) next;
+					if (isSupported(diagram)) {
+						i++;
+					}
+					modelIterator.prune(); // Don't navigate Diagram children
+				} else if (next instanceof OpaqueExpression) {
+					if (parameters.isConvertOpaqueExpressionToLiteralString()) {
+						OpaqueExpression exp = (OpaqueExpression) next;
+						if (needsConversion(exp)) {
+							i++;
+						}
+					}
+				}
+			}
+		}
+
+		i += getAllTransformationURIs().size();
+
+		return i;
+	}
+
+	/**
+	 * Returns true if the OpaqueExpression is to be converted to a LiteralString
+	 * OpaqueExpressions are converted to LiteralString when they have a single body with no language
+	 *
+	 * @param exp
+	 * @return
+	 */
+	protected static boolean needsConversion(OpaqueExpression exp) {
+		List<String> languages = exp.getLanguages();
+		List<String> bodies = exp.getBodies();
+		if (bodies.size() > 1) {
+			return false;
+		}
+
+		if (languages.isEmpty() || (languages.size() == 1 && exp.getLanguages().get(0).isEmpty())) {
+			return true;
+		}
+
+		return false;
+	}
+
+	protected static final Set<String> supportedDiagramIds = new HashSet<String>();
+
+	protected static boolean isSupported(Diagram diagram) {
+		return supportedDiagramIds.contains(diagram.getType());
+	}
+
+	// Preloads all required transformations (Either locally or statically, depending on the cache parameter)
+	protected IStatus loadTransformations(IProgressMonitor monitor) {
+		for (URI transformationURI : getAllTransformationURIs()) {
+			try {
+				// Don't use a subprogress monitor, since it may be confusing
+				getTransformation(transformationURI, new NullProgressMonitor());
+				monitor.worked(1);
+			} catch (DiagnosticException ex) {
+				return BasicDiagnostic.toIStatus(ex.getDiagnostic());
+			}
+		}
+
+		return Status.OK_STATUS;
+	}
+
+	/**
+	 * Actually runs the transformation (in the current thread)
+	 *
+	 * @param monitor
+	 * @return The transformation IStatus
+	 */
+	protected IStatus run(final IProgressMonitor monitor) {
+
+		//
+		// INITIALIZATION / LOADING
+		//
+
+		monitor.subTask("Loading source model " + getModelName());
+
+		initResourceSet(monitor);
+
+		int numberOfElements = countSupportedElements();
+
+		monitor.beginTask("Importing " + getModelName(), numberOfElements);
+
+		monitor.subTask("Loading transformations (This may take a few seconds for the first import)...");
+		loadTransformations(monitor);
+
+
+		List<ModelExtent> extents = getModelExtents();
+
+		MultiStatus generationStatus = new MultiStatus(Activator.PLUGIN_ID, IStatus.OK, "Operation complete", null);
+
+		ExecutionContext context = createExecutionContext(monitor, generationStatus);
+
+		//
+		// TRANSFORMATIONS
+		//
+
+		IStatus result; // Result of an individual transformation (Will be aggregated to the complete GenerationStatus)
+
+		// UML RT (First operation, because it can transform Collaborations to Classes, which has some consequences on the diagram transformation)
+		// TODO: Restore the UML RT transformation (Update to UML RT v3)
+		result = importRTProfile(context, monitor);
+		generationStatus.add(result);
+
+		// Diagrams
+		Collection<URI> transformations = getDiagramTransformationURIs();
+
+		monitor.subTask("Importing diagrams...");
+		for (URI transformationURI : transformations) {
+			result = runTransformation(transformationURI, context, monitor, extents);
+			generationStatus.add(result);
+		}
+
+		// Semantic model changes (Default language for OpaqueExpressions...)
+		monitor.subTask("Importing semantic model...");
+		result = runTransformation(getSemanticTransformationURI(), context, monitor, extents);
+		generationStatus.add(result);
+
+		monitor.subTask("Handle additional profiles...");
+		// Default.epx and ProfileBase.epx
+		result = importRSAProfiles(context, monitor);
+		generationStatus.add(result);
+
+		//
+		// FRAGMENTS & SAVE
+		//
+
+		if (generationStatus.getSeverity() <= Diagnostic.WARNING) {
+
+			monitor.subTask("Saving models...");
+			URI umlModelURI = null;
+			URI notationModelURI = null;
+			URI sashModelURI = null;
+			ResourceSet resourceSet = new ResourceSetImpl();
+
+			umlModelURI = convertToPapyrus(sourceURI, UMLResource.FILE_EXTENSION);
+			notationModelURI = convertToPapyrus(sourceURI, "notation"); // TODO use constant
+			sashModelURI = convertToPapyrus(sourceURI, "di"); // TODO use constant
+
+			uriMappings.put(sourceURI, umlModelURI);
+
+			umlResource = createUMLResource(resourceSet, umlModelURI);
+			List<EObject> outUMLObjects = getInOutUMLModel().getContents();
+			umlResource.getContents().addAll(outUMLObjects);
+
+			GMFResource notationResource = new GMFResource(notationModelURI); // GMF Resource content type?
+			resourceSet.getResources().add(notationResource);
+			List<EObject> outNotationObjects = getInoutNotationModel().getContents();
+			notationResource.getContents().addAll(outNotationObjects);
+
+			// Cleanup empty diagrams (FIXME: They should not be generated)
+			Iterator<EObject> iterator = notationResource.getContents().iterator();
+			while (iterator.hasNext()) {
+				EObject next = iterator.next();
+				if (next instanceof Diagram) {
+					Diagram diagram = (Diagram) next;
+					if (diagram.getType() == null || "".equals(diagram.getType())) {
+						iterator.remove();
+					}
+				}
+			}
+
+			XMIResource sashResource = new XMIResourceImpl(sashModelURI);
+			resourceSet.getResources().add(sashResource);
+			List<EObject> sashModelObjects = getOutSashModel().getContents();
+			sashResource.getContents().addAll(sashModelObjects);
+
+			configureResource(sashResource);
+			configureResource(notationResource);
+			configureResource((XMIResource) umlResource);
+
+			// Handle orphaned elements: remove them and log a warning
+			List<EObject> notationRootElements = new LinkedList<EObject>(notationResource.getContents());
+			for (EObject rootElement : notationRootElements) {
+				if (rootElement instanceof View) {
+					View rootView = (View) rootElement;
+					if (!(rootView instanceof Diagram)) {
+						String objectType = rootView.getElement() == null ? "None" : rootView.getElement().eClass().getName();
+						String viewType = rootView.getType() == null ? "None" : rootView.getType();
+						generationStatus.add(new Status(IStatus.WARNING, Activator.PLUGIN_ID, "An orphaned view has been found after the migration. It will be removed. View Type: " + viewType + ", semantic type: " + objectType));
+
+						notationResource.getContents().remove(rootElement);
+					}
+				} else if (rootElement instanceof Style) {
+					String styleType = rootElement.eClass().getName();
+					generationStatus.add(new Status(IStatus.WARNING, Activator.PLUGIN_ID, "An orphaned style has been found after the migration. It will be removed. Style Type: " + styleType));
+
+					notationResource.getContents().remove(rootElement);
+				}
+			}
+
+			Collection<Resource> resourcesToSave = handleFragments(umlResource, notationResource, sashResource);
+
+			for (Resource resource : resourcesToSave) {
+				try {
+					resource.save(null);
+				} catch (Exception ex) {
+					Activator.log.error(ex);
+				}
+			}
+		}
+
+		monitor.done();
+		return generationStatus;
+	}
+
+	protected IStatus importRSAProfiles(ExecutionContext context, IProgressMonitor monitor) {
+		URI transformationURI = getProfilesTransformationURI();
+
+		List<ModelExtent> extents = new LinkedList<ModelExtent>();
+		extents.add(getInOutUMLModel());
+		extents.add(getInoutNotationModel());
+		Diagnostic loadedProfiles = getInPapyrusProfiles();
+		extents.add(extractPapyrusProfiles(loadedProfiles));
+		extents.add(getInProfileDefinitions());
+		extents.add(getInConfig());
+
+		TransformationExecutor executor;
+		try {
+			executor = getTransformation(transformationURI, monitor);
+		} catch (DiagnosticException ex) {
+			Diagnostic diagnostic = ex.getDiagnostic();
+
+			Activator.log.warn(String.format("Cannot load the transformation : %s. Diagnostic: %s", transformationURI, diagnostic.getMessage()));
+			return BasicDiagnostic.toIStatus(diagnostic);
+		}
+
+		ExecutionDiagnostic transformationResult;
+		synchronized (executor) {
+			transformationResult = executor.execute(context, extents.toArray(new ModelExtent[0]));
+		}
+
+		IStatus loadedProfilesStatus = BasicDiagnostic.toIStatus(loadedProfiles);
+		IStatus transformationStatus = BasicDiagnostic.toIStatus(transformationResult);
+
+		int severity = Math.max(loadedProfiles.getSeverity(), transformationResult.getSeverity());
+
+		String message;
+		if (severity > IStatus.OK) {
+			message = "The following errors occurred:";
+		} else {
+			message = "OK";
+		}
+
+		IStatus completeResult = new MultiStatus(Activator.PLUGIN_ID, severity, new IStatus[] { loadedProfilesStatus, transformationStatus }, message, null);
+
+		return completeResult;
+	}
+
+	protected TransformationExecutor getTransformation(URI transformationURI, IProgressMonitor monitor) throws DiagnosticException {
+
+		if (!cacheTransformations) {
+			if (!localTransformations.containsKey(transformationURI)) {
+				TransformationExecutor executor = loadTransformationExecutor(transformationURI, monitor);
+				localTransformations.put(transformationURI, executor);
+			}
+			return localTransformations.get(transformationURI);
+		}
+
+		synchronized (sharedTransformations) {
+			if (!sharedTransformations.containsKey(transformationURI)) {
+				TransformationExecutor executor = loadTransformationExecutor(transformationURI, monitor);
+				sharedTransformations.put(transformationURI, executor);
+			}
+			return sharedTransformations.get(transformationURI);
+		}
+	}
+
+	// Static synchronized, as it seems that QVTo can't load 2 transformations at the same time, even in separate execution contexts
+	protected static synchronized TransformationExecutor loadTransformationExecutor(URI transformationURI, IProgressMonitor monitor) throws DiagnosticException {
+		TransformationExecutor executor = new TransformationExecutor(transformationURI);
+		Diagnostic diagnostic = executor.loadTransformation(monitor);
+
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			throw new DiagnosticException(diagnostic);
+		}
+
+		return executor;
+	}
+
+	protected Properties readProfileBaseProperties() {
+		URI propertiesURI = sourceURI.trimFileExtension().appendFileExtension("properties");
+
+		Properties properties = new Properties();
+		InputStream inputStream = null;
+
+		try {
+			URL url = new URL(propertiesURI.toString());
+			inputStream = url.openStream();
+			properties.load(inputStream);
+		} catch (FileNotFoundException ex) {
+			// Ignore: the file doesn't exist
+		} catch (IOException ex) {
+			Activator.log.error(ex);
+		} finally {
+			if (inputStream != null) {
+				try {
+					inputStream.close();
+				} catch (IOException ex) {
+					Activator.log.error(ex);
+				}
+			}
+		}
+
+		return properties;
+	}
+
+	protected IStatus importRTProfile(ExecutionContext context, IProgressMonitor monitor) {
+		monitor.subTask("Importing RT Profile... ");
+
+		URI transformationURI = getRTTransformationURI();
+
+		List<ModelExtent> extents = new LinkedList<ModelExtent>();
+		extents.add(getInOutUMLModel());
+		extents.add(getInoutNotationModel());
+		extents.add(extractPapyrusProfiles(getInPapyrusProfiles()));
+		extents.add(getInProfileDefinitions());
+		extents.add(getInConfig());
+
+		TransformationExecutor executor;
+		try {
+			executor = getTransformation(transformationURI, monitor);
+		} catch (DiagnosticException ex) {
+			Diagnostic diagnostic = ex.getDiagnostic();
+			Activator.log.warn(String.format("Cannot load the transformation : %s. Diagnostic: %s", transformationURI, diagnostic.getMessage()));
+			return BasicDiagnostic.toIStatus(diagnostic);
+		}
+
+		ExecutionDiagnostic result;
+		synchronized (executor) {
+			result = executor.execute(context, extents.toArray(new ModelExtent[0]));
+		}
+
+		return BasicDiagnostic.toIStatus(result);
+	}
+
+	protected ModelExtent extractPapyrusProfiles(Diagnostic diagnostic) {
+		for (Object extent : diagnostic.getData()) {
+			if (extent instanceof ModelExtent) {
+				return (ModelExtent) extent;
+			}
+		}
+		return null;
+	}
+
+	protected ModelExtent getInProfileDefinitions() {
+		return new BasicModelExtent(Arrays.asList(new EPackage[] {
+				PapyrusDSMLValidationRulePackage.eINSTANCE,
+				DocumentationPackage.eINSTANCE,
+				org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage.eINSTANCE,
+				UMLRealTimeStateMachPackage.eINSTANCE
+		}));
+	}
+
+	/**
+	 * Returns a Diagnostic. Diagnostic#data is the ModelExtent containing the loaded profiles
+	 *
+	 * @return
+	 * @throws WrappedException
+	 */
+	protected Diagnostic getInPapyrusProfiles() {
+		List<String> missingProfiles = new LinkedList<String>();
+
+
+		List<EObject> allContents = new LinkedList<EObject>();
+		try {
+			URI validationProfileURI = URI.createURI("pathmap://DSMLValidation_PROFILES/PapyrusValidationRuleDSML.uml");
+			Resource validationProfile = resourceSet.getResource(validationProfileURI, true);
+			checkResource(validationProfile);
+			allContents.addAll(validationProfile.getContents());
+		} catch (WrappedException ex) {
+			missingProfiles.add("Validation Rules Profile");
+		}
+
+		try {
+			URI documentationProfileURI = URI.createURI("pathmap://PAPYRUS_DOCUMENTATION/Papyrus.profile.uml");
+			Resource documentationProfile = resourceSet.getResource(documentationProfileURI, true);
+			checkResource(documentationProfile);
+			allContents.addAll(documentationProfile.getContents());
+		} catch (WrappedException ex) {
+			missingProfiles.add("Documentation Profile");
+		}
+
+		try {
+			URI umlrtProfileURI = URI.createURI("pathmap://UML_RT_PROFILE/uml-rt.profile.uml");
+			Resource umlrtProfile = resourceSet.getResource(umlrtProfileURI, true);
+			checkResource(umlrtProfile);
+			allContents.addAll(umlrtProfile.getContents());
+		} catch (WrappedException ex) {
+			missingProfiles.add("UML RT Profile");
+		}
+
+		try {
+			URI umlrtSMProfileURI = URI.createURI("pathmap://UML_RT_PROFILE/UMLRealTimeSM-addendum.profile.uml");
+			Resource umlrtSMProfile = resourceSet.getResource(umlrtSMProfileURI, true);
+			checkResource(umlrtSMProfile);
+			allContents.addAll(umlrtSMProfile.getContents());
+		} catch (WrappedException ex) {
+			missingProfiles.add("UML RT / StateMachine extension Profile");
+		}
+
+		ModelExtent result = new BasicModelExtent(allContents);
+
+		String message;
+		int code;
+		if (missingProfiles.isEmpty()) {
+			message = "OK";
+			code = Diagnostic.OK;
+		} else {
+			message = "The following Papyrus profiles cannot be found: " + ListHelper.deepToString(missingProfiles, ", ");
+			code = Diagnostic.ERROR;
+		}
+
+		Diagnostic diagnostic = new BasicDiagnostic(code, Activator.PLUGIN_ID, code, message, new ModelExtent[] { result });
+
+		return diagnostic;
+	}
+
+	protected void checkResource(Resource resource) {
+		Assert.isTrue(!resource.getContents().isEmpty(), "The resource " + resource.getURI() + " is empty");
+		for (EObject rootElement : resource.getContents()) {
+			Assert.isTrue(!rootElement.eIsProxy());
+		}
+	}
+
+	protected Resource createUMLResource(ResourceSet resourceSet, URI umlModelURI) {
+		return resourceSet.createResource(umlModelURI, UMLResource.UML_CONTENT_TYPE_IDENTIFIER);
+	}
+
+	protected ModelExtent getInConfig() {
+		if (inParameters == null) {
+			inParameters = new BasicModelExtent(Collections.singletonList(parameters));
+		}
+		return inParameters;
+	}
+
+	protected Collection<Resource> handleFragments(Resource umlResource, Resource notationResource, Resource sashResource) {
+		Collection<Resource> result = new HashSet<Resource>();
+		result.add(umlResource);
+		result.add(notationResource);
+		result.add(sashResource);
+
+		ResourceSet resourceSet = umlResource.getResourceSet();
+
+		Iterator<EObject> elementIterator = umlResource.getAllContents();
+
+		Set<Resource> fragmentResources = new HashSet<Resource>();
+
+		while (elementIterator.hasNext()) {
+			EObject element = elementIterator.next();
+			if (element.eResource() != umlResource && element.eResource().getContents().contains(element)) { // Controlled/Fragment root
+				fragmentResources.add(element.eResource());
+			}
+		}
+
+		for (Resource fragmentResource : fragmentResources) {
+			URI fragmentURI = convertToPapyrus(fragmentResource.getURI(), UMLResource.FILE_EXTENSION);
+
+			uriMappings.put(fragmentResource.getURI(), fragmentURI);
+
+			Resource newResource = resourceSet.getResource(fragmentURI, false);
+			if (newResource == null) {
+				newResource = createUMLResource(resourceSet, fragmentURI);
+
+				Resource fragmentNotationResource = new GMFResource(convertToPapyrus(fragmentURI, "notation"));
+				Resource fragmentDiResource = new XMIResourceImpl(convertToPapyrus(fragmentURI, "di"));
+
+				result.add(fragmentNotationResource);
+				result.add(fragmentDiResource);
+
+				resourceSet.getResources().add(fragmentNotationResource);
+				resourceSet.getResources().add(fragmentDiResource);
+			}
+
+			newResource.getContents().addAll(fragmentResource.getContents());
+			result.add(newResource);
+		}
+
+		deleteSourceRTStereotypes(fragmentResources);
+
+		List<EObject> importedElements = new LinkedList<EObject>(notationResource.getContents());
+		for (EObject notationElement : importedElements) {
+			if (notationElement instanceof Diagram) {
+				EObject semanticElement = ((Diagram) notationElement).getElement();
+				if (semanticElement.eResource() != umlResource && semanticElement.eResource() != null) {
+
+					URI notationFragmentURI = convertToPapyrus(semanticElement.eResource().getURI(), "notation");
+
+					Resource newNotationResource = resourceSet.getResource(notationFragmentURI, false);
+					if (newNotationResource == null) {
+						newNotationResource = new GMFResource(notationFragmentURI);
+						resourceSet.getResources().add(newNotationResource);
+					}
+					newNotationResource.getContents().add(notationElement);
+					result.add(newNotationResource);
+				}
+			}
+		}
+
+		return result;
+	}
+
+	protected void deleteSourceRTStereotypes(Collection<Resource> fragmentResources) {
+		Set<Resource> allResources = new HashSet<Resource>(fragmentResources);
+		allResources.add(umlResource);
+
+		for (Resource resource : allResources) {
+
+			// For performance reasons, RSA RT Stereotypes have not been deleted during the QVTo transformation (Bug 444379)
+			// Delete them as a post-action. Iterate on all controlled models and delete the RealTime stereotypes at the root of each resource
+			for (Iterator<EObject> rootsIterator = resource.getContents().iterator(); rootsIterator.hasNext();) {
+				EObject rootElement = rootsIterator.next();
+				if (rootElement.eClass().getEPackage() == org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage.eINSTANCE) {
+					rootsIterator.remove();
+				}
+			}
+
+		}
+	}
+
+	protected URI convertToPapyrus(URI rsaURI, String extension) {
+		if ("epx".equals(rsaURI.fileExtension())) { //$NON-NLS-1$
+			// Profiles: myProfile.profile.uml, myProfile.profile.notation, ...
+			return rsaURI.trimFileExtension().appendFileExtension("profile").appendFileExtension(extension); //$NON-NLS-1$
+		} else {
+			// Models and Fragments: myModel.uml, myFragment.uml, ...
+			return rsaURI.trimFileExtension().appendFileExtension(extension);
+		}
+	}
+
+	protected IStatus runTransformation(URI transformationURI, ExecutionContext context, IProgressMonitor monitor, List<ModelExtent> extents) {
+		TransformationExecutor executor;
+		try {
+			executor = getTransformation(transformationURI, monitor);
+		} catch (DiagnosticException ex) {
+			Diagnostic diagnostic = ex.getDiagnostic();
+
+			Activator.log.warn(String.format("Cannot load the transformation : %s. Diagnostic: %s", transformationURI, diagnostic.getMessage()));
+			return BasicDiagnostic.toIStatus(diagnostic);
+		}
+
+		ExecutionDiagnostic result;
+		synchronized (executor) {
+			result = executor.execute(context, extents.toArray(new ModelExtent[0]));
+		}
+
+		return BasicDiagnostic.toIStatus(result);
+	}
+
+	protected ExecutionContext createExecutionContext(final IProgressMonitor monitor, final MultiStatus generationStatus) {
+		ExecutionContextImpl context = new ExecutionContextImpl();
+		context.setConfigProperty("keepModeling", true); //$NON-NLS-1$o
+		context.setConfigProperty(TransformationUI.MONITOR, monitor);
+
+		// context.setProgressMonitor(monitor);
+
+		context.setLog(new WriterLog(new OutputStreamWriter(System.out)) {
+
+			@Override
+			public void log(String message) {
+				super.log(message);
+			}
+
+			@Override
+			public void log(String message, Object param) {
+				super.log(message, param);
+			}
+
+			@Override
+			public void log(int level, String message) {
+				super.log(level, message);
+				if (level >= 1) {
+					generationStatus.merge(new Status(level, Activator.PLUGIN_ID, message));
+				}
+
+			}
+
+			@Override
+			public void log(int level, String message, Object param) {
+				super.log(level, message, param);
+				if (level >= 1) {
+					generationStatus.merge(new Status(level, Activator.PLUGIN_ID, message + ", data:" + param));
+				}
+			}
+		});
+
+		initTransformationProperties(context);
+
+		return context;
+	}
+
+	/**
+	 * Initializes the ExecutionContext with configuration properties required by transformations
+	 *
+	 * This is a lightweight mechanism to avoid initializing ModelExtents for a single EObject reference, or for non-EMF values
+	 *
+	 * Typically used by blackbox methods
+	 *
+	 * @param context
+	 */
+	protected void initTransformationProperties(ExecutionContextImpl context) {
+		// Load the *.properties file associated to ProfileBase
+		context.setConfigProperty(ProfileBaseHelper.PROFILE_BASE_PROPERTIES, readProfileBaseProperties());
+
+		// Load the InnerClassDiagramView (From viewpoints)
+		URI innerClassDiagramViewURI = URI.createPlatformPluginURI("org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration", false);
+		innerClassDiagramViewURI = innerClassDiagramViewURI.appendFragment("//@viewpoints.0/@modelKinds.0");
+
+		context.setConfigProperty("InnerClassDiagramView", resourceSet.getEObject(innerClassDiagramViewURI, true));
+	}
+
+	protected void configureResource(XMIResource resource) {
+		Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+
+		// default save options.
+		saveOptions.put(XMIResource.OPTION_DECLARE_XML, Boolean.TRUE);
+		saveOptions.put(XMIResource.OPTION_PROCESS_DANGLING_HREF, XMIResource.OPTION_PROCESS_DANGLING_HREF_DISCARD);
+		saveOptions.put(XMIResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
+		saveOptions.put(XMIResource.OPTION_USE_XMI_TYPE, Boolean.TRUE);
+		saveOptions.put(XMIResource.OPTION_SAVE_TYPE_INFORMATION, Boolean.TRUE);
+		saveOptions.put(XMIResource.OPTION_SKIP_ESCAPE_URI, Boolean.FALSE);
+		saveOptions.put(XMIResource.OPTION_ENCODING, "UTF-8");
+
+		// see bug 397987: [Core][Save] The referenced plugin models are saved using relative path
+		saveOptions.put(XMIResource.OPTION_URI_HANDLER, new org.eclipse.emf.ecore.xmi.impl.URIHandlerImpl.PlatformSchemeAware());
+
+		resource.setEncoding("UTF-8");
+		resource.getDefaultSaveOptions().putAll(saveOptions);
+	}
+
+	protected List<ModelExtent> getModelExtents() {
+		List<ModelExtent> allExtents = new LinkedList<ModelExtent>();
+		allExtents.add(getInOutUMLModel());
+		allExtents.add(getInoutNotationModel());
+		allExtents.add(getOutSashModel());
+		allExtents.add(getInConfig());
+		return allExtents;
+	}
+
+	protected ModelExtent getInOutUMLModel() {
+		if (outUML == null) {
+			try {
+				Resource resource = resourceSet.getResource(sourceURI, true);
+
+				outUML = new BasicModelExtent(resource.getContents());
+
+			} catch (Exception ex) {
+				Activator.log.error(ex);
+			}
+		}
+
+		return outUML;
+	}
+
+	/* Notation model is initially empty, but will be filled successively by each transformation */
+	protected ModelExtent getInoutNotationModel() {
+		if (outNotation == null) {
+			outNotation = new BasicModelExtent();
+		}
+
+		return outNotation;
+	}
+
+	protected ModelExtent getOutSashModel() {
+		if (outSashModel == null) {
+			outSashModel = new BasicModelExtent();
+		}
+
+		return outSashModel;
+	}
+
+	static {
+		supportedDiagramIds.addAll(Arrays.asList(new String[] {
+				"Class", // Includes Profiles
+				"Object",
+				"Activity",
+				// "Component", //Not yet
+				"Sequence", // Not yet
+				"Statechart",
+				"Structure"
+		}));
+	}
+
+	protected Collection<URI> getDiagramTransformationURIs() {
+		return ListHelper.asList(new URI[] {
+				getTransformationURI("RSAClassDiagram"),
+				// getTransformationURI("RSASequenceDiagram"), //Disabled since Sequence Diagrams are not properly supported
+				getTransformationURI("RSAStructureDiagram"),
+				getTransformationURI("RSAActivityDiagram"),
+				getTransformationURI("RSAStateMachineDiagram"),
+				getTransformationURI("RSAProfileDiagram")
+		});
+	}
+
+	protected URI getSemanticTransformationURI() {
+		return getTransformationURI("RSAModelToPapyrus");
+	}
+
+	protected URI getRTTransformationURI() {
+		return getTransformationURI("RSARTToPapyrusRT");
+	}
+
+	protected URI getProfilesTransformationURI() {
+		return getTransformationURI("RSAProfilesToPapyrus");
+	}
+
+	protected Collection<URI> getAllTransformationURIs() {
+		Collection<URI> allTransformations = getDiagramTransformationURIs();
+		allTransformations.add(getRTTransformationURI());
+		allTransformations.add(getProfilesTransformationURI());
+		allTransformations.add(getSemanticTransformationURI());
+		return allTransformations;
+	}
+
+	protected URI getTransformationURI(String transformationName) {
+		return URI.createPlatformPluginURI(String.format("%s/transform/%s.qvto", Activator.PLUGIN_ID, transformationName), true); //$NON-NLS-1$
+	}
+
+	public String getModelName() {
+		return URI.decode(sourceURI.lastSegment());
+	}
+}
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAActivityDiagram.qvto b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAActivityDiagram.qvto
new file mode 100644
index 00000000000..632cc41ac76
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAActivityDiagram.qvto
@@ -0,0 +1,683 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+import RSAToPapyrus;
+
+modeltype notation "strict" uses 'http://www.eclipse.org/gmf/runtime/1.0.2/notation';
+modeltype umlNotation "strict" uses 'http://www.eclipse.org/papyrus/umlnotation';
+modeltype uml "strict" uses 'http://www.eclipse.org/uml2/5.0.0/UML';
+modeltype ecore "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
+modeltype sash "strict" uses 'http://www.eclipse.org/papyrus/0.7.0/sashdi';
+modeltype config "strict" uses 'http:///RSAToPapyrusParameters.ecore';
+
+transformation RSAActivityDiagram(inout semantics : uml, inout graphics : notation, out di : sash, in params : config);
+
+main() {
+	semantics.rootObjects()[uml::Element]->map toOwnedDiagrams();
+}
+
+query View::getDiagramType() : String{
+	return 'PapyrusUMLActivityDiagram';
+}
+
+mapping notation::Diagram::generateDiagram() : notation::Diagram inherits Diagram::toPapyrusDiagram when {
+	self.type = 'Activity'
+}{
+	end {
+		graphics.objectsOfType(Shape)->any(type = '2001').map fixFramePosition();
+		
+		graphics.objectsOfType(Shape)->select(type='3080').map addCommentDecoration();
+		graphics.objectsOfType(Shape)->select(type = '3112').map addConstraintDecoration();
+		
+		graphics.objectsOfType(Shape)->select(type = '3067').map fixPartitionsLayout();
+		
+		graphics.objectsOfType(Shape).map fixDefaultSize();
+	}
+}
+
+/**
+*	Fix the default size for Join, Fork, Merge and Decision nodes
+*/
+mapping inout Shape::fixDefaultSize() disjuncts Shape::fixJoinForkSize, Shape::fixMergeDecisionSize {
+	//Disjuncts
+}
+
+mapping inout Shape::fixJoinForkSize() when {
+	self.type = '3041' /* JoinNode */ or self.type = '3040' /* ForkNode */
+} {
+	var layout : Bounds := self.layoutConstraint.oclAsType(Bounds);
+	
+	if layout.width = -1 then layout.width := 101 endif;
+	if layout.height = -1 then layout.height := 11 endif; 
+}
+
+mapping inout Shape::fixMergeDecisionSize() when {
+	self.type = '3039' /* MergeNode */ or self.type = '3038' /* DecisionNode */
+} {
+	var layout : Bounds := self.layoutConstraint.oclAsType(Bounds);
+	
+	if layout.width = -1 then layout.width := 50 endif;
+	if layout.height = -1 then layout.height := 50 endif;
+}
+
+property partitionX : Integer = 50;
+
+mapping inout Shape::fixPartitionsLayout() {
+	var width: Integer := 200; //Approximation. In RSA, the layout is computed automatically based on the Partition's Contents. In Papyrus, this must be specified explicitely
+	var marginHeight := 30;
+	
+	
+	
+	var bounds : Bounds := self.layoutConstraint.oclAsType(Bounds); 
+	
+	var parentCompartment : DecorationNode := self.oclAsType(EObject).eContainer().oclAsType(DecorationNode);
+	var parent : Shape := parentCompartment.oclAsType(EObject).eContainer().oclAsType(Shape);
+	var parentBounds := parent.layoutConstraint.oclAsType(Bounds);
+	var parentHeight := parentBounds.height;
+	
+	var position : Integer;
+	
+	position := parentCompartment.children->select(type = '3067')->indexOf(self) - 1; //OCL index starts at 1 
+	
+	bounds.x := partitionX + position * width;
+	bounds.width := width.max(bounds.width);
+	bounds.y := marginHeight;
+	
+	bounds.height := (parentHeight - marginHeight * 2).max(bounds.height).max(400);
+}
+
+mapping inout Shape::addCommentDecoration() when {
+	self.type = '3080' and self.diagram.type = self.getDiagramType()
+} {
+	
+	self.children += object DecorationNode{
+		type := '5138';
+	}
+
+}
+
+mapping inout Shape::addConstraintDecoration() when {
+	self.type = '3112' and self.diagram.type = self.getDiagramType()
+} {
+	
+	self.children += object DecorationNode{
+		type := '5190'; //Constraint specification
+	}	
+
+}
+
+
+/* Add a margin on the top and left */
+mapping inout Shape::fixFramePosition() {
+	var bounds := self.layoutConstraint.oclAsType(Bounds);
+	var margin := 10;
+	if bounds.x < margin then bounds.x := margin endif;
+	if bounds.y < margin then bounds.y := margin endif;
+}
+
+mapping Node::toNode() : Node disjuncts
+	UMLShape::toPapyrusShape,
+	UMLShapeCompartment::toStructureCompartment,
+	BasicSemanticCompartment::toListCompartment,
+	BasicDecorationNode::toConnectorLabel,
+	BasicDecorationNode::toLabel
+	//TODO: Disjunct nodes mapping
+;
+
+mapping Edge::toEdge() : Edge disjuncts
+	UMLConnector::toPapyrusConnector
+	//TODO: Disjunct edges mapping
+;
+
+mapping UMLShapeCompartment::toStructureCompartment() : DecorationNode inherits UMLShapeCompartment::toAbstractStructureCompartment when {
+	self.type = 'StructureCompartment' or self.type = 'PackageContents' or self.type = 'ActivityCompartment' or self.type='PartitionCompartment' or self.type='StructuredActivityNodeCompartment' 
+	and not self.getType().oclIsUndefined();
+}{
+	
+}
+
+
+/***** Nodes **********/
+
+mapping UMLShape::toPapyrusShape() : Shape inherits Shape::toPapyrusShape when {
+	self.type = 'Activity Frame' or self.type = 'Partition' or (
+		self.type = '' and not self.getType().oclIsUndefined() and (
+			self.element.oclIsTypeOf(Constraint)or
+			self.element.oclIsTypeOf(FlowFinalNode)or
+			self.element.oclIsTypeOf(ActivityPartition)or
+			self.element.oclIsTypeOf(IntervalConstraint)or
+			self.element.oclIsTypeOf(ActionInputPin)or
+			self.element.oclIsTypeOf(BroadcastSignalAction)or
+			self.element.oclIsTypeOf(ActionInputPin)or
+			self.element.oclIsTypeOf(ValuePin)or
+			self.element.oclIsTypeOf(Constraint)or
+			self.element.oclIsTypeOf(ValuePin)or
+			self.element.oclIsTypeOf(SequenceNode)or
+			self.element.oclIsTypeOf(ActionInputPin)or
+			self.element.oclIsTypeOf(InputPin)or
+			self.element.oclIsTypeOf(OutputPin)or
+			self.element.oclIsTypeOf(InputPin)or
+			self.element.oclIsTypeOf(ReadSelfAction)or
+			self.element.oclIsTypeOf(ActivityFinalNode)or
+			self.element.oclIsTypeOf(InputPin)or
+			self.element.oclIsTypeOf(SendSignalAction)or
+			self.element.oclIsTypeOf(InitialNode)or
+			self.element.oclIsTypeOf(AddStructuralFeatureValueAction)or
+			self.element.oclIsTypeOf(OutputPin)or
+			self.element.oclIsTypeOf(DurationConstraint)or
+			self.element.oclIsTypeOf(OutputPin)or
+			self.element.oclIsTypeOf(LoopNode)or
+			self.element.oclIsTypeOf(OutputPin)or
+			self.element.oclIsTypeOf(ForkNode)or
+			self.element.oclIsTypeOf(ExpansionNode)or
+			self.element.oclIsTypeOf(ActionInputPin)or
+			self.element.oclIsTypeOf(InputPin)or
+			self.element.oclIsTypeOf(OutputPin)or
+			self.element.oclIsTypeOf(OutputPin)or
+			self.element.oclIsTypeOf(CallOperationAction)or
+			self.element.oclIsTypeOf(InputPin)or
+			self.element.oclIsTypeOf(IntervalConstraint)or
+			self.element.oclIsTypeOf(InputPin)or
+			self.element.oclIsTypeOf(Constraint)or
+			self.element.oclIsTypeOf(AddVariableValueAction)or
+			self.element.oclIsTypeOf(ExpansionNode)or
+			self.element.oclIsTypeOf(ValuePin)or
+			self.element.oclIsTypeOf(Parameter)or
+			self.element.oclIsTypeOf(ReadVariableAction)or
+			self.element.oclIsTypeOf(OpaqueAction)or
+			self.element.oclIsTypeOf(OutputPin)or
+			self.element.oclIsTypeOf(ValuePin)or
+			self.element.oclIsTypeOf(InputPin)or
+			self.element.oclIsTypeOf(InputPin)or
+			self.element.oclIsTypeOf(InputPin)or
+			self.element.oclIsTypeOf(OutputPin)or
+			self.element.oclIsTypeOf(InputPin)or
+			self.element.oclIsTypeOf(InputPin)or
+			self.element.oclIsTypeOf(InputPin)or
+			self.element.oclIsTypeOf(InterruptibleActivityRegion)or
+			self.element.oclIsTypeOf(Constraint)or
+			self.element.oclIsTypeOf(OutputPin)or
+			self.element.oclIsTypeOf(JoinNode)or
+			self.element.oclIsTypeOf(StructuredActivityNode)or
+			self.element.oclIsTypeOf(ConditionalNode)or
+			self.element.oclIsTypeOf(OutputPin)or
+			self.element.oclIsTypeOf(ActionInputPin)or
+			self.element.oclIsTypeOf(Constraint)or
+			self.element.oclIsTypeOf(TimeConstraint)or
+			self.element.oclIsTypeOf(DecisionNode)or
+			self.element.oclIsTypeOf(ActivityParameterNode)or
+			self.element.oclIsTypeOf(ActionInputPin)or
+			self.element.oclIsTypeOf(ActionInputPin)or
+			self.element.oclIsTypeOf(CentralBufferNode)or
+			self.element.oclIsTypeOf(Comment)or
+			self.element.oclIsTypeOf(DestroyObjectAction)or
+			self.element.oclIsTypeOf(CreateObjectAction)or
+			self.element.oclIsTypeOf(ValuePin)or
+			self.element.oclIsTypeOf(ValuePin)or
+			self.element.oclIsTypeOf(OutputPin)or
+			self.element.oclIsTypeOf(DataStoreNode)or
+			self.element.oclIsTypeOf(InputPin)or
+			self.element.oclIsTypeOf(ActionInputPin)or
+			self.element.oclIsTypeOf(CallBehaviorAction)or
+			self.element.oclIsTypeOf(ExpansionRegion)or
+			self.element.oclIsTypeOf(SendObjectAction)or
+			self.element.oclIsTypeOf(InputPin)or
+			self.element.oclIsTypeOf(InputPin)or
+			self.element.oclIsTypeOf(OutputPin)or
+			self.element.oclIsTypeOf(TimeConstraint)or
+			self.element.oclIsTypeOf(MergeNode)or
+			self.element.oclIsTypeOf(DurationConstraint)or
+			self.element.oclIsTypeOf(ValuePin)or
+			self.element.oclIsTypeOf(ValueSpecificationAction)or
+			self.element.oclIsTypeOf(AcceptEventAction)or
+			self.element.oclIsTypeOf(Activity)or
+			self.element.oclIsTypeOf(InputPin)or
+			self.element.oclIsTypeOf(ReadStructuralFeatureAction)or
+			self.element.oclIsTypeOf(OutputPin)or
+			self.element.oclIsTypeOf(ValuePin)
+		)
+	)
+}{
+	
+}
+
+
+/****** Connector Labels ******/
+
+mapping BasicDecorationNode::toConnectorLabel() : DecorationNode inherits Node::toPapyrusConnectorLabel when {
+	not self.getType().oclIsUndefined() and (
+		self.type = 'ToMultiplicityLabel' or
+		self.type = 'ToRoleLabel' or
+		self.type = 'FromMultiplicityLabel' or
+		self.type = 'FromRoleLabel' or
+		self.type = 'NameLabel' or
+		self.type = 'KindLabel'
+	)
+}{}
+
+
+/****** Compartments *******/
+
+mapping BasicDecorationNode::toLabel() : DecorationNode inherits Node::toPapyrusNode when {
+	not self.getType().oclIsUndefined() and
+	self.element.oclIsKindOf(uml::NamedElement) and 
+	(self.type = 'Name' or self.type = 'PartitionName')
+}{}
+
+mapping BasicSemanticCompartment::toListCompartment() : BasicCompartment inherits Node::toPapyrusNode, DrawerStyle::toDrawerStyle when {
+	self.type.endsWith('Compartment') and not self.getType().oclIsUndefined()
+}{
+	result.children := self.findElement().map toContents(self);
+}
+
+mapping Element::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	Activity::toContents
+;
+
+mapping Activity::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	Activity::toActivityFigureParameterCompartmentContents,
+	Activity::toActivityFigurePreconditionCompartmentContents,
+	Activity::toActivityFigurePostCondtionCompartmentContents
+;
+
+mapping Activity::toActivityFigureParameterCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'Compartment';
+}{
+	init {
+		result := (self.map fillParameter(node))
+	}
+}
+
+mapping Activity::toActivityFigurePreconditionCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'Compartment';
+}{
+	init {
+		result := (self.map fillConstraint(node))
+	}
+}
+
+mapping Activity::toActivityFigurePostCondtionCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'Compartment';
+}{
+	init {
+		result := (self.map fillConstraint(node))
+	}
+}
+
+mapping uml::Activity::fillParameter(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='Compartment';
+}{
+	init {
+		result := self.ownedParameter->selectByKind(Parameter).map toParameterInActivity(node)->asSequence();
+	}
+}
+
+mapping uml::Activity::fillConstraint(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='Compartment';
+}{
+	init {
+		result := self.precondition->selectByKind(Constraint).map toConstraintInActivity(node)->asSequence();
+	}
+}
+
+mapping Parameter::toParameterInActivity(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3001';
+}
+
+mapping Constraint::toConstraintInActivity(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3002';
+}
+
+
+
+/******* Edges ********/
+
+
+mapping UMLConnector::toPapyrusConnector() : Connector inherits Connector::toPapyrusConnector when {
+	self.type = '' and 
+	not self.getType().oclIsUndefined() and (
+		self.element.oclIsTypeOf(ObjectFlow)or
+		self.element.oclIsTypeOf(ControlFlow)or
+		self.element.oclIsTypeOf(ExceptionHandler)
+	)
+}{
+	result.styles := self.map toFontStyle();
+}
+
+/****** Element Type queries ******/
+
+query View::getNodeType(element : Element) : String {
+	return
+		if element.oclIsTypeOf(Constraint) then '3112'
+		elif element.oclIsTypeOf(Constraint) then '3002'
+		elif element.oclIsTypeOf(Constraint) then '3003'
+		elif element.oclIsTypeOf(Constraint) then '3011'
+		elif element.oclIsTypeOf(Constraint) then '3012'
+		
+		elif element.oclIsTypeOf(IntervalConstraint) then '3033'
+		elif element.oclIsTypeOf(IntervalConstraint) then '3032' 		
+		elif element.oclIsTypeOf(DurationConstraint) then '3035'
+		elif element.oclIsTypeOf(TimeConstraint) then '3036'
+		elif element.oclIsTypeOf(TimeConstraint) then '3037'
+		elif element.oclIsTypeOf(DurationConstraint) then '3034'
+		
+		elif element.oclIsTypeOf(FlowFinalNode) then '3006' 
+		elif element.oclIsTypeOf(ActivityPartition) then '3067' 
+		 
+		elif element.oclIsTypeOf(ActionInputPin) then '3053' 
+		elif element.oclIsTypeOf(BroadcastSignalAction) then '3102' 
+		elif element.oclIsTypeOf(ActionInputPin) then '3050' 
+		elif element.oclIsTypeOf(ValuePin) then '3022' 
+		 
+		elif element.oclIsTypeOf(ValuePin) then '3060' 
+		elif element.oclIsTypeOf(SequenceNode) then '3073' 
+		elif element.oclIsTypeOf(ActionInputPin) then '3021' 
+		elif element.oclIsTypeOf(InputPin) then '3092' 
+		elif element.oclIsTypeOf(OutputPin) then '3087' 
+		elif element.oclIsTypeOf(InputPin) then '3051' 
+		elif element.oclIsTypeOf(ReadSelfAction) then '3081' 
+		elif element.oclIsTypeOf(ActivityFinalNode) then '3005' 
+		elif element.oclIsTypeOf(InputPin) then '3062' 
+		elif element.oclIsTypeOf(SendSignalAction) then '3052' 
+		elif element.oclIsTypeOf(InitialNode) then '3004' 
+		elif element.oclIsTypeOf(AddStructuralFeatureValueAction) then '3091' 
+		elif element.oclIsTypeOf(OutputPin) then '3109' 
+		 
+		elif element.oclIsTypeOf(OutputPin) then '3111' 
+		elif element.oclIsTypeOf(LoopNode) then '3071' 
+		elif element.oclIsTypeOf(OutputPin) then '3014' 
+		elif element.oclIsTypeOf(ForkNode) then '3040' 
+		elif element.oclIsTypeOf(ExpansionNode) then '3074' 
+		elif element.oclIsTypeOf(ActionInputPin) then '3018' 
+		elif element.oclIsTypeOf(InputPin) then '3013' 
+		elif element.oclIsTypeOf(OutputPin) then '3090' 
+		elif element.oclIsTypeOf(OutputPin) then '3064' 
+		elif element.oclIsTypeOf(CallOperationAction) then '3010' 
+		elif element.oclIsTypeOf(InputPin) then '3027' 
+		
+		elif element.oclIsTypeOf(InputPin) then '3105' 
+		 
+		elif element.oclIsTypeOf(AddVariableValueAction) then '3099' 
+		elif element.oclIsTypeOf(ExpansionNode) then '3075' 
+		elif element.oclIsTypeOf(ValuePin) then '3017' 
+		elif element.oclIsTypeOf(Parameter) then '3001' 
+		elif element.oclIsTypeOf(ReadVariableAction) then '3097' 
+		elif element.oclIsTypeOf(OpaqueAction) then '3007' 
+		elif element.oclIsTypeOf(OutputPin) then '3077' 
+		elif element.oclIsTypeOf(ValuePin) then '3046' 
+		elif element.oclIsTypeOf(InputPin) then '3023' 
+		elif element.oclIsTypeOf(InputPin) then '3096' 
+		elif element.oclIsTypeOf(InputPin) then '3055' 
+		elif element.oclIsTypeOf(OutputPin) then '3110' 
+		elif element.oclIsTypeOf(InputPin) then '3019' 
+		elif element.oclIsTypeOf(InputPin) then '3100' 
+		elif element.oclIsTypeOf(InputPin) then '3093' 
+		elif element.oclIsTypeOf(InterruptibleActivityRegion) then '3068' 
+		 
+		elif element.oclIsTypeOf(OutputPin) then '3094' 
+		elif element.oclIsTypeOf(JoinNode) then '3041' 
+		elif element.oclIsTypeOf(StructuredActivityNode) then '3065' 
+		elif element.oclIsTypeOf(ConditionalNode) then '3069' 
+		elif element.oclIsTypeOf(OutputPin) then '3024' 
+		elif element.oclIsTypeOf(ActionInputPin) then '3047' 
+		 
+		 
+		elif element.oclIsTypeOf(DecisionNode) then '3038' 
+		elif element.oclIsTypeOf(ActivityParameterNode) then '3059' 
+		elif element.oclIsTypeOf(ActionInputPin) then '3061' 
+		elif element.oclIsTypeOf(ActionInputPin) then '3016' 
+		elif element.oclIsTypeOf(CentralBufferNode) then '3104' 
+		elif element.oclIsTypeOf(Comment) then '3080' 
+		elif element.oclIsTypeOf(DestroyObjectAction) then '3095' 
+		elif element.oclIsTypeOf(CreateObjectAction) then '3086' 
+		elif element.oclIsTypeOf(ValuePin) then '3025' 
+		elif element.oclIsTypeOf(ValuePin) then '3054' 
+		elif element.oclIsTypeOf(OutputPin) then '3098' 
+		elif element.oclIsTypeOf(DataStoreNode) then '3078' 
+		elif element.oclIsTypeOf(InputPin) then '3089' 
+		elif element.oclIsTypeOf(ActionInputPin) then '3026' 
+		elif element.oclIsTypeOf(CallBehaviorAction) then '3008' 
+		elif element.oclIsTypeOf(ExpansionRegion) then '3070' 
+		elif element.oclIsTypeOf(SendObjectAction) then '3042' 
+		elif element.oclIsTypeOf(InputPin) then '3048' 
+		elif element.oclIsTypeOf(InputPin) then '3101' 
+		elif element.oclIsTypeOf(OutputPin) then '3020' 
+		 
+		elif element.oclIsTypeOf(MergeNode) then '3039' 
+		 
+		elif element.oclIsTypeOf(ValuePin) then '3015' 
+		elif element.oclIsTypeOf(ValueSpecificationAction) then '3076' 
+		elif element.oclIsTypeOf(AcceptEventAction) then '3063' 
+		elif element.oclIsTypeOf(Activity) then '2001' 
+		elif element.oclIsTypeOf(InputPin) then '3103' 
+		elif element.oclIsTypeOf(ReadStructuralFeatureAction) then '3088' 
+		elif element.oclIsTypeOf(OutputPin) then '3084' 
+		elif element.oclIsTypeOf(ValuePin) then '3049' 
+		else self.fail()
+	endif;
+}
+
+
+query View::getDecorationType(element : Element) : String{
+	var res := self.doGetDecorationType(element);
+	
+	/*
+	log('Get papyrus ID for'+ self.element.eClass().name+', '+self.type);
+	
+	log(res);
+	
+	if self.container().oclIsKindOf(Node) then 
+		log('IsNode')
+	else 
+		log('IsEdge')
+	endif;
+	*/
+	
+	return res;
+	
+}
+
+query View::doGetDecorationType(element : Element) : String{
+	return if self.container().oclIsKindOf(Node) then {
+		return if element.oclIsTypeOf(ActivityPartition) then
+			return switch {
+				case (self.type = 'PartitionName') '5118';
+				case (self.type = 'PartitionCompartment') '7006';
+			}
+			elif element.oclIsTypeOf(Constraint) then
+				return switch {
+					case (self.type = 'Name') '5189';
+				}
+			elif element.oclIsTypeOf(IntervalConstraint) then
+				return switch {
+					case (self.type = 'Name') '5037';
+					
+				}
+			elif element.oclIsTypeOf(BroadcastSignalAction) then
+				return switch {
+					case (self.type = 'Name') '5175';
+					
+				}
+			elif element.oclIsTypeOf(SequenceNode) then
+				return switch {
+					
+					case (self.type = 'StructureCompartment') '7012';
+				}
+			elif element.oclIsTypeOf(ReadSelfAction) then
+				return switch {
+					case (self.type = 'Name') '5139';
+					
+				}
+			elif element.oclIsTypeOf(SendSignalAction) then
+				return switch {
+					case (self.type = 'Name') '5060';
+					
+				}
+			elif element.oclIsTypeOf(AddStructuralFeatureValueAction) then
+				return switch {
+					case (self.type = 'Name') '5160';
+					
+				}
+			elif element.oclIsTypeOf(DurationConstraint) then
+				return switch {
+					case (self.type = 'Name') '5039';
+					
+				}
+			elif element.oclIsTypeOf(LoopNode) then
+				return switch {
+					
+					case (self.type = 'StructureCompartment') '7010';
+				}
+			elif element.oclIsTypeOf(CallOperationAction) then
+				return switch {
+					case (self.type = 'Name') '5006';
+					
+				}
+			elif element.oclIsTypeOf(IntervalConstraint) then
+				return switch {
+					case (self.type = 'Name') '5036';
+					
+				}
+			elif element.oclIsTypeOf(Constraint) then
+				return switch {
+					case (self.type = 'Name') '5007';
+					
+				}
+			elif element.oclIsTypeOf(AddVariableValueAction) then
+				return switch {
+					case (self.type = 'Name') '5171';
+					
+				}
+			elif element.oclIsTypeOf(ReadVariableAction) then
+				return switch {
+					case (self.type = 'Name') '5166';
+					
+				}
+			elif element.oclIsTypeOf(OpaqueAction) then
+				return switch {
+					case (self.type = 'Name') '5003';
+					
+				}
+			elif element.oclIsTypeOf(InterruptibleActivityRegion) then
+				return switch {
+					
+					case (self.type = 'StructureCompartment') '7007';
+				}
+			elif element.oclIsTypeOf(Constraint) then
+				return switch {
+					case (self.type = 'Name') '5008';
+					
+				}
+			elif element.oclIsTypeOf(StructuredActivityNode) then
+				return switch {
+					case (self.type = 'Name') '5117';
+					case (self.type = 'StructuredActivityNodeCompartment') '7005';
+				}
+			elif element.oclIsTypeOf(ConditionalNode) then
+				return switch {
+					
+					case (self.type = 'StructureCompartment') '7008';
+				}
+			elif element.oclIsTypeOf(TimeConstraint) then
+				return switch {
+					case (self.type = 'Name') '5040';
+					
+				}
+			elif element.oclIsTypeOf(ActivityParameterNode) then
+				return switch {
+					case (self.type = 'Name') '5071';
+					
+				}
+			elif element.oclIsTypeOf(DestroyObjectAction) then
+				return switch {
+					case (self.type = 'Name') '5163';
+					
+				}
+			elif element.oclIsTypeOf(CreateObjectAction) then
+				return switch {
+					case (self.type = 'Name') '5148';
+					
+				}
+			elif element.oclIsTypeOf(CallBehaviorAction) then
+				return switch {
+					case (self.type = 'Name') '5004';
+					
+				}
+			elif element.oclIsTypeOf(ExpansionRegion) then
+				return switch {
+					
+					case (self.type = 'StructureCompartment') '7009';
+				}
+			elif element.oclIsTypeOf(SendObjectAction) then
+				return switch {
+					case (self.type = 'Name') '5059';
+					
+				}
+			elif element.oclIsTypeOf(TimeConstraint) then
+				return switch {
+					case (self.type = 'Name') '5041';
+					
+				}
+			elif element.oclIsTypeOf(DurationConstraint) then
+				return switch {
+					case (self.type = 'Name') '5038';
+					
+				}
+			elif element.oclIsTypeOf(ValueSpecificationAction) then
+				return switch {
+					case (self.type = 'Name') '5126';
+					
+				}
+			elif element.oclIsTypeOf(Activity) then
+				return switch {
+					case (self.type = 'Name') '5001';
+					case (self.type = 'Compartment') '7001';
+					case (self.type = 'Compartment') '7002';
+					case (self.type = 'Compartment') '7003';
+					case (self.type = 'ActivityCompartment') '7004';
+				}
+			elif element.oclIsTypeOf(ReadStructuralFeatureAction) then
+				return switch {
+					case (self.type = 'Name') '5153';
+				}
+			elif element.oclIsTypeOf(AcceptEventAction) then 
+				return switch {
+					case (self.type = 'Name') '5078';
+				}
+		endif
+	} else {
+		return if element.oclIsTypeOf(ObjectFlow)  then
+			return switch {
+				case (self.type='Name') '6001';		
+				case (self.type = 'NameLabel') '6001';
+				case (self.type = 'KindLabel') '6010';
+				
+			}
+			elif element.oclIsTypeOf(ControlFlow)  then
+				return switch {
+					case (self.type='Name') '6003';		
+					case (self.type = 'NameLabel') '6003';
+					case (self.type = 'KindLabel') '6011';
+				}
+		endif
+	} endif;
+}
+
+
+query View::getEdgeType(element : Element) : String {
+	return
+		if element.oclIsTypeOf(ObjectFlow) then '4003'
+		elif element.oclIsTypeOf(ControlFlow) then '4004'
+		elif element.oclIsTypeOf(ExceptionHandler) then '4005'
+		else self.fail()
+	endif;
+}
+
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAClassDiagram.qvto b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAClassDiagram.qvto
new file mode 100644
index 00000000000..d5db2c12816
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAClassDiagram.qvto
@@ -0,0 +1,1273 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+import RSAToPapyrus;
+import org.eclipse.papyrus.m2m.qvto.Properties;
+
+modeltype notation "strict" uses 'http://www.eclipse.org/gmf/runtime/1.0.2/notation';
+modeltype umlNotation "strict" uses 'http://www.eclipse.org/papyrus/umlnotation';
+modeltype uml "strict" uses 'http://www.eclipse.org/uml2/5.0.0/UML';
+modeltype ecore "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
+modeltype sash "strict" uses 'http://www.eclipse.org/papyrus/0.7.0/sashdi';
+modeltype vpconfig "strict" uses 'http://www.eclipse.org/papyrus/infra/viewpoints/configuration';
+modeltype vpstyle "strict" uses 'http://www.eclipse.org/papyrus/infra/viewpoints/policy/style';
+modeltype config "strict" uses 'http:///RSAToPapyrusParameters.ecore';
+
+transformation RSAClassDiagram(inout semantics : uml, inout graphics : notation, out di : sash, in param : config);
+
+main() {
+	semantics.rootObjects()[uml::Element]->map toOwnedDiagrams();
+}
+
+query View::getDiagramType() : String{
+	return 'PapyrusUMLClassDiagram';
+}
+
+
+
+mapping notation::Diagram::generateDiagram() : notation::Diagram inherits Diagram::toPapyrusDiagram when {
+	(self.type = 'Class' or self.type='Object') and not self.findElement().oclIsTypeOf(Profile)
+}{
+
+	end {
+	
+		/* Post action: Move AssociationClasses to the right parent (Dashed Edge + Node) */
+		/* Easier to do in post-treatment than during the transformation (The transformation can remain generic) */
+		result.map handleAssociationClasses();
+		graphics.objectsOfType(Shape)->select(type = '2012').map addCommentDecoration();
+		graphics.objectsOfType(Shape)->select(type = '2011').map addConstraintDecoration();
+		if not result.element.oclIsKindOf(Package) then
+			result.map toInnerClassDiagram()
+		endif;
+	}
+}
+
+mapping inout Diagram::toInnerClassDiagram() : PapyrusViewStyle{
+	result.owner := self.element;
+	result._configuration := getInnerClassDiagramView();
+	
+	self.styles += result;
+}
+
+query getInnerClassDiagramView() : PapyrusDiagram {
+	return getEObjectProperty('InnerClassDiagramView').oclAsType(PapyrusDiagram);
+}
+
+mapping inout Shape::addCommentDecoration() when {
+	self.type = '2012' and self.diagram.type = self.getDiagramType()
+} {
+	
+	self.children += object DecorationNode{
+		type := '5038'; //Comment body
+	}	
+
+}
+
+mapping inout Shape::addConstraintDecoration() when {
+	self.type = '2011' and self.diagram.type = self.getDiagramType()
+} {
+	
+	self.children += object DecorationNode{
+		type := '5159'; //Constraint specification
+	}	
+
+}
+
+mapping inout Diagram::handleAssociationClasses() {
+	graphics.objectsOfType(Shape)->select(type = '2013').map updateLocation();
+
+	self.children := self.children->union(graphics.objectsOfType(Node)->select(type = '2013'));
+	self.edges := self.edges->union(graphics.objectsOfType(Connector)->select(type = '4016'));
+}
+
+mapping inout Shape::updateLocation() {
+	var dashedEdge := graphics.objectsOfType(Connector)->select(type = '4016' and source = self or target = self)->any(true);
+	
+	var association := dashedEdge.findConnector();
+	
+	var source := association.source.oclAsType(Shape);
+	var target := association.target.oclAsType(Shape); 
+	
+	var sourcePosition := source.getBounds();
+	var targetPosition := target.getBounds();
+	
+	var bounds := self.getBounds();
+	
+	bounds.x := (((sourcePosition.x + targetPosition.x)/2) + bounds.x).round(); 
+	bounds.y := (((sourcePosition.y + targetPosition.y)/2) + bounds.y).round();
+}
+	
+query Connector::findConnector() : Connector {
+	var view := if self.source.oclIsKindOf(Connector) then self.source else self.target endif;
+	return view.oclAsType(Connector);
+}
+
+query Shape::getBounds() : Bounds {
+	return self.oclAsType(Shape).layoutConstraint.oclAsType(Bounds);
+}
+
+/**
+*	In Papyrus, an AssociationClass is composed of two edges and a Node (Full edge for association, dashed edge for Association class, Node for the class)
+*	In RSA, an AssociationClass is a single Edge with compartments
+*/
+mapping UMLConnector::toAssociationClass() : Connector inherits Connector::toPapyrusConnector when {
+	self.element.oclIsTypeOf(AssociationClass)
+}{
+	result.styles := self.map toFontStyle();
+	var dashedEdge := object Connector {
+		type := '4016';
+		target := self.children->selectByKind(UMLShape)->any(true).map toPapyrusShape();
+		source := result;
+		styles := object FontStyle{};
+		bendpoints := object RelativeBendpoints{};
+		sourceAnchor := object IdentityAnchor{};
+		targetAnchor := object IdentityAnchor{};
+		
+	};
+	
+
+}
+
+
+mapping Node::toNode() : Node disjuncts
+	UMLShape::toPapyrusShape,
+	UMLShapeCompartment::toStructureCompartment,
+	BasicSemanticCompartment::toListCompartment,
+	ListCompartment::toListCompartment,
+	BasicDecorationNode::toConnectorLabel,
+	BasicDecorationNode::toLabel
+	//TODO: Disjunct nodes mapping
+;
+
+mapping Edge::toEdge() : Edge disjuncts
+	UMLConnector::toPapyrusConnector,
+	UMLConnector::toGeneralizationConnector,
+	UMLConnector::toAssociationClass,
+	UMLConnector::toCommentLink,
+	UMLConnector::toConstraintLink,
+	UMLConnector::toContextLink
+;
+
+mapping UMLShapeCompartment::toStructureCompartment() : DecorationNode inherits UMLShapeCompartment::toAbstractStructureCompartment when {
+	self.type = 'StructureCompartment' or self.type = 'PackageContents' and not self.getType().oclIsUndefined();
+}{
+	
+}
+
+
+/***** Nodes **********/
+
+mapping UMLShape::toPapyrusShape() : Shape inherits Shape::toPapyrusShape when {
+	self.type = '' and (
+		self.element.oclIsTypeOf(Dependency)or
+	self.element.oclIsTypeOf(AssociationClass)or
+	self.element.oclIsTypeOf(Association)or
+	self.element.oclIsTypeOf(InstanceSpecification)or
+	self.element.oclIsTypeOf(Component)or
+	self.element.oclIsTypeOf(Signal)or
+	self.element.oclIsTypeOf(Interface)or
+	self.element.oclIsTypeOf(Model)or
+	self.element.oclIsTypeOf(Enumeration)or
+	self.element.oclIsTypeOf(Package)or
+	self.element.oclIsTypeOf(InformationItem)or
+	self.element.oclIsTypeOf(Class)or
+	self.element.oclIsTypeOf(PrimitiveType)or
+	self.element.oclIsTypeOf(DataType)or
+	self.element.oclIsTypeOf(Constraint)or
+	self.element.oclIsTypeOf(Comment)or
+	self.element.oclIsTypeOf(Diagram)or
+	self.element.oclIsTypeOf(DurationObservation)or
+	self.element.oclIsTypeOf(TimeObservation)
+	)
+}{
+	
+}
+
+
+/****** Connector Labels ******/
+
+mapping BasicDecorationNode::toConnectorLabel() : DecorationNode inherits Node::toPapyrusConnectorLabel when {
+		self.type = 'ToMultiplicityLabel' or
+		self.type = 'ToRoleLabel' or
+		self.type = 'FromMultiplicityLabel' or
+		self.type = 'FromRoleLabel' or
+		self.type = 'NameLabel' or
+		self.type = 'KindLabel'
+}{
+	
+}
+
+/****** Compartments *******/
+
+mapping BasicDecorationNode::toLabel() : DecorationNode inherits Node::toPapyrusNode when {
+	self.element.oclIsKindOf(uml::NamedElement) and 
+	self.type = 'Name'
+}{
+	
+}
+
+//Synchronized Compartments
+mapping BasicSemanticCompartment::toListCompartment() : BasicCompartment inherits Node::toPapyrusNode, DrawerStyle::toDrawerStyle when {
+	//TODO: EndsWith('Compartment')
+	self.type = 'OperationCompartment' or
+	self.type = 'SignalCompartment' or
+	self.type = 'AttributeCompartment' or
+	self.type.endsWith('Compartment')
+}{
+	result.children += self.findElement().map toContents(self);
+}
+
+//Standard Compartments (e.g. slots)
+mapping ListCompartment::toListCompartment() : BasicCompartment inherits Node::toPapyrusNode, DrawerStyle::toDrawerStyle when {
+	self.type.endsWith('Compartment')
+} {
+	//Super class implementation is sufficient. It will already transform the children and set the compartment ID
+	result.children += self.findElement().map toContents(self);
+}
+
+mapping Element::toContents(node : ListCompartment) : Sequence(Node) disjuncts 
+	InstanceSpecification::toContents
+;
+
+mapping Element::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	AssociationClass::toContents,
+	Component::toContents,
+	Signal::toContents,
+	Interface::toContents,
+	Enumeration::toContents,
+	Class::toContents,
+	PrimitiveType::toContents,
+	DataType::toContents
+;
+
+mapping AssociationClass::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	AssociationClass::toAttributeCompartmentContents,
+	AssociationClass::toOperationCompartmentContents,
+	AssociationClass::toNestedClassifierCompartmentContents
+;
+
+mapping InstanceSpecification::toContents(node : ListCompartment) : Sequence(Node) disjuncts
+	InstanceSpecification::toSlotCompartmentContents
+;
+
+mapping Component::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	Component::toAttributeCompartmentContents,
+	Component::toOperationCompartmentContents,
+	Component::toNestedClassifierCompartmentContents
+;
+
+mapping Signal::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	Signal::toAttributeCompartmentContents
+;
+
+mapping Interface::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	Interface::toAttributeCompartmentContents,
+	Interface::toOperationCompartmentContents,
+	Interface::toNestedClassifierCompartmentContents
+;
+
+mapping Enumeration::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	Enumeration::toEnumerationLiteralCompartmentContents
+;
+
+mapping Class::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	Class::toAttributeCompartmentContents,
+	Class::toOperationCompartmentContents,
+	Class::toNestedClassifierCompartmentContents
+;
+
+mapping PrimitiveType::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	PrimitiveType::toAttributeCompartmentContents,
+	PrimitiveType::toOperationCompartmentContents
+;
+
+mapping DataType::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	DataType::toAttributeCompartmentContents,
+	DataType::toOperationCompartmentContents
+;
+
+mapping AssociationClass::toAttributeCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'AttributeCompartment';
+}{
+	init {
+		result := (self.map fillProperty(node))
+	}
+}
+
+mapping AssociationClass::toOperationCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'OperationCompartment';
+}{
+	init {
+		result := (self.map fillOperation(node))
+	}
+}
+
+mapping AssociationClass::toNestedClassifierCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'SignalCompartment';
+}{
+	init {
+		result := (self.map fillClass(node))
+	}
+}
+
+mapping InstanceSpecification::toSlotCompartmentContents(node : ListCompartment) : Sequence(Node) when {
+	node.type = 'SlotCompartment';
+}{
+	init {
+		result := (self.map fillSlot(node))
+	}
+}
+
+mapping Component::toAttributeCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'AttributeCompartment';
+}{
+	init {
+		result := (self.map fillProperty(node))
+	}
+}
+
+mapping Component::toOperationCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'OperationCompartment';
+}{
+	init {
+		result := (self.map fillOperation(node))
+	->union(self.map fillReception(node))
+	}
+}
+
+mapping Component::toNestedClassifierCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'SignalCompartment';
+}{
+	init {
+		result := (self.map fillClass(node))
+	->union(self.map fillInterface(node))
+	->union(self.map fillEnumeration(node))
+	->union(self.map fillPrimitiveType(node))
+	->union(self.map fillDataType(node))
+	->union(self.map fillSignal(node))
+	}
+}
+
+mapping Signal::toAttributeCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'AttributeCompartment';
+}{
+	init {
+		result := (self.map fillProperty(node))
+	}
+}
+
+mapping Interface::toAttributeCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'AttributeCompartment';
+}{
+	init {
+		result := (self.map fillProperty(node))
+	}
+}
+
+mapping Interface::toOperationCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'OperationCompartment';
+}{
+	init {
+		result := (self.map fillOperation(node))
+	->union(self.map fillReception(node))
+	}
+}
+
+mapping Interface::toNestedClassifierCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'SignalCompartment';
+}{
+	init {
+		result := (self.map fillClass(node))
+	->union(self.map fillInterface(node))
+	->union(self.map fillEnumeration(node))
+	->union(self.map fillPrimitiveType(node))
+	->union(self.map fillDataType(node))
+	->union(self.map fillSignal(node))
+	}
+}
+
+mapping Enumeration::toEnumerationLiteralCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'EnumerationCompartment';
+}{
+	init {
+		result := (self.map fillEnumerationLiteral(node))
+	}
+}
+
+mapping Class::toAttributeCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'AttributeCompartment';
+}{
+	init {
+		result := (self.map fillProperty(node))
+	}
+}
+
+mapping Class::toOperationCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'OperationCompartment';
+}{
+	init {
+		result := (self.map fillReception(node))
+	->union(self.map fillOperation(node))
+	}
+}
+
+mapping Class::toNestedClassifierCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'SignalCompartment';
+}{
+	init {
+		result := (self.map fillClass(node))
+	->union(self.map fillInterface(node))
+	->union(self.map fillEnumeration(node))
+	->union(self.map fillPrimitiveType(node))
+	->union(self.map fillDataType(node))
+	->union(self.map fillSignal(node))
+	}
+}
+
+mapping PrimitiveType::toAttributeCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'AttributeCompartment';
+}{
+	init {
+		result := (self.map fillProperty(node))
+	}
+}
+
+mapping PrimitiveType::toOperationCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'OperationCompartment';
+}{
+	init {
+		result := (self.map fillOperation(node))
+	}
+}
+
+mapping DataType::toAttributeCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'AttributeCompartment';
+}{
+	init {
+		result := (self.map fillProperty(node))
+	}
+}
+
+mapping DataType::toOperationCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'OperationCompartment';
+}{
+	init {
+		result := (self.map fillOperation(node))
+	}
+}
+
+mapping uml::Class::fillProperty(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='AttributeCompartment';
+}{
+	init {
+		result := self.ownedAttribute->selectByKind(Property)->select(association.oclIsUndefined()).map toPropertyInClass(node)->asSequence();
+	}
+}
+
+mapping uml::Component::fillProperty(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='AttributeCompartment';
+}{
+	init {
+		result := self.ownedAttribute->selectByKind(Property)->select(association.oclIsUndefined()).map toPropertyInComponent(node)->asSequence();
+	}
+}
+
+mapping uml::Signal::fillProperty(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='AttributeCompartment';
+}{
+	init {
+		result := self.ownedAttribute->selectByKind(Property)->select(association.oclIsUndefined()).map toPropertyInSignal(node)->asSequence();
+	}
+}
+
+mapping uml::Interface::fillProperty(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='AttributeCompartment';
+}{
+	init {
+		result := self.ownedAttribute->selectByKind(Property)->select(association.oclIsUndefined()).map toPropertyInInterface(node)->asSequence();
+	}
+}
+
+mapping uml::PrimitiveType::fillProperty(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='AttributeCompartment';
+}{
+	init {
+		result := self.ownedAttribute->selectByKind(Property)->select(association.oclIsUndefined()).map toPropertyInPrimitiveType(node)->asSequence();
+	}
+}
+
+mapping uml::DataType::fillProperty(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='AttributeCompartment';
+}{
+	init {
+		result := self.ownedAttribute->selectByKind(Property)->select(association.oclIsUndefined()).map toPropertyInDataType(node)->asSequence();
+	}
+}
+
+mapping uml::Class::fillClass(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='SignalCompartment';
+}{
+	init {
+		result := self.nestedClassifier->selectByKind(Class).map toClassInClass(node)->asSequence();
+	}
+}
+
+mapping uml::Component::fillClass(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='SignalCompartment';
+}{
+	init {
+		result := self.nestedClassifier->selectByKind(Class).map toClassInComponent(node)->asSequence();
+	}
+}
+
+mapping uml::Interface::fillClass(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='SignalCompartment';
+}{
+	init {
+		result := self.nestedClassifier->selectByKind(Class).map toClassInInterface(node)->asSequence();
+	}
+}
+
+mapping uml::Class::fillOperation(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='OperationCompartment';
+}{
+	init {
+		result := self.ownedOperation->selectByKind(Operation).map toOperationInClass(node)->asSequence();
+	}
+}
+
+mapping uml::Component::fillOperation(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='OperationCompartment';
+}{
+	init {
+		result := self.ownedOperation->selectByKind(Operation).map toOperationInComponent(node)->asSequence();
+	}
+}
+
+mapping uml::Interface::fillOperation(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='OperationCompartment';
+}{
+	init {
+		result := self.ownedOperation->selectByKind(Operation).map toOperationInInterface(node)->asSequence();
+	}
+}
+
+mapping uml::PrimitiveType::fillOperation(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='OperationCompartment';
+}{
+	init {
+		result := self.ownedOperation->selectByKind(Operation).map toOperationInPrimitiveType(node)->asSequence();
+	}
+}
+
+mapping uml::DataType::fillOperation(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='OperationCompartment';
+}{
+	init {
+		result := self.ownedOperation->selectByKind(Operation).map toOperationInDataType(node)->asSequence();
+	}
+}
+
+mapping uml::RedefinableTemplateSignature::fillConnectableElementTemplateParameter(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='TemplateParameterCompartment';
+}{
+	init {
+		result := self.parameter->selectByKind(ConnectableElementTemplateParameter).map toConnectableElementTemplateParameterInRedefinableTemplateSignature(node)->asSequence();
+	}
+}
+
+mapping uml::TemplateSignature::fillOperationTemplateParameter(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='TemplateParameterCompartment';
+}{
+	init {
+		result := self.parameter->selectByKind(OperationTemplateParameter).map toOperationTemplateParameterInTemplateSignature(node)->asSequence();
+	}
+}
+
+mapping uml::RedefinableTemplateSignature::fillClassifierTemplateParameter(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='TemplateParameterCompartment';
+}{
+	init {
+		result := self.parameter->selectByKind(ClassifierTemplateParameter).map toClassifierTemplateParameterInRedefinableTemplateSignature(node)->asSequence();
+	}
+}
+
+mapping uml::RedefinableTemplateSignature::fillTemplateParameter(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='TemplateParameterCompartment';
+}{
+	init {
+		result := self.parameter->selectByKind(TemplateParameter).map toTemplateParameterInRedefinableTemplateSignature(node)->asSequence();
+	}
+}
+
+mapping uml::Enumeration::fillEnumerationLiteral(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='EnumerationCompartment';
+}{
+	init {
+		result := self.ownedLiteral->selectByKind(EnumerationLiteral).map toEnumerationLiteralInEnumeration(node)->asSequence();
+	}
+}
+
+mapping uml::Class::fillReception(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='OperationCompartment';
+}{
+	init {
+		result := self.ownedReception->selectByKind(Reception).map toReceptionInClass(node)->asSequence();
+	}
+}
+
+mapping uml::Interface::fillReception(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='OperationCompartment';
+}{
+	init {
+		result := self.ownedReception->selectByKind(Reception).map toReceptionInInterface(node)->asSequence();
+	}
+}
+
+mapping uml::InstanceSpecification::fillSlot(node : ListCompartment) : Sequence(Node) when {
+	node.type='SlotCompartment';
+}{
+	init {
+		result := self.slot->selectByKind(Slot).map toSlotInInstanceSpecification(node)->asSequence();
+	}
+}
+
+mapping uml::Class::fillInterface(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='SignalCompartment';
+}{
+	init {
+		result := self.nestedClassifier->selectByKind(Interface).map toInterfaceInClass(node)->asSequence();
+	}
+}
+
+mapping uml::Component::fillInterface(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='SignalCompartment';
+}{
+	init {
+		result := self.nestedClassifier->selectByKind(Interface).map toInterfaceInComponent(node)->asSequence();
+	}
+}
+
+mapping uml::Interface::fillInterface(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='SignalCompartment';
+}{
+	init {
+		result := self.nestedClassifier->selectByKind(Interface).map toInterfaceInInterface(node)->asSequence();
+	}
+}
+
+mapping uml::Class::fillEnumeration(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='SignalCompartment';
+}{
+	init {
+		result := self.nestedClassifier->selectByKind(Enumeration).map toEnumerationInClass(node)->asSequence();
+	}
+}
+
+mapping uml::Component::fillEnumeration(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='SignalCompartment';
+}{
+	init {
+		result := self.nestedClassifier->selectByKind(Enumeration).map toEnumerationInComponent(node)->asSequence();
+	}
+}
+
+mapping uml::Interface::fillEnumeration(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='SignalCompartment';
+}{
+	init {
+		result := self.nestedClassifier->selectByKind(Enumeration).map toEnumerationInInterface(node)->asSequence();
+	}
+}
+
+mapping uml::Class::fillPrimitiveType(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='SignalCompartment';
+}{
+	init {
+		result := self.nestedClassifier->selectByKind(PrimitiveType).map toPrimitiveTypeInClass(node)->asSequence();
+	}
+}
+
+mapping uml::Component::fillPrimitiveType(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='SignalCompartment';
+}{
+	init {
+		result := self.nestedClassifier->selectByKind(PrimitiveType).map toPrimitiveTypeInComponent(node)->asSequence();
+	}
+}
+
+mapping uml::Interface::fillPrimitiveType(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='SignalCompartment';
+}{
+	init {
+		result := self.nestedClassifier->selectByKind(PrimitiveType).map toPrimitiveTypeInInterface(node)->asSequence();
+	}
+}
+
+mapping uml::Class::fillDataType(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='SignalCompartment';
+}{
+	init {
+		result := self.nestedClassifier->selectByKind(DataType).map toDataTypeInClass(node)->asSequence();
+	}
+}
+
+mapping uml::Component::fillDataType(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='SignalCompartment';
+}{
+	init {
+		result := self.nestedClassifier->selectByKind(DataType).map toDataTypeInComponent(node)->asSequence();
+	}
+}
+
+mapping uml::Interface::fillDataType(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='SignalCompartment';
+}{
+	init {
+		result := self.nestedClassifier->selectByKind(DataType).map toDataTypeInInterface(node)->asSequence();
+	}
+}
+
+mapping uml::Class::fillSignal(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='SignalCompartment';
+}{
+	init {
+		result := self.nestedClassifier->selectByKind(Signal).map toSignalInClass(node)->asSequence();
+	}
+}
+
+mapping uml::Component::fillSignal(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='SignalCompartment';
+}{
+	init {
+		result := self.nestedClassifier->selectByKind(Signal).map toSignalInComponent(node)->asSequence();
+	}
+}
+
+mapping uml::Interface::fillSignal(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='SignalCompartment';
+}{
+	init {
+		result := self.nestedClassifier->selectByKind(Signal).map toSignalInInterface(node)->asSequence();
+	}
+}
+
+mapping Property::toPropertyInClass(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3012';
+}
+
+mapping Property::toPropertyInComponent(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3002';
+}
+
+mapping Property::toPropertyInSignal(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3005';
+}
+
+mapping Property::toPropertyInInterface(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3006';
+}
+
+mapping Property::toPropertyInPrimitiveType(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3041';
+}
+
+mapping Property::toPropertyInDataType(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3018';
+}
+
+mapping Class::toClassInClass(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3014';
+}
+
+mapping Class::toClassInComponent(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3004';
+}
+
+mapping Class::toClassInInterface(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3008';
+}
+
+mapping Operation::toOperationInClass(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3013';
+}
+
+mapping Operation::toOperationInComponent(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3003';
+}
+
+mapping Operation::toOperationInInterface(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3007';
+}
+
+mapping Operation::toOperationInPrimitiveType(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3042';
+}
+
+mapping Operation::toOperationInDataType(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3019';
+}
+
+mapping ConnectableElementTemplateParameter::toConnectableElementTemplateParameterInRedefinableTemplateSignature(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3034';
+}
+
+mapping OperationTemplateParameter::toOperationTemplateParameterInTemplateSignature(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3035';
+}
+
+mapping ClassifierTemplateParameter::toClassifierTemplateParameterInRedefinableTemplateSignature(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3031';
+}
+
+mapping TemplateParameter::toTemplateParameterInRedefinableTemplateSignature(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3016';
+}
+
+mapping EnumerationLiteral::toEnumerationLiteralInEnumeration(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3017';
+}
+
+mapping Reception::toReceptionInClass(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3011';
+}
+
+mapping Reception::toReceptionInInterface(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3039';
+}
+
+mapping Slot::toSlotInInstanceSpecification(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3030';
+}
+
+mapping Interface::toInterfaceInClass(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3036';
+}
+
+mapping Interface::toInterfaceInComponent(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3037';
+}
+
+mapping Interface::toInterfaceInInterface(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3038';
+}
+
+mapping Enumeration::toEnumerationInClass(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3052';
+}
+
+mapping Enumeration::toEnumerationInComponent(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3053';
+}
+
+mapping Enumeration::toEnumerationInInterface(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3054';
+}
+
+mapping PrimitiveType::toPrimitiveTypeInClass(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3047';
+}
+
+mapping PrimitiveType::toPrimitiveTypeInComponent(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3046';
+}
+
+mapping PrimitiveType::toPrimitiveTypeInInterface(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3048';
+}
+
+mapping DataType::toDataTypeInClass(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3044';
+}
+
+mapping DataType::toDataTypeInComponent(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3045';
+}
+
+mapping DataType::toDataTypeInInterface(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3043';
+}
+
+mapping Signal::toSignalInClass(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3050';
+}
+
+mapping Signal::toSignalInComponent(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3051';
+}
+
+mapping Signal::toSignalInInterface(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3049';
+}
+
+
+
+/******* Edges ********/
+
+
+mapping UMLConnector::toPapyrusConnector() : Connector inherits Connector::toPapyrusConnector when {
+	self.type = '' and (
+		/*self.element.oclIsTypeOf(AssociationClass)or*/
+		self.element.oclIsTypeOf(Association)or
+		self.element.oclIsTypeOf(Association)or
+		self.element.oclIsTypeOf(InterfaceRealization)or
+		self.element.oclIsTypeOf(Substitution)or
+		self.element.oclIsTypeOf(Realization)or
+		self.element.oclIsTypeOf(Abstraction)or
+		self.element.oclIsTypeOf(Usage)or
+		self.element.oclIsTypeOf(Dependency)or
+		self.element.oclIsTypeOf(Dependency)or
+		self.element.oclIsTypeOf(ElementImport)or
+		self.element.oclIsTypeOf(PackageImport)or
+		self.element.oclIsTypeOf(PackageMerge)or
+		self.element.oclIsTypeOf(ProfileApplication)or
+		self.element.oclIsTypeOf(TemplateBinding)or
+		self.element.oclIsTypeOf(GeneralizationSet)or
+		self.element.oclIsTypeOf(InstanceSpecification)or
+		self.element.oclIsTypeOf(InformationFlow)
+		
+	)
+}{
+	result.styles := self.map toFontStyle();
+}
+
+mapping UMLConnector::toGeneralizationConnector() : Connector inherits Connector::toPapyrusConnector when {
+	self.type='' and self.element.oclIsTypeOf(Generalization)
+}{
+	result.children->forEach(element){
+		element.type:='6007'
+	};
+	result.styles := self.map toFontStyle();
+	result.sourceAnchor := object IdentityAnchor{};
+	result.targetAnchor := object IdentityAnchor{};
+	
+}
+
+mapping UMLConnector::toCommentLink() : Connector inherits Connector::toCommentLink when{
+	self.type='Reference' and ( 
+	 	self.source.element.oclIsTypeOf(Comment) or 
+	 	self.target.element.oclIsKindOf(Comment)
+	)
+}{
+	result.type :='4013';
+	result.bendpoints := self.bendpoints.map toBendpoint(self.diagram);
+	result.sourceAnchor := object IdentityAnchor{};		
+}
+
+mapping UMLConnector::toConstraintLink() : Connector inherits Connector::toPapyrusConnector when{
+	self.type='Reference' and ( 
+	 	self.source.element.oclIsTypeOf(Constraint) or 
+	 	self.target.element.oclIsKindOf(Constraint)
+	)
+}{	
+	result.type :='4014';
+	result.bendpoints := self.bendpoints.map toBendpoint(self.diagram);
+	result.sourceAnchor := object IdentityAnchor{};		
+}
+
+mapping UMLConnector::toContextLink() : Connector inherits Connector::toPapyrusConnector when{
+		self.type='Reference' and ( 
+	 	self.source.element.oclIsTypeOf(Constraint) or 
+	 	self.target.element.oclIsKindOf(Constraint)
+	)
+}{	
+	result.type :='8500';
+	result.bendpoints := self.bendpoints.map toBendpoint(self.diagram);
+	result.sourceAnchor := object IdentityAnchor{};		
+	result.children += object DecorationNode {
+		type := '8501';
+		layoutConstraint := object Location {
+			y := 15;
+		}
+	}
+}
+
+
+/****** Element Type queries ******/
+
+query View::getNodeType(element : Element) : String {
+	return
+		if element.oclIsTypeOf(Dependency) then '2014' 
+		elif element.oclIsTypeOf(AssociationClass) then '2013' 
+		elif element.oclIsTypeOf(Association) then '2015' 
+		elif element.oclIsTypeOf(InstanceSpecification) then '2001' 
+		elif element.oclIsTypeOf(Component) then '2002' 
+		elif element.oclIsTypeOf(Signal) then '2003' 
+		elif element.oclIsTypeOf(Interface) then '2004' 
+		elif element.oclIsTypeOf(Model) then '2005' 
+		elif element.oclIsTypeOf(Enumeration) then '2006' 
+		elif element.oclIsTypeOf(Package) then '2007' 
+		elif element.oclIsTypeOf(InformationItem) then '2099' 
+		elif element.oclIsTypeOf(Class) then '2008' 
+		elif element.oclIsTypeOf(PrimitiveType) then '2009' 
+		elif element.oclIsTypeOf(DataType) then '2010' 
+		elif element.oclIsTypeOf(Constraint) then '2011' 
+		elif element.oclIsTypeOf(Comment) then '2012' 
+		elif element.oclIsTypeOf(Diagram) then '2016' 
+		elif element.oclIsTypeOf(DurationObservation) then '2095' 
+		elif element.oclIsTypeOf(TimeObservation) then '2096' 
+		else self.fail()
+	endif;
+}
+
+
+query View::getDecorationType(element : Element) : String{
+	var res := self.doGetDecorationType(element);
+
+	/*log('Get papyrus ID for'+ element.oclAsType(EObject).eClass().name+', '+self.type);
+	
+	log(res);
+	
+	if self.container().oclIsKindOf(Node) then 
+		log('IsNode')
+	else 
+		log('IsEdge')
+	endif;*/
+	
+	return res;	
+}
+
+query View::doGetDecorationType(element : Element) : String{
+	
+	return if self.container().oclIsKindOf(Node) then {
+		return if element.oclIsKindOf(AssociationClass) then
+			return switch {
+				case (self.type = 'Name') '5066';
+				case (self.type = 'AttributeCompartment') '7034';
+				case (self.type = 'OperationCompartment') '7036';
+				case (self.type = 'SignalCompartment') '7037';
+			}
+		elif element.oclIsKindOf(InstanceSpecification) then
+			return switch {
+				case (self.type = 'Name') '5002';
+				case (self.type = 'SlotCompartment') '7001';
+			}
+		elif element.oclIsKindOf(Component) then
+			return switch {
+				case (self.type = 'Name') '5005';
+				case (self.type = 'AttributeCompartment') '7002';
+			case (self.type = 'OperationCompartment') '7003';
+			case (self.type = 'SignalCompartment') '7004';
+			}
+		elif element.oclIsKindOf(Signal) then
+			return switch {
+				case (self.type = 'Name') '5008';
+				case (self.type = 'AttributeCompartment') '7005';
+			}
+		elif element.oclIsKindOf(Interface) then
+			return switch {
+				case (self.type = 'Name') '5011';
+				case (self.type = 'AttributeCompartment') '7006';
+				case (self.type = 'OperationCompartment') '7007';
+				case (self.type = 'SignalCompartment') '7008';
+			}
+		elif element.oclIsKindOf(Model) then
+			return switch {
+				case (self.type = 'Name') '5020';
+				case (self.type = 'PackageContents') '7009';
+			}
+		elif element.oclIsKindOf(Enumeration) then
+			return switch {
+				case (self.type = 'Name') '5023';
+				case (self.type = 'EnumerationCompartment') '7015';
+			}
+		elif element.oclIsKindOf(Package) then
+			return switch {
+				case (self.type = 'Name') '5026';
+				case (self.type = 'PackageContents') '7016';
+			}
+		elif element.oclIsKindOf(InformationItem) then
+			return switch {
+				case (self.type = 'Name') '5161';
+				
+			}
+		elif element.oclIsKindOf(Class) then
+			return switch {
+				case (self.type = 'Name') '5029';
+				case (self.type = 'AttributeCompartment') '7017';
+				case (self.type = 'OperationCompartment') '7018';
+				case (self.type = 'SignalCompartment') '7019';
+			}
+		elif element.oclIsKindOf(PrimitiveType) then
+			return switch {
+				case (self.type = 'Name') '5032';
+				case (self.type = 'AttributeCompartment') '7039';
+				case (self.type = 'OperationCompartment') '7040';
+			}
+		elif element.oclIsKindOf(DataType) then
+			return switch {
+				case (self.type = 'Name') '5035';
+				case (self.type = 'AttributeCompartment') '7020';
+				case (self.type = 'OperationCompartment') '7021';
+			}
+		elif element.oclIsKindOf(Constraint) then
+			return switch {
+				case (self.type = 'Name') '5037';
+				
+			}
+		elif element.oclIsKindOf(Diagram) then
+			return switch {
+				case (self.type = 'Name') '0';
+				
+			}
+		elif element.oclIsKindOf(DurationObservation) then
+			return switch {
+				case (self.type = 'Name') '5155';
+				
+			}
+		elif element.oclIsKindOf(TimeObservation) then
+			return switch {
+				case (self.type = 'Name') '5153';
+				
+			}
+		endif
+	} else {
+		return if element.oclIsKindOf(Association) then
+			return switch {
+				case (self.type='Name') '6002';		
+				case (self.type = 'KindLabel') '6001';
+				case (self.type = 'NameLabel') '6002';
+			}
+		elif element.oclIsKindOf(Property) then 
+			return if element.oclAsType(Property).association.oclIsTypeOf(Association) then
+				return switch {
+					case (self.type = 'ToRoleLabel') '6003';
+				
+					case (self.type = 'FromRoleLabel') '6005';
+					
+					case (self.type = 'FromMultiplicityLabel') '6033';
+					
+					case (self.type = 'ToMultiplicityLabel') '6034';
+				}
+			elif element.oclAsType(Property).association.oclIsTypeOf(AssociationClass) then
+				return switch {
+					case (self.type = 'ToRoleLabel') '6032';
+					case (self.type = 'FromRoleLabel') '6031';
+				}
+			endif
+		elif element.oclIsKindOf(Generalization) then
+			return switch {
+						
+				case (self.type = 'KindLabel') '6007';
+			}
+		
+		elif element.oclIsKindOf(InterfaceRealization) then
+			return switch {
+				case (self.type='Name') '6009';		
+				case (self.type = 'KindLabel') '6008';
+				case (self.type = 'NameLabel') '6009';
+			}
+		
+		elif element.oclIsKindOf(Substitution) then
+			return switch {
+				case (self.type='Name') '6011';		
+				case (self.type = 'KindLabel') '6010';
+				case (self.type = 'NameLabel') '6011';
+			}
+		
+		elif element.oclIsKindOf(Realization) then
+			return switch {
+				case (self.type='Name') '6013';		
+				case (self.type = 'KindLabel') '6012';
+				case (self.type = 'NameLabel') '6013';
+			}
+		
+		elif element.oclIsKindOf(Abstraction) then
+			return switch {
+				case (self.type='Name') '6014';		
+				case (self.type = 'NameLabel') '6014';
+				case (self.type = 'KindLabel') '6015';
+			}
+		
+		elif element.oclIsKindOf(Usage) then
+			return switch {
+				case (self.type='Name') '6016';		
+				case (self.type = 'NameLabel') '6016';
+				case (self.type = 'KindLabel') '6017';
+			}
+		
+		elif element.oclIsKindOf(Dependency) then
+			return switch {
+				case (self.type='Name') '6026';		
+				case (self.type = 'NameLabel') '6026';
+				case (self.type = 'KindLabel') '6027';
+			}
+
+		elif element.oclIsKindOf(ElementImport) then
+			return switch {
+						
+				
+				case (self.type = 'KindLabel') '6021';
+			}
+		
+		elif element.oclIsKindOf(PackageImport) then
+			return switch {
+						
+				case (self.type = 'KindLabel') '6022';
+			}
+		
+		elif element.oclIsKindOf(PackageMerge) then
+			return switch {
+						
+				case (self.type = 'KindLabel') '6030';
+			}
+		
+		elif element.oclIsKindOf(TemplateBinding) then
+			return switch {
+						
+				
+				case (self.type = 'KindLabel') '6036';
+			}
+		
+		elif element.oclIsKindOf(GeneralizationSet) then
+			return switch {
+						
+				
+				case (self.type = 'KindLabel') '6037';
+			}
+
+		elif element.oclIsKindOf(InformationFlow) then
+			return switch {
+						
+				
+				case (self.type = 'KindLabel') '6041';
+			}		
+		endif;
+	} endif;
+}
+
+
+query View::getEdgeType(element : Element) : String {
+	return
+		if element.oclIsTypeOf(AssociationClass) then '4017'
+		elif element.oclIsTypeOf(Association) then '4001'
+		elif element.oclIsTypeOf(Association) then '4019'
+		elif element.oclIsTypeOf(Generalization) then '4002'
+		elif element.oclIsTypeOf(InterfaceRealization) then '4003'
+		elif element.oclIsTypeOf(Substitution) then '4004'
+		elif element.oclIsTypeOf(Realization) then '4005'
+		elif element.oclIsTypeOf(Abstraction) then '4006'
+		elif element.oclIsTypeOf(Usage) then '4007'
+		elif element.oclIsTypeOf(Dependency) then '4008'
+		elif element.oclIsTypeOf(Dependency) then '4018'
+		elif element.oclIsTypeOf(ElementImport) then '4009'
+		elif element.oclIsTypeOf(PackageImport) then '4010'
+		elif element.oclIsTypeOf(PackageMerge) then '4011'
+		elif element.oclIsTypeOf(ProfileApplication) then '4012'
+		elif element.oclIsTypeOf(Comment) then'4013'
+		elif element.oclIsTypeOf(TemplateBinding) then '4015'
+		elif element.oclIsTypeOf(GeneralizationSet) then '4020'
+		elif element.oclIsTypeOf(InstanceSpecification) then '4021'
+		elif element.oclIsTypeOf(InformationFlow) then '4026'
+		else self.fail()
+	endif;
+}
+
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAComponentDiagram.qvto b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAComponentDiagram.qvto
new file mode 100644
index 00000000000..d56d54f5bbb
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAComponentDiagram.qvto
@@ -0,0 +1,306 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+import RSAToPapyrus;
+
+modeltype notation "strict" uses 'http://www.eclipse.org/gmf/runtime/1.0.2/notation';
+modeltype umlNotation "strict" uses 'http://www.eclipse.org/papyrus/umlnotation';
+modeltype uml "strict" uses 'http://www.eclipse.org/uml2/5.0.0/UML';
+modeltype ecore "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
+modeltype config "strict" uses 'http:///RSAToPapyrusParameters.ecore';
+
+transformation RSAComponentDiagram(inout semantics : uml, out graphics : notation, in param : config) extends RSAToPapyrus;
+
+query View::getDiagramType() : String{
+	return 'PapyrusUMLComponentDiagram';
+}
+
+mapping notation::Diagram::toPapyrusComponentDiagram() : notation::Diagram inherits Diagram::toPapyrusDiagram when {
+	self.type = 'Component'
+}{
+	
+}
+
+mapping Node::toNode() : Node disjuncts
+	UMLShape::toPapyrusShape,
+	UMLShapeCompartment::toStructureCompartment,
+	BasicSemanticCompartment::toListCompartment,
+	BasicDecorationNode::toConnectorLabel,
+	BasicDecorationNode::toLabel
+	//TODO: Disjunct nodes mapping
+;
+
+mapping Edge::toEdge() : Edge disjuncts
+	UMLConnector::toPapyrusConnector
+	//TODO: Disjunct edges mapping
+;
+
+mapping UMLShapeCompartment::toStructureCompartment() : DecorationNode inherits UMLShapeCompartment::toAbstractStructureCompartment when {
+	self.type = 'StructureCompartment' or self.type = 'PackageContents' and not self.getType().oclIsUndefined();
+}{
+	
+}
+
+
+/***** Nodes **********/
+
+mapping UMLShape::toPapyrusShape() : Shape inherits Shape::toPapyrusShape when {
+	self.type = '' and not self.getType().oclIsUndefined() and (
+		self.element.oclIsTypeOf(Component)or
+	self.element.oclIsTypeOf(Dependency)or
+	self.element.oclIsTypeOf(Package)or
+	self.element.oclIsTypeOf(Port)or
+	self.element.oclIsTypeOf(Comment)or
+	self.element.oclIsTypeOf(Interface)or
+	self.element.oclIsTypeOf(Model)or
+	self.element.oclIsTypeOf(Property)or
+	self.element.oclIsTypeOf(Constraint)or
+	self.element.oclIsTypeOf(Operation)or
+	self.element.oclIsTypeOf(Reception)
+	)
+}{
+	
+}
+
+
+/****** Connector Labels ******/
+
+mapping BasicDecorationNode::toConnectorLabel() : DecorationNode inherits Node::toPapyrusConnectorLabel when {
+	not self.getType().oclIsUndefined() and (
+		self.type = 'ToMultiplicityLabel' or
+		self.type = 'ToRoleLabel' or
+		self.type = 'FromMultiplicityLabel' or
+		self.type = 'FromRoleLabel' or
+		self.type = 'NameLabel' or
+		self.type = 'KindLabel'
+	)
+}{}
+
+/****** Compartments *******/
+
+mapping BasicDecorationNode::toLabel() : DecorationNode inherits Node::toPapyrusNode when {
+	not self.getType().oclIsUndefined() and
+	self.element.oclIsKindOf(uml::NamedElement) and 
+	self.type = 'Name'
+}{}
+
+mapping BasicSemanticCompartment::toListCompartment() : BasicCompartment inherits Node::toPapyrusNode, DrawerStyle::toDrawerStyle when {
+	self.type.endsWith('Compartment') and not self.getType().oclIsUndefined()
+}{
+	result.children := self.findElement().map toContents(self);
+}
+
+mapping Element::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	Interface::toContents
+;
+
+mapping Interface::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	Interface::toAttributeCompartmentContents,
+	Interface::toOperationCompartmentContents
+;
+
+mapping Interface::toAttributeCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'AttributeCompartment';
+}{
+	init {
+		result := (self.map fillProperty(node))
+	}
+}
+
+mapping Interface::toOperationCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'ReceptionCompartment';
+}{
+	init {
+		result := (self.map fillOperation(node))
+	->union(self.map fillReception(node))
+	}
+}
+
+mapping uml::Interface::fillProperty(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='AttributeCompartment';
+}{
+	init {
+		result := self.ownedAttribute->selectByKind(Property).map toPropertyInInterface(node)->asSequence();
+	}
+}
+
+mapping uml::Interface::fillOperation(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='ReceptionCompartment';
+}{
+	init {
+		result := self.ownedOperation->selectByKind(Operation).map toOperationInInterface(node)->asSequence();
+	}
+}
+
+mapping uml::Interface::fillReception(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='ReceptionCompartment';
+}{
+	init {
+		result := self.ownedReception->selectByKind(Reception).map toReceptionInInterface(node)->asSequence();
+	}
+}
+
+mapping Property::toPropertyInInterface(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '1';
+}
+
+mapping Operation::toOperationInInterface(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '5';
+}
+
+mapping Reception::toReceptionInInterface(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '6';
+}
+
+
+
+/******* Edges ********/
+
+
+mapping UMLConnector::toPapyrusConnector() : Connector inherits Connector::toPapyrusConnector when {
+	self.type = '' and 
+	not self.getType().oclIsUndefined() and (
+		self.element.oclIsTypeOf(Usage)or
+		self.element.oclIsTypeOf(InterfaceRealization)or
+		self.element.oclIsTypeOf(Generalization)or
+		self.element.oclIsTypeOf(Substitution)or
+		self.element.oclIsTypeOf(Manifestation)or
+		self.element.oclIsTypeOf(ComponentRealization)or
+		self.element.oclIsTypeOf(Abstraction)or
+		self.element.oclIsTypeOf(Dependency)or
+		self.element.oclIsTypeOf(Dependency)
+	)
+}{
+	result.styles := self.map toFontStyle();
+}
+
+/****** Element Type queries ******/
+
+query View::getNodeType(element : Element) : String {
+	return
+		if element.oclIsTypeOf(Component) then '2002' 
+		elif element.oclIsTypeOf(Dependency) then '3203' 
+		elif element.oclIsTypeOf(Package) then '3200' 
+		elif element.oclIsTypeOf(Port) then '3069' 
+		elif element.oclIsTypeOf(Comment) then '3201' 
+		elif element.oclIsTypeOf(Interface) then '3205' 
+		elif element.oclIsTypeOf(Model) then '3202' 
+		elif element.oclIsTypeOf(Property) then '1' 
+		elif element.oclIsTypeOf(Constraint) then '3199' 
+		elif element.oclIsTypeOf(Operation) then '5' 
+		elif element.oclIsTypeOf(Reception) then '6' 
+		else self.fail()
+	endif;
+}
+
+
+query View::getDecorationType(element : Element) : String{
+	return self.doGetDecorationType(element);
+	
+}
+
+query View::doGetDecorationType(element : Element) : String{
+	return if self.container().oclIsKindOf(Node) then {
+		return if element.oclIsTypeOf(Component) then
+			return switch {
+				case (self.type = 'Name') '5004';
+				case (self.type = 'StructureCompartment') '7001';
+			}
+			elif element.oclIsTypeOf(Package) then
+				return switch {
+					case (self.type = 'Name') '5254';
+					case (self.type = 'PackageContents') '7002';
+				}
+			elif element.oclIsTypeOf(Port) then
+				return switch {
+					case (self.type = 'Name') '5006';
+					
+				}
+			elif element.oclIsTypeOf(Interface) then
+				return switch {
+					case (self.type = 'Name') '5266';
+					case (self.type = 'AttributeCompartment') '7008';
+				case (self.type = 'ReceptionCompartment') '7009';
+				}
+			elif element.oclIsTypeOf(Model) then
+				return switch {
+					case (self.type = 'Name') '5262';
+					case (self.type = 'StructureCompartment') '7006';
+				}
+			elif element.oclIsTypeOf(Constraint) then
+				return switch {
+					case (self.type = 'Name') '5252';
+					
+				}
+
+		endif
+	} else {
+		return if element.oclIsTypeOf(Generalization) then
+				return switch {
+							
+					case (self.type = 'KindLabel') '2';
+				}
+			
+			elif element.oclIsTypeOf(Substitution) then
+				return switch {
+					case (self.type='Name') '6006';		
+					case (self.type = 'NameLabel') '6006';
+					case (self.type = 'KindLabel') '6020';
+				}
+			
+			elif element.oclIsTypeOf(Manifestation) then
+				return switch {
+					case (self.type='Name') '6008';		
+					case (self.type = 'NameLabel') '6008';
+					case (self.type = 'KindLabel') '6022';
+				}
+			
+			elif element.oclIsTypeOf(ComponentRealization) then
+				return switch {
+					case (self.type='Name') '3';		
+					case (self.type = 'NameLabel') '3';
+					case (self.type = 'KindLabel') '4';
+				}
+			
+			elif element.oclIsTypeOf(Abstraction) then
+				return switch {
+					case (self.type='Name') '6007';		
+					case (self.type = 'NameLabel') '6007';
+					case (self.type = 'KindLabel') '6021';
+				}
+			
+			elif element.oclIsTypeOf(Dependency) then
+				return switch {
+					case (self.type='Name') '6009';		
+					case (self.type = 'NameLabel') '6009';
+					case (self.type = 'KindLabel') '6023';
+				}
+			
+		endif
+	} endif;
+}
+
+
+query View::getEdgeType(element : Element) : String {
+	return
+		if element.oclIsTypeOf(Usage) then '4001'
+		elif element.oclIsTypeOf(InterfaceRealization) then '4006'
+		elif element.oclIsTypeOf(Generalization) then '4003'
+		elif element.oclIsTypeOf(Substitution) then '4012'
+		elif element.oclIsTypeOf(Manifestation) then '4014'
+		elif element.oclIsTypeOf(ComponentRealization) then '4007'
+		elif element.oclIsTypeOf(Abstraction) then '4013'
+		elif element.oclIsTypeOf(Dependency) then '4010'
+		elif element.oclIsTypeOf(Dependency) then '4017'
+		else self.fail()
+	endif;
+}
+
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAModelToPapyrus.qvto b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAModelToPapyrus.qvto
new file mode 100644
index 00000000000..1a5ab5de17b
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAModelToPapyrus.qvto
@@ -0,0 +1,123 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+import org.eclipse.papyrus.m2m.qvto.UI;
+import org.eclipse.papyrus.m2m.qvto.NotationTypes;
+import libraries.EclipseUI;
+import org.eclipse.papyrus.migration.rsa.RTMappings; 
+
+modeltype notation "strict" uses 'http://www.eclipse.org/gmf/runtime/1.0.2/notation';
+modeltype umlNotation "strict" uses 'http://www.eclipse.org/papyrus/umlnotation';
+modeltype uml "strict" uses 'http://www.eclipse.org/uml2/5.0.0/UML';
+modeltype ecore "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
+modeltype sash "strict" uses 'http://www.eclipse.org/papyrus/0.7.0/sashdi';
+modeltype config "strict" uses 'http:///RSAToPapyrusParameters.ecore';
+
+/**
+*	Transformation rules for importing an RSA Semantic model into Papyrus (SashModel + cleanup semantics)
+*/
+transformation RSAModelToPapyrus(inout semantics : uml, inout graphics : notation, out di : sash, in param : config);
+
+
+main() {
+	assert fatal (not semantics.rootObjects()[uml::Element]->isEmpty()) with log('Cannot find root uml::Element');
+
+	map createSashModel();
+	
+	semantics.objectsOfType(Element).map deleteSourceDiagrams();
+	
+	if param.rootObjects()[Config]->any(true).convertOpaqueExpressionToLiteralString then
+		semantics.objectsOfType(OpaqueExpression).map convertToLiteralString()
+	endif;
+	
+	semantics.objectsOfType(OpaqueExpression).map fixLanguage();
+}
+
+mapping inout Element::deleteSourceDiagrams() {
+
+	self.eAnnotations := self.eAnnotations->reject(source = 'uml2.diagrams' or source = 'uml2.profile.diagrams'); /* Delete diagrams from resulting UML Model */
+}
+
+//If the OpaqueExpression doesn't have a language, and a single body, replace it with a LiteralString
+mapping OpaqueExpression::convertToLiteralString() : LiteralString when {
+	(self.language->size() = 0 and self.body->size() <= 1) or
+	(self.language->size() = 1 and self.body->size() <= 1 and 
+		self.language->at(1).isEmpty()
+	)
+} {
+	init {
+		result := self.map toLiteralString() //Blackbox cast: Transform OpaqueExpression to LiteralString (Preserve incoming references and compatible features)
+	}
+
+	result.value := if self.body->size() = 0 then null else self.body->at(1) endif;	
+	
+	semantics.removeElement(self); //Destroy the source OpaqueExpression
+	worked(1);
+}
+
+intermediate class Opaque { 
+	language: String; 
+	body: String;
+}
+	
+mapping inout OpaqueExpression::fixLanguage() when {
+	(self.language->size() > 1 or self.body->size() > 1) and 
+	(self.language->exists(isEmpty()) or self.language.size() <> self.body.size())
+} {
+	//Replace empty languages by "Undefined" (In Papyrus, "Empty" is interpreted as "OCL", which is the default. This is not the case in RSA, where "Empty" means "Undefined")
+
+	var maxSize : Integer := self.language->size().max(self.body->size());
+
+	var newLanguages : OrderedSet(Opaque) := OrderedSet{};
+	var i : Integer = 1;
+	
+	while(i <= maxSize) {
+		var lang : String := self.language->at(i);
+		var body : String := self.body->at(i);
+		
+		var newLanguage := object Opaque{};
+		newLanguage.language := if lang.oclIsInvalid() or lang.isEmpty() then 'Undefined' else lang endif;
+		newLanguage.body := if body.oclIsInvalid() or body.isEmpty() then '' else body endif;
+		
+		newLanguages += newLanguage;
+		
+		i := i+1;
+	};
+	
+	self.language := newLanguages.language;
+	self.body := newLanguages.body;	
+}
+
+query String::isEmpty() : Boolean {
+	return self.oclIsUndefined() or self = '';
+}
+
+mapping createSashModel() : SashWindowsMngr {
+	pageList := object PageList {
+		availablePage := graphics.rootObjects()[Diagram].map toAvailablePage();
+
+			};
+	
+	var mainWindow : Window := object Window{
+		children := object TabFolder{};
+	};
+	
+	sashModel := object SashModel {
+		windows := mainWindow;
+		currentSelection := mainWindow.children->selectByKind(TabFolder)->any(true);
+	};
+}
+
+mapping Diagram::toAvailablePage() : sash::PageRef when {
+	not self.type.oclIsUndefined() and self.type <> ""
+}{
+	result.emfPageIdentifier := self.oclAsType(EObject);
+}
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAProfileDiagram.qvto b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAProfileDiagram.qvto
new file mode 100644
index 00000000000..cbb50a5b30e
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAProfileDiagram.qvto
@@ -0,0 +1,500 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+import RSAToPapyrus;
+
+modeltype notation "strict" uses 'http://www.eclipse.org/gmf/runtime/1.0.2/notation';
+modeltype umlNotation "strict" uses 'http://www.eclipse.org/papyrus/umlnotation';
+modeltype uml "strict" uses 'http://www.eclipse.org/uml2/5.0.0/UML';
+modeltype ecore "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
+modeltype sash "strict" uses 'http://www.eclipse.org/papyrus/0.7.0/sashdi';
+modeltype config "strict" uses 'http:///RSAToPapyrusParameters.ecore';
+
+transformation RSAProfileDiagram(inout semantics : uml, inout graphics : notation, out di : sash, in param : config);
+
+main() {
+	//RSA uses Classes, whereas Papyrus uses DataTypes. The Semantics is the same
+	//semantics.objectsOfType(Class)->map toDatatype(); //Disabled 2014/04/28. Papyrus now properly supports Classes in Profile Diagrams
+	//we generate our diagrams
+	semantics.rootObjects()[uml::Profile]->map toOwnedDiagrams();	
+}
+
+mapping notation::Diagram::generateDiagram() : notation::Diagram inherits Diagram::toPapyrusDiagram when {
+	self.findElement().oclIsTypeOf(Profile)
+}{
+	end {
+		//POST ACTION UPDATE meta class to import element
+		semantics.objectsOfType(UMLConnector)->map toContextLink();
+		graphics.objectsOfType(Shape)->select(type = '1002').map addCommentDecoration();
+		graphics.objectsOfType(Shape)->select(type = '1014').map addConstraintDecoration();
+	}
+}
+
+mapping inout Shape::addCommentDecoration() when {
+	self.type = '1002' and self.diagram.type = self.getDiagramType()
+} {
+	
+	self.children += object DecorationNode{
+		type := '3'; //Comment body
+	}	
+
+}
+
+mapping inout Shape::addConstraintDecoration() when {
+	self.type = '1014' and self.diagram.type = self.getDiagramType()
+} {
+	
+	self.children += object DecorationNode{
+		type := '5063'; //Constraint specification
+	}	
+
+}
+
+query View::getDiagramType() : String{
+	return 'PapyrusUMLProfileDiagram';
+}
+
+mapping UMLConnector::toContextLink() : notation::Connector inherits Connector::toPapyrusConnector when {
+	self.type = 'Reference' and self.source.element.oclIsKindOf(Constraint) and self.target.element.oclIsKindOf(Namespace)
+}{
+	result.type := '8500';
+	self.diagram.map generateDiagram().edges += result;
+}
+
+mapping notation::Diagram::toPapyrusProfileDiagram() : notation::Diagram inherits Diagram::toPapyrusDiagram when {
+	self.type = 'Profile'
+}{
+	
+}
+
+mapping Node::toNode() : Node disjuncts
+	UMLShape::toPapyrusShape,
+	UMLShapeCompartment::toStructureCompartment,
+	BasicSemanticCompartment::toListCompartment,
+	BasicDecorationNode::toConnectorLabel,
+	BasicDecorationNode::toLabel
+	//TODO: Disjunct nodes mapping
+;
+
+mapping Edge::toEdge() : Edge disjuncts
+	UMLConnector::toPapyrusConnector
+	//TODO: Disjunct edges mapping
+;
+
+mapping UMLShapeCompartment::toStructureCompartment() : DecorationNode inherits UMLShapeCompartment::toAbstractStructureCompartment when {
+	self.type = 'StructureCompartment' or self.type = 'PackageContents' and not self.getType().oclIsUndefined();
+}{
+	
+}
+
+
+/***** Nodes **********/
+
+mapping UMLShape::toPapyrusShape() : Shape inherits Shape::toPapyrusShape when {
+	self.type = '' and not self.getType().oclIsUndefined() and (
+		self.element.oclIsTypeOf(Dependency)or
+	self.element.oclIsTypeOf(Association)or
+	self.element.oclIsTypeOf(Stereotype)or
+	self.element.oclIsTypeOf(Class)or
+	self.element.oclIsTypeOf(Class)or
+	self.element.oclIsTypeOf(Comment)or
+	self.element.oclIsTypeOf(Constraint)or
+	self.element.oclIsTypeOf(Model)or
+	self.element.oclIsTypeOf(Profile)or
+	self.element.oclIsTypeOf(Package)or
+	self.element.oclIsTypeOf(Enumeration)or
+	self.element.oclIsTypeOf(PrimitiveType)or
+	self.element.oclIsTypeOf(DataType)or
+	self.element.oclIsTypeOf(Diagram)
+	)
+}{
+	
+}
+
+
+/****** Connector Labels ******/
+
+mapping BasicDecorationNode::toConnectorLabel() : DecorationNode inherits Node::toPapyrusConnectorLabel when {
+	not self.getType().oclIsUndefined() and (
+		self.type = 'ToMultiplicityLabel' or
+		self.type = 'ToRoleLabel' or
+		self.type = 'FromMultiplicityLabel' or
+		self.type = 'FromRoleLabel' or
+		self.type = 'NameLabel' or
+		self.type = 'KindLabel'
+	)
+};
+
+/****** Compartments *******/
+
+mapping BasicDecorationNode::toLabel() : DecorationNode inherits Node::toPapyrusNode when {
+	not self.getType().oclIsUndefined() and
+	self.element.oclIsKindOf(uml::NamedElement) and 
+	self.type = 'Name'
+};
+
+mapping BasicSemanticCompartment::toListCompartment() : BasicCompartment inherits Node::toPapyrusNode, DrawerStyle::toDrawerStyle when {
+	self.type.endsWith('Compartment') and not self.getType().oclIsUndefined()
+}{
+	result.children := self.findElement().map toContents(self);
+}
+
+mapping Element::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	Stereotype::toContents,
+	Class::toContents,
+	Enumeration::toContents,
+	DataType::toContents
+;
+
+mapping Stereotype::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	Stereotype::toAttributeCompartmentContents,
+	Stereotype::toOperationCompartmentContents
+;
+
+mapping Class::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	Class::toOperationCompartmentContents,
+	Class::toAttributeCompartmentContents
+;
+
+mapping Enumeration::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	Enumeration::toEnumerationEnumerationLiteralContents
+;
+
+mapping DataType::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	DataType::toDataTypeAttributeCompartmentContents,
+	DataType::toDataTypeOperationCompartmentContents
+;
+
+mapping Stereotype::toAttributeCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'AttributeCompartment';
+}{
+	init {
+		result := (self.map fillProperty(node))
+	}
+}
+
+mapping Stereotype::toOperationCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'OperationCompartment';
+}{
+	init {
+		result := (self.map fillOperation(node))
+	}
+}
+
+mapping Class::toOperationCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'OperationCompartment' 
+	and not self.isMetaclass();
+}{
+	init {
+		result := (self.map fillOperation(node))
+	}
+}
+
+mapping Class::toAttributeCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'AttributeCompartment'
+	and not self.isMetaclass();
+}{
+	init {
+		result := (self.map fillProperty(node))
+	}
+}
+
+mapping Enumeration::toEnumerationEnumerationLiteralContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'EnumerationCompartment';
+}{
+	init {
+		result := (self.map fillEnumerationLiteral(node))
+	}
+}
+
+mapping DataType::toDataTypeAttributeCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'AttributeCompartment';
+}{
+	init {
+		result := (self.map fillProperty(node))
+	}
+}
+
+mapping DataType::toDataTypeOperationCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'OperationCompartment';
+}{
+	init {
+		result := (self.map fillOperation(node))
+	}
+}
+
+mapping uml::DataType::fillOperation(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='OperationCompartment';
+}{
+	init {
+		result := self.ownedOperation->selectByKind(Operation).map toOperationInDataType(node)->asSequence();
+	}
+}
+
+mapping uml::Enumeration::fillEnumerationLiteral(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='EnumerationCompartment';
+}{
+	init {
+		result := self.ownedLiteral->selectByKind(EnumerationLiteral).map toEnumerationLiteralInEnumeration(node)->asSequence();
+	}
+}
+
+mapping uml::DataType::fillProperty(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='AttributeCompartment';
+}{
+	init {
+		result := self.ownedAttribute->selectByKind(Property).map toPropertyInDataType(node)->asSequence();
+	}
+}
+
+mapping uml::Stereotype::fillProperty(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='AttributeCompartment';
+}{
+	init {
+		result := self.ownedAttribute->selectByKind(Property).map toPropertyInStereotype(node)->asSequence();
+	}
+}
+
+mapping uml::Stereotype::fillOperation(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='OperationCompartment';
+}{
+	init {
+		result := self.ownedOperation->selectByKind(Operation).map toOperationInStereotype(node)->asSequence();
+	}
+}
+
+mapping uml::Class::fillProperty(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='AttributeCompartment'
+	and not self.isMetaclass();
+}{
+	init {
+		result := self.ownedAttribute->selectByKind(Property).map toPropertyInClass(node)->asSequence();
+	}
+}
+
+mapping uml::Class::fillOperation(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='OperationCompartment'
+	and not self.isMetaclass();
+}{
+	init {
+		result := self.ownedOperation->selectByKind(Operation).map toOperationInClass(node)->asSequence();
+	}
+}
+
+mapping Operation::toOperationInDataType(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3019';
+}
+
+mapping EnumerationLiteral::toEnumerationLiteralInEnumeration(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '1037';
+}
+
+mapping Property::toPropertyInDataType(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3018';
+}
+
+mapping Property::toPropertyInStereotype(node : Node) : Shape inherits Element::toCompartmentEntry when{
+	not self.name.startsWith('base_')
+}{
+	result.type := '3002';
+}
+
+mapping Operation::toOperationInStereotype(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3020';
+}
+
+mapping Property::toPropertyInClass(node : Node) : Shape inherits Element::toCompartmentEntry when{
+	not self.name.startsWith('base_')
+}{
+	result.type := '3002';
+}
+
+mapping Operation::toOperationInClass(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3020';
+}
+
+
+
+/******* Edges ********/
+
+
+mapping UMLConnector::toPapyrusConnector() : Connector inherits Connector::toPapyrusConnector when {
+	self.type = '' and 
+	not self.getType().oclIsUndefined() and (
+		self.element.oclIsTypeOf(Extension)or
+		self.element.oclIsTypeOf(Association)or
+		self.element.oclIsTypeOf(ProfileApplication)or
+		self.element.oclIsTypeOf(Association)or
+		self.element.oclIsTypeOf(Generalization)or
+		self.element.oclIsTypeOf(Dependency)or
+		self.element.oclIsTypeOf(Dependency)or
+		self.element.oclIsTypeOf(ElementImport)or
+		self.element.oclIsTypeOf(PackageImport)
+	)
+}{
+	result.styles := self.map toFontStyle();
+}
+
+/****** Element Type queries ******/
+
+query View::getNodeType(element : Element) : String {
+	return
+		if element.oclIsTypeOf(Dependency) then '2014' 
+		elif element.oclIsTypeOf(Association) then '2015' 
+		elif element.oclIsTypeOf(Stereotype) then '1026' 
+		elif element.oclIsTypeOf(Class) and not element.oclAsType(Class).isMetaclass() then '2008' //Class
+		elif element.oclIsTypeOf(Class) and element.oclAsType(Class).isMetaclass() then '1031' //Metaclass
+		elif element.oclIsTypeOf(Comment) then '1002' 
+		elif element.oclIsTypeOf(Constraint) then '1014' 
+		elif element.oclIsTypeOf(Model) then '2005' 
+		elif element.oclIsTypeOf(Profile) then '1030' 
+		elif element.oclIsTypeOf(Package) then '2007' 
+		elif element.oclIsTypeOf(Enumeration) then '2006' 
+		elif element.oclIsTypeOf(PrimitiveType) then '2009' 
+		elif element.oclIsTypeOf(DataType) then '2010' 
+		elif element.oclIsTypeOf(Diagram) then '2016' 
+		else self.fail()
+	endif;
+}
+
+
+query View::getDecorationType(element : Element) : String{
+	var res := self.doGetDecorationType(element);
+	
+	/*
+	log('Get papyrus ID for'+ self.element.eClass().name+', '+self.type);
+	
+	log(res);
+	
+	if self.container().oclIsKindOf(Node) then 
+		log('IsNode')
+	else 
+		log('IsEdge')
+	endif;
+	*/
+	
+	return res;
+}
+
+query View::doGetDecorationType(element : Element) : String{
+	return if self.container().oclIsKindOf(Node) then {
+		return if element.oclIsTypeOf(Stereotype) then
+			return switch {
+				case (self.type = 'Name') '1034';
+				case (self.type = 'AttributeCompartment') '1071';
+				case (self.type = 'OperationCompartment') '1019';
+			}
+			elif element.oclIsTypeOf(Class) and not element.oclAsType(Class).isMetaclass() then //Class
+				return switch {
+					case (self.type = 'Name') '5029';
+					case (self.type = 'OperationCompartment') '7018';
+					case (self.type = 'AttributeCompartment') '7017';
+				}
+			elif element.oclIsTypeOf(Class) and element.oclAsType(Class).isMetaclass() then //Metaclass
+				return switch {
+					case (self.type = 'Name') '1084';
+					
+				}
+			elif element.oclIsTypeOf(Constraint) then
+				return switch {
+					case (self.type = 'Name') '1015';
+					
+				}
+			elif element.oclIsTypeOf(Model) then
+				return switch {
+					case (self.type = 'Name') '5020';
+					case (self.type = 'StructureCompartment') '1057';
+				}
+			elif element.oclIsTypeOf(Profile) then
+				return switch {
+					
+					case (self.type = 'StructureCompartment') '1042';
+				}
+			elif element.oclIsTypeOf(Package) then
+				return switch {
+					case (self.type = 'Name') '5026';
+					case (self.type = 'PackageContents') '1005';
+				}
+			elif element.oclIsTypeOf(Enumeration) then
+				return switch {
+					case (self.type = 'Name') '5023';
+					case (self.type = 'EnumerationCompartment') '1063';
+				}
+			elif element.oclIsTypeOf(PrimitiveType) then
+				return switch {
+					case (self.type = 'Name') '5032';
+					
+				}
+			elif element.oclIsTypeOf(DataType) then
+				return switch {
+					case (self.type = 'Name') '5035';
+					case (self.type = 'AttributeCompartment') '1067';
+					case (self.type = 'OperationCompartment') '1068'; //TODO: Disable?
+				}
+			elif element.oclIsTypeOf(Diagram) then
+				return switch {
+					case (self.type = 'Name') '2';
+					
+				}
+		endif
+	} else {
+		return if element.oclIsTypeOf(Association)  then
+			return switch {
+				case (self.type='Name') '6002';		
+				case (self.type = 'KindLabel') '6001';
+				case (self.type = 'NameLabel') '6002';
+				
+				
+				case (self.type = 'FromMultiplicityLabel') '6033';
+				case (self.type = 'ToMultiplicityLabel') '6034';
+			}
+			elif element.oclIsTypeOf(Generalization)  then
+				return switch {
+							
+					case (self.type = 'KindLabel') '6007';
+				}
+			elif element.oclIsTypeOf(Dependency)  then
+				return switch {
+					case (self.type='Name') '6026';		
+					case (self.type = 'NameLabel') '6026';
+					case (self.type = 'KindLabel') '6027';
+				}
+			elif element.oclIsTypeOf(ElementImport)  then
+				return switch {
+							
+					
+					case (self.type = 'KindLabel') '6021';
+				}
+			elif element.oclIsTypeOf(PackageImport)  then
+				return switch {
+							
+					case (self.type = 'KindLabel') '6022';
+				}
+		endif
+	} endif;
+}
+
+
+query View::getEdgeType(element : Element) : String {
+	return
+		if element.oclIsTypeOf(Extension) then '1013'
+		elif element.oclIsTypeOf(Association) then '4001'
+		elif element.oclIsTypeOf(ProfileApplication) then '1045'
+		elif element.oclIsTypeOf(Association) then '4019'
+		elif element.oclIsTypeOf(Generalization) then '4002'
+		elif element.oclIsTypeOf(Dependency) then '4008'
+		elif element.oclIsTypeOf(Dependency) then '4018'
+		elif element.oclIsTypeOf(ElementImport) then '1064'
+		elif element.oclIsTypeOf(PackageImport) then '1065'
+		else self.fail()
+	endif;
+}
+
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAProfilesToPapyrus.qvto b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAProfilesToPapyrus.qvto
new file mode 100644
index 00000000000..d5fec263f9b
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAProfilesToPapyrus.qvto
@@ -0,0 +1,188 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+import org.eclipse.papyrus.m2m.qvto.UI;
+import org.eclipse.papyrus.migration.rsa.ProfileBaseHelper;
+import org.eclipse.papyrus.m2m.qvto.EMFResource;
+import libraries.EclipseUI;
+
+modeltype uml "strict" uses 'http://www.eclipse.org/uml2/5.0.0/UML';
+modeltype notation "strict" uses 'http://www.eclipse.org/gmf/runtime/1.0.2/notation';
+modeltype defaultProfile "strict" uses 'http://www.eclipse.org/papyrus/profile/default';
+modeltype documentation "strict" uses 'http://www.eclipse.org/papyrus/documentation';
+modeltype validation "strict" uses 'http://www.eclipse.org/papyrus/dsmlvalidation';
+modeltype profileBase "strict" uses 'http://www.eclipse.org/papyrus/profile/profilebase';
+modeltype ecore "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
+modeltype config "strict" uses 'http:///RSAToPapyrusParameters.ecore';
+
+transformation RSAProfilesToPapyrus(inout semantics : uml, inout notationModel : notation, in papyrusProfiles : /* Profiles + EObjects (Stereotype applications) */ uml, in profileDefinitions : /* EPackage */ ecore, in param : config);
+
+property validationURI : String = 'http://www.eclipse.org/papyrus/dsmlvalidation';
+
+property documentationURI : String = 'http://www.eclipse.org/papyrus/documentation';
+
+property profileBaseURI : String = 'pathmap://UML2_MSL_PROFILES/ProfileBase.epx';
+
+property defaultProfileURI : String = 'pathmap://UML2_MSL_PROFILES/Default.epx';
+
+main() {
+	semantics.objectsOfType(defaultProfile::URL).map toHyperlink();
+
+	semantics.objectsOfType(ProfileApplication).map toPapyrusValidationProfile();
+	semantics.objectsOfType(profileBase::ProfileConstraint).map toValidationRule();
+	
+	semantics.objectsOfType(ProfileApplication).map toPapyrusDocumentationProfile();
+	semantics.objectsOfType(defaultProfile::Documentation).map toDocumentation();
+	
+	if param.rootObjects()[Config]->any(true).removeUnmappedProfilesAndStereotypes then {
+		
+		//unapply deployment profile
+		
+		semantics.objectsOfType(ProfileApplication).map removeDeploymentProfile();
+		
+		//remove DefaultLanguage stereotype
+		
+		semantics.rootObjects()[DefaultLanguage].map delete();
+		
+	} endif;
+}
+
+mapping ProfileApplication::removeDeploymentProfile() when {
+	self.appliedProfile.oclAsType(EObject).getURI().startsWith('pathmap://UML2_MSL_PROFILES/Deployment.epx');
+}{
+	semantics.removeElement(self);
+}
+
+mapping DefaultLanguage::delete() {
+	semantics.removeElement(self);
+}
+
+query ProfileApplication::getDefinitionAnnotation() : EAnnotation {
+	return self.getEAnnotation('http://www.eclipse.org/uml2/2.0.0/UML');
+}
+
+query ProfileApplication::getDefinition() : EPackage {
+	return self.getDefinitionAnnotation()._references->any(oclIsKindOf(EPackage)).oclAsType(EPackage);
+}
+
+/** Profile Base -> Validation **/
+
+mapping inout ProfileApplication::toPapyrusValidationProfile() when {
+	self.getDefinition().oclAsType(EObject).getURI().startsWith(profileBaseURI);
+}{
+	self.appliedProfile := getValidationProfile();
+	self.getDefinitionAnnotation()._references := profileDefinitions.rootObjects()[EPackage]->any(nsURI = validationURI).oclAsType(EObject);
+	
+	self.eAnnotations := self.getDefinitionAnnotation(); //Remove all other annotations
+}
+
+mapping ProfileConstraint::toValidationRule() : ValidationRule {
+	result.severity := self.severity.toSeverityCode();
+	result.mode := self.evaluationMode.toEvaluationMode();
+	result.isEnabledByDefault := true;
+	result.base_Constraint := self.base_Constraint;
+	result.statusCode := self.severity.toStatusCode();
+	result.message := self.getConstraintMessage();
+	//result.description := null;
+	//result.target := null;
+	//result._class := null;
+	//result.id := null;
+	
+	semantics.removeElement(self);
+}
+
+query defaultProfile::Severity::toSeverityCode() : validation::Severity{
+	return switch {
+		case (self = defaultProfile::Severity::error) validation::Severity::ERROR;
+		case (self = defaultProfile::Severity::warning) validation::Severity::WARNING;
+		case (self = defaultProfile::Severity::info) validation::Severity::INFO;
+	};
+	
+}
+
+query defaultProfile::Mode::toEvaluationMode() : validation::Mode {
+	return if self = defaultProfile::Mode::batch then validation::Mode::Batch else validation::Mode::Live endif;
+}
+
+query defaultProfile::Severity::toStatusCode() : Integer {
+	return switch {
+		case (self = defaultProfile::Severity::error) 3;
+		case (self = defaultProfile::Severity::warning) 2;
+		case (self = defaultProfile::Severity::info) 1;
+	};
+}
+
+query getValidationProfile() : Profile {
+	return papyrusProfiles.rootObjects()[Profile]->any(URI = validationURI);
+}
+
+/** Default Profile -> Documentation **/
+
+mapping inout ProfileApplication::toPapyrusDocumentationProfile() when {
+	self.getDefinition().oclAsType(EObject).getURI().startsWith(defaultProfileURI);
+}{
+	self.appliedProfile := getDocumentationProfile();
+	self.getDefinitionAnnotation()._references := profileDefinitions.rootObjects()[EPackage]->any(nsURI = documentationURI).oclAsType(EObject);
+	
+	self.eAnnotations := self.getDefinitionAnnotation(); //Remove all other annotations
+}
+
+mapping defaultProfile::Documentation::toDocumentation() : documentation::Documentation {
+	result.base_Comment := self.base_Comment;
+	
+	semantics.removeElement(self);
+}
+
+query getDocumentationProfile() : Profile {
+	return papyrusProfiles.objectsOfType(Profile)->any(URI = documentationURI); //DocumentationProfile is not a root profile
+}
+
+/** Default Profile : Link/URL -> Hyperlink **/
+
+mapping inout URL::toHyperlink() {
+	var comment := self.base_Comment;
+	
+	var commentDisplays := notationModel.objectsOfType(Shape)->select(element = comment.oclAsType(EObject)); //All views representing the comment 
+	
+	var label := self.displayName;
+	var url := comment.body;
+	
+	/** In RSA, the body holds the URL, and the Stereotype holds the label */
+	/** In Papyrus, the body holds the label, and the EAnnotation holds the URL */
+	
+	comment.body := label;
+	
+	commentDisplays.map createHyperlinkAnnotation(url);
+	
+	end {
+		semantics.removeElement(self);
+	}
+}
+
+mapping Shape::createHyperlinkAnnotation(url : String) : EAnnotation {
+	result.eModelElement := self;
+	result.source := 'PapyrusHyperLink__web';
+	
+	result.details += object EStringToStringMapEntry {
+		key := "tooltip_text";
+		value := url;
+	};
+	
+	result.details += object EStringToStringMapEntry {
+		key := "link";
+		value := url;
+	};
+	
+	result.details += object EStringToStringMapEntry {
+		key := "is_default_navigation";
+		value := "true";
+	};
+}
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSARTToPapyrusRT.qvto b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSARTToPapyrusRT.qvto
new file mode 100644
index 00000000000..6c74b2fae26
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSARTToPapyrusRT.qvto
@@ -0,0 +1,278 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+import org.eclipse.papyrus.m2m.qvto.UI;
+import org.eclipse.papyrus.migration.rsa.RTMappings;
+import org.eclipse.papyrus.m2m.qvto.EMFResource;
+import libraries.EclipseUI;
+ 
+modeltype uml "strict" uses 'http://www.eclipse.org/uml2/5.0.0/UML';
+modeltype notation "strict" uses 'http://www.eclipse.org/gmf/runtime/1.0.2/notation';
+modeltype umlrt "strict" uses 'http://www.eclipse.org/papyrus/umlrt';
+modeltype umlrtsm "strict" uses 'http://www.eclipse.org/papyrus/umlrt/statemachine';
+modeltype sourcert "strict" uses 'http://www.eclipse.org/papyrus/profile/umlrt'; 
+modeltype ecore "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
+modeltype types "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
+modeltype config "strict" uses 'http:///RSAToPapyrusParameters.ecore';
+
+transformation RSARTToPapyrusRT(inout semantics : uml, inout graphics : notation, in profiles : uml, in profileDefinitions : ecore, in param : config);
+
+property UML_RT_URI : String = 'http://www.eclipse.org/papyrus/umlrt';
+
+property UML_RT_SM_URI : String = 'http://www.eclipse.org/papyrus/umlrt/statemachine';
+
+property RT_PROFILE_URI_PREFIX : String = 'pathmap://RT_PROPERTIES/UMLRealTime.epx';
+
+property UML_DEFINITION_SOURCE : String = 'http://www.eclipse.org/uml2/2.0.0/UML';
+
+//Transforms RSA RT stereotypes to Papyrus RT
+//Stereotypes will not be deleted during this transformation for performance issues (Bug 444379)
+//Instead, they should be deleted as a post-action of the transformation
+main() {
+	semantics.objectsOfType(ProfileApplication).map toPapyrusRTProfile();
+	
+	//Apply new RT Stereotypes first
+	semantics.objectsOfType(StateMachine).map applyRTStateMachine();
+	semantics.objectsOfType(Region).map applyRTRegion();
+	semantics.objectsOfType(State).map applyRTState();
+	semantics.objectsOfType(Pseudostate).map applyRTPseudostate();
+	
+	semantics.rootObjects()[sourcert::Capsule].map toCapsule();
+	semantics.rootObjects()[sourcert::CapsulePart].map toCapsulePart();
+	semantics.rootObjects()[sourcert::Protocol].map toProtocol();
+	semantics.rootObjects()[sourcert::ProtocolContainer].map toProtocolContainer();
+	semantics.rootObjects()[sourcert::RTConnector].map toRTConnector();
+	semantics.rootObjects()[sourcert::RTHistorystate].map toHistorystate();
+	semantics.rootObjects()[sourcert::RTPort].map toRTPort();
+	semantics.rootObjects()[sourcert::RTRedefinableElement].map toRTRExcludedElement();
+	semantics.rootObjects()[sourcert::Trigger].map toRTTrigger();
+}
+
+mapping inout ProfileApplication::toPapyrusRTProfile() : ProfileApplication when {
+	self.getDefinition().oclAsType(EObject).getURI().startsWith(RT_PROFILE_URI_PREFIX);
+}{
+	//UML-RT
+	self.appliedProfile := getRTProfile();
+	
+	self.getDefinitionAnnotation()._references := profileDefinitions.rootObjects()[EPackage]->any(nsURI = UML_RT_URI).oclAsType(EObject);
+	self.eAnnotations := self.getDefinitionAnnotation(); //Remove all other annotations
+	
+	//UML-RT StateMachine extension
+	result.appliedProfile := getRTSMProfile();
+	
+	result.eAnnotations := object EAnnotation {
+		_references := profileDefinitions.rootObjects()[EPackage]->any(nsURI = UML_RT_SM_URI).oclAsType(EObject);
+		source := UML_DEFINITION_SOURCE;
+	};
+	
+	self.applyingPackage.profileApplication += result;
+}
+
+/* Applies the RTMessageSet on the In and Out interfaces, and create a new InOut interface */
+mapping sourcert::ProtocolContainer::toMessageSets() : Interface{
+	var inInterface : Interface := self.findInInterface();
+	var outInterface : Interface := self.findOutInterface();
+	var protocolName : String := self.base_Package.name;
+	
+	inInterface.map createMessageSet(RTMessageKind::_in);
+	inInterface.name := protocolName;
+	
+	outInterface.map createMessageSet(RTMessageKind::_out);
+	outInterface.name := protocolName+'~';
+	
+	//Order: Protocol, InInterface, OutInterface, InoutInterface
+	self.base_Package.packagedElement += result;
+	
+	result.name := protocolName+"IO";
+	result.map createMessageSet(RTMessageKind::inOut);
+	result.map createKeyword('ProtocolRole');
+}
+
+/*
+<eAnnotations xmi:id="_6bqisD5hEeSYUNuTXCumiw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+      <details xmi:id="_6brJwD5hEeSYUNuTXCumiw" key="ProtocolRole"/>
+</eAnnotations>
+*/
+mapping inout Element::createKeyword(keyword : String) : EAnnotation{
+	self.eAnnotations += result;
+	result.source := 'http://www.eclipse.org/uml2/2.0.0/UML';
+	result.details += object EStringToStringMapEntry {
+		key := 'ProtocolRole';
+	}
+}
+
+query sourcert::ProtocolContainer::findInInterface() : Interface {
+	return self.base_Package.packagedElement->selectByType(Interface)->any(e | not e.name.endsWith('~'));
+}
+
+query sourcert::ProtocolContainer::findOutInterface() : Interface {
+	return self.base_Package.packagedElement->selectByType(Interface)->any(e | e.name.endsWith('~'));
+}
+
+mapping inout Interface::createMessageSet(direction : RTMessageKind) : RTMessageSet {
+	result.base_Interface := self;
+	result.rtMsgKind := direction;
+}
+
+mapping sourcert::Capsule::toCapsule() : umlrt::Capsule when {
+	self.oclIsTypeOf(sourcert::Capsule) /* Workaround for Bug 445083 (QVTo Bug?) */
+}{
+	result.base_Class := self.base_Class;
+}
+
+mapping sourcert::CapsulePart::toCapsulePart() : umlrt::CapsulePart {
+	result.base_Property := self.base_Property;
+}
+
+mapping sourcert::Protocol::toProtocol() : umlrt::Protocol {
+	result.base_Collaboration := self.base_Collaboration;
+}
+
+mapping sourcert::ProtocolContainer::toProtocolContainer() : umlrt::ProtocolContainer {
+	result.base_Package := self.base_Package;
+	
+	self.map toMessageSets();
+}
+
+mapping sourcert::RTConnector::toRTConnector() : umlrt::RTConnector {
+	result.base_Connector := self.base_Connector;
+}
+
+mapping sourcert::RTHistorystate::toHistorystate() {
+	if self.historyKind = HistoryKind::Deep then self.base_Pseudostate.kind := PseudostateKind::deepHistory endif;
+	if self.historyKind = HistoryKind::Shallow then self.base_Pseudostate.kind := PseudostateKind::shallowHistory endif;
+}
+
+mapping sourcert::RTPort::toRTPort() : umlrt::RTPort {
+	result.isNotification := self.isNotification;
+	result.isPublish := self.isPublish;
+	result.isWired := self.isWired;
+	result.registration := self.registration.getPapyrusType();
+	result.registrationOverride := self.registrationOverride;
+	
+	result.base_Port := self.base_Port;
+	result.base_Port.isConjugated := self.isConjugate;
+}
+
+mapping sourcert::RTRedefinableElement::toRTRExcludedElement() : umlrt::RTRExcludedElement {
+	result.base_RedefinableElement := self.base_RedefinableElement;
+}
+
+mapping sourcert::Trigger::toRTTrigger() : RTTrigger when {
+	self.oclIsTypeOf(sourcert::Trigger) /* Workaround for Bug 445083 (QVTo Bug?) */
+}{
+	result.base_Operation := self.base_Operation;
+}
+
+query sourcert::PortRegistrationType::getPapyrusType() : umlrt::PortRegistrationType {
+	return switch {
+		case (self = sourcert::PortRegistrationType::Automatic) 
+			umlrt::PortRegistrationType::Automatic;
+		case (self = sourcert::PortRegistrationType::Automatic) 
+			umlrt::PortRegistrationType::Automatic;
+		else 
+			umlrt::PortRegistrationType::ApplicationLocked;
+	};
+}
+
+query sourcert::AbstractEvent::getDirection() : RTMessageKind {
+	return if self.oclIsTypeOf(InEvent) then 
+		RTMessageKind::_in
+	else
+		RTMessageKind::_out
+	endif;
+}
+
+/** StateMachine Stereotypes (Auto-applied) */
+
+mapping StateMachine::applyRTStateMachine() : RTStateMachine when {
+	self.isRT()
+}{
+	result.base_StateMachine := self;
+	if self.getClassifier().classifierBehavior.oclIsUndefined() then
+		self.getClassifier().classifierBehavior := self
+	endif;
+}
+
+mapping State::applyRTState() : RTState when {
+	self.isRT()
+}{
+	result.base_State := self;
+}
+
+mapping Pseudostate::applyRTPseudostate() : RTPseudostate when {
+	self.isRT()
+}{
+	result.base_Pseudostate := self;
+}
+
+mapping Region::applyRTRegion() : RTRegion when {
+	self.isRT()
+}{
+	result.base_Region := self;
+}
+
+query StateMachine::isRT() : Boolean {
+	return semantics.rootObjects()[sourcert::Capsule]->exists(c | c.base_Class = self.getClassifier());
+}
+
+query StateMachine::getClassifier() : BehavioredClassifier {
+	return if 
+		self.owner.oclIsKindOf(BehavioredClassifier)
+		and (
+			self.owner.oclAsType(BehavioredClassifier).classifierBehavior = self or //By default in RSA, StateMachines are not the Classifier Behavior of the classifier 
+			self.owner.oclAsType(BehavioredClassifier).ownedBehavior->includes(self)
+		)
+	then 
+		self.owner.oclAsType(BehavioredClassifier) 
+	else 
+		null 
+	endif;
+}
+
+query Region::isRT() : Boolean {
+	return if not self.stateMachine.oclIsUndefined() then
+		self.stateMachine.isRT()
+	else
+		self.state.isRT()
+	endif;
+}
+
+query State::isRT() : Boolean {
+	return self.owner.oclAsType(Region).isRT();
+}
+
+query Pseudostate::isRT() : Boolean {
+	return switch {
+		case (self.owner.oclIsKindOf(Region)) self.owner.oclAsType(Region).isRT();
+		case (self.owner.oclIsKindOf(StateMachine)) self.owner.oclAsType(StateMachine).isRT();
+		case (self.owner.oclIsKindOf(State)) self.owner.oclAsType(State).isRT();
+		else false;
+	};
+}
+
+/** Profile application */
+
+query ProfileApplication::getDefinitionAnnotation() : EAnnotation {
+	return self.getEAnnotation(UML_DEFINITION_SOURCE);
+}
+
+query ProfileApplication::getDefinition() : EPackage {
+	return self.getDefinitionAnnotation()._references->any(oclIsKindOf(EPackage)).oclAsType(EPackage);
+}
+
+query getRTProfile() : Profile {
+	return profiles.rootObjects()[Profile]->any(URI = UML_RT_URI);
+}
+
+query getRTSMProfile() : Profile {
+	return profiles.rootObjects()[Profile]->any(URI = UML_RT_SM_URI);
+}
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSASequenceDiagram.qvto b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSASequenceDiagram.qvto
new file mode 100644
index 00000000000..0efe76c7c06
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSASequenceDiagram.qvto
@@ -0,0 +1,380 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+import RSAToPapyrus;
+
+modeltype notation "strict" uses 'http://www.eclipse.org/gmf/runtime/1.0.2/notation';
+modeltype umlNotation "strict" uses 'http://www.eclipse.org/papyrus/umlnotation';
+modeltype uml "strict" uses 'http://www.eclipse.org/uml2/5.0.0/UML';
+modeltype ecore "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
+modeltype sash "strict" uses 'http://www.eclipse.org/papyrus/0.7.0/sashdi';
+modeltype config "strict" uses 'http:///RSAToPapyrusParameters.ecore';
+
+transformation RSASequenceDiagram(inout semantics : uml, inout graphics : notation, out di : sash, in param : config);
+
+main() {
+	semantics.rootObjects()[uml::Element]->map toOwnedDiagrams();
+}
+
+query View::getDiagramType() : String{
+	return 'PapyrusUMLSequenceDiagram';
+}
+
+mapping notation::Diagram::generateDiagram() : notation::Diagram inherits Diagram::toPapyrusDiagram when {
+	self.type = 'Sequence'
+}{
+	end {
+		graphics.objectsOfType(Shape)->select(type = '3003').map fixExecutionSpecification();
+		graphics.objectsOfType(Shape)->select(type = '3001').map fixLifelineHeight();
+		graphics.objectsOfType(Shape)->select(type = '3017').map fixStateInvariant();
+		
+		graphics.objectsOfType(Shape)->select(type = '3009').map addCommentDecoration();
+		graphics.objectsOfType(Shape)->select(type = '3008').map addConstraintDecoration();
+	}
+}
+
+mapping inout Shape::addCommentDecoration() when {
+	self.type = '3009' and self.diagram.type = self.getDiagramType()
+} {
+	
+	self.children += object DecorationNode{
+		type := '5006'; //Comment body
+	}	
+
+}
+
+mapping inout Shape::addConstraintDecoration() when {
+	self.type = '3008' and self.diagram.type = self.getDiagramType()
+} {
+	
+	self.children += object DecorationNode{
+		type := '5012'; //Constraint specification
+	}	
+
+}
+
+mapping inout Shape::fixLifelineHeight() {
+	self.layoutConstraint.oclAsType(Location).y := 10;
+}
+
+mapping inout Shape::fixExecutionSpecification() {
+	self.children := self.children->including(object DecorationNode {
+		type := 'BehaviorExecutionSpecification_Behavior';
+		layoutConstraint := object Location {
+			x := 18;
+			y := 18;
+		}
+	});
+	
+	var lifeline := semantics.objectsOfType(Lifeline)->any(ll | ll.coveredBy->includes(self.element.oclAsType(InteractionFragment)));
+	var lifelineShape := graphics.objectsOfType(Shape)->any(element = lifeline.oclAsType(EObject));
+	lifelineShape.children := lifelineShape.children->including(self);
+	var lifelineWidth := lifelineShape.layoutConstraint.oclAsType(Bounds).width;
+	
+	var speficationBounds := self.layoutConstraint.oclAsType(Bounds);
+	speficationBounds.x := ((lifelineWidth - 15)/2).round();
+	
+	/* Cannot be selected in Papyrus when it is too small */
+	var minHeight := 50;
+	if speficationBounds.height < minHeight then
+		speficationBounds.height := minHeight
+	endif;
+}
+
+mapping inout Shape::fixStateInvariant() {
+	
+	var lifeline := semantics.objectsOfType(Lifeline)->any(ll | ll.coveredBy->includes(self.element.oclAsType(StateInvariant)));
+	var lifelineShape := graphics.objectsOfType(Shape)->any(element = lifeline.oclAsType(EObject));
+	
+	lifelineShape.children := lifelineShape.children->including(self);
+}
+
+mapping Node::toNode() : Node disjuncts
+	UMLShape::toPapyrusShape,
+	UMLShapeCompartment::toStructureCompartment,
+	BasicSemanticCompartment::toListCompartment,
+	BasicDecorationNode::toConnectorLabel,
+	BasicDecorationNode::toLabel
+	//TODO: Disjunct nodes mapping
+;
+
+mapping Edge::toEdge() : Edge disjuncts
+	UMLConnector::toPapyrusConnector
+	//TODO: Disjunct edges mapping
+;
+
+mapping UMLShapeCompartment::toStructureCompartment() : DecorationNode inherits UMLShapeCompartment::toAbstractStructureCompartment when {
+	(self.type = 'StructureCompartment' or 
+	self.type = 'PackageContents' or
+	self.type = 'interaction_compartment' or
+	self.type.oclIsUndefined() or self.type = '')
+	and not self.getType().oclIsUndefined();
+}{
+	
+}
+
+
+/***** Nodes **********/
+
+mapping UMLShape::toPapyrusShape() : Shape inherits Shape::toPapyrusShape when {
+	self.type = '' and not self.getType().oclIsUndefined() and (
+		self.element.oclIsTypeOf(ActionExecutionSpecification)or
+		self.element.oclIsTypeOf(BehaviorExecutionSpecification)or
+		self.element.oclIsTypeOf(TimeObservation)or
+		self.element.oclIsTypeOf(InteractionUse)or
+		self.element.oclIsTypeOf(CombinedFragment)or
+		self.element.oclIsTypeOf(Comment)or
+		self.element.oclIsTypeOf(Lifeline)or
+		self.element.oclIsTypeOf(InteractionOperand)or
+		self.element.oclIsTypeOf(TimeConstraint)or
+		self.element.oclIsTypeOf(StateInvariant)or
+		self.element.oclIsTypeOf(CombinedFragment)or
+		self.element.oclIsTypeOf(Continuation)or
+		self.element.oclIsTypeOf(Interaction)or
+		self.element.oclIsTypeOf(Constraint)or
+		self.element.oclIsTypeOf(DurationConstraint)or
+		self.element.oclIsTypeOf(DurationObservation)or
+		self.element.oclIsTypeOf(ConsiderIgnoreFragment)or
+		self.element.oclIsTypeOf(DurationConstraint)or
+		self.element.oclIsTypeOf(DestructionOccurrenceSpecification)
+		
+	)
+}{}
+
+
+/****** Connector Labels ******/
+
+mapping BasicDecorationNode::toConnectorLabel() : DecorationNode inherits Node::toPapyrusConnectorLabel when {
+	not self.getType().oclIsUndefined() and (
+		self.type = 'ToMultiplicityLabel' or
+		self.type = 'ToRoleLabel' or
+		self.type = 'FromMultiplicityLabel' or
+		self.type = 'FromRoleLabel' or
+		self.type = 'NameLabel' or
+		self.type = 'KindLabel'
+	)
+}{
+	
+}
+
+/****** Compartments *******/
+
+mapping BasicDecorationNode::toLabel() : DecorationNode inherits Node::toPapyrusNode when {
+	not self.getType().oclIsUndefined() and
+	self.element.oclIsKindOf(uml::NamedElement) and 
+	self.type = 'Name'
+}{
+	
+}
+
+mapping BasicSemanticCompartment::toListCompartment() : BasicCompartment inherits Node::toPapyrusNode, DrawerStyle::toDrawerStyle when {
+	self.type.endsWith('Compartment') and not self.getType().oclIsUndefined()
+}{
+	result.children := self.findElement().map toContents(self);
+}
+
+mapping Element::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	CombinedFragment::toContents
+;
+
+mapping CombinedFragment::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	CombinedFragment::toCombinedFragmentCompartmentContents
+;
+
+mapping CombinedFragment::toCombinedFragmentCompartmentContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'Compartment';
+}{
+
+}
+
+
+
+
+
+
+
+/******* Edges ********/
+
+
+mapping UMLConnector::toPapyrusConnector() : Connector inherits Connector::toPapyrusConnector when {
+	self.type = '' and 
+	not self.getType().oclIsUndefined() and (
+		self.element.oclIsTypeOf(Message)or
+		self.element.oclIsTypeOf(Message)or
+		self.element.oclIsTypeOf(Message)or
+		self.element.oclIsTypeOf(Message)or
+		self.element.oclIsTypeOf(Message)or
+		self.element.oclIsTypeOf(Message)or
+		self.element.oclIsTypeOf(Message)or
+		self.element.oclIsTypeOf(GeneralOrdering)
+	)
+}{
+	result.styles := self.map toFontStyle();
+}
+
+/****** Element Type queries ******/
+
+query View::getNodeType(element : Element) : String {
+	return
+		if element.oclIsTypeOf(TimeObservation) then '3020' 
+		elif element.oclIsTypeOf(InteractionUse) then '3002' 
+		elif element.oclIsTypeOf(CombinedFragment) then '3004' 
+		elif element.oclIsTypeOf(CombinedFragment) then '3018' 
+		elif element.oclIsTypeOf(Comment) then '3009' 
+		elif element.oclIsTypeOf(Lifeline) then '3001' 
+		elif element.oclIsTypeOf(InteractionOperand) then '3005' 
+		elif element.oclIsTypeOf(TimeConstraint) then '3019' 
+		elif element.oclIsTypeOf(StateInvariant) then '3017' 
+		elif element.oclIsTypeOf(Continuation) then '3016' 
+		elif element.oclIsTypeOf(Interaction) then '2001' 
+		elif element.oclIsTypeOf(Constraint) then '3008' 
+		elif element.oclIsTypeOf(DurationConstraint) then '3021' 
+		elif element.oclIsTypeOf(DurationObservation) then '3024' 
+		elif element.oclIsTypeOf(ConsiderIgnoreFragment) then '3007' 
+		elif element.oclIsTypeOf(ActionExecutionSpecification) then '3006' 
+		elif element.oclIsTypeOf(DurationConstraint) then '3023' 
+		elif element.oclIsTypeOf(DestructionOccurrenceSpecification) then '3022' 
+		elif element.oclIsTypeOf(BehaviorExecutionSpecification) then '3003' 
+		else self.fail()
+	endif;
+}
+
+
+query View::getDecorationType(element : Element) : String{
+	var res := self.doGetDecorationType(element);
+	
+	/*log('Get papyrus ID for'+ self.element.eClass().name+', '+self.type);
+	
+	log(res);
+	
+	if self.container().oclIsKindOf(Node) then 
+		log('IsNode')
+	else 
+		log('IsEdge')
+	endif;*/
+	
+	return res;
+	
+}
+
+query View::doGetDecorationType(element : Element) : String{
+	return if self.container().oclIsKindOf(Node) then {
+		return if element.oclIsTypeOf(InteractionUse) then
+				return switch {
+					case (self.type = 'Name') '5003';
+					
+				}
+			elif element.oclIsTypeOf(Lifeline) then
+				return switch {
+					case (self.type = 'Name') '5002';
+					
+				}
+			elif element.oclIsTypeOf(StateInvariant) then
+				return switch {
+					case (self.type = 'Name') '5008';
+					
+				}
+			elif element.oclIsTypeOf(InteractionOperand) then
+				return switch {
+					
+					case (self.type.oclIsUndefined() or self.type = '') '7004';
+				}
+			elif element.oclIsTypeOf(Continuation) then
+				return switch {
+					case (self.type = 'Name') '5007';
+					
+				}
+			elif element.oclIsTypeOf(Interaction) then
+				return switch {
+					case (self.type = 'Name') '5001';
+					case (self.type = 'interaction_compartment') '7001';
+				}
+			elif element.oclIsTypeOf(Constraint) then
+				return switch {
+					case (self.type = 'Name') '5005';
+					
+				}
+		endif
+	} else {
+		return if element.oclIsTypeOf(Message) and (element.oclIsKindOf(uml::InteractionFragment)) and (element.oclIsKindOf(uml::InteractionFragment) or element.oclIsKindOf(uml::Lifeline)) then
+			return switch {
+				case (self.type='Name') '6001';		
+				case (self.type = 'NameLabel') '6001';
+				case (self.type = 'KindLabel') '6008';
+			}
+		
+			elif element.oclIsTypeOf(Message) and ((element.oclIsKindOf(uml::Lifeline) or element.oclIsKindOf(uml::InteractionFragment) or element.oclIsKindOf(uml::Gate))) and true then
+				return switch {
+							
+					case (self.type = 'NameLabel') '6002';
+					case (self.type = 'KindLabel') '6009';
+				}
+			
+			elif element.oclIsTypeOf(Message) and (element.oclIsKindOf(uml::InteractionFragment)) and ((element.oclIsKindOf(uml::Lifeline) or element.oclIsKindOf(uml::InteractionFragment) or element.oclIsKindOf(uml::Gate))) then
+				return switch {
+							
+					case (self.type = 'NameLabel') '6003';
+					case (self.type = 'KindLabel') '6010';
+				}
+			
+			elif element.oclIsTypeOf(Message) and (element.oclIsKindOf(uml::InteractionFragment) or element.oclIsKindOf(uml::Lifeline)) and (element.oclIsKindOf(uml::Lifeline)) then
+				return switch {
+							
+					case (self.type = 'NameLabel') '6004';
+					case (self.type = 'KindLabel') '6011';
+				}
+			
+			elif element.oclIsTypeOf(Message) and (element.oclIsKindOf(uml::InteractionFragment) or element.oclIsKindOf(uml::Lifeline)) and (element.oclIsKindOf(uml::DestructionOccurrenceSpecification) or element.oclIsKindOf(uml::Lifeline)) then
+				return switch {
+							
+					case (self.type = 'NameLabel') '6005';
+					case (self.type = 'KindLabel') '6012';
+				}
+			
+			elif element.oclIsTypeOf(Message) and ((element.oclIsKindOf(uml::Lifeline) or element.oclIsKindOf(uml::InteractionFragment) or element.oclIsKindOf(uml::Gate))) and (element.oclIsKindOf(uml::Interaction)) then
+				return switch {
+							
+					case (self.type = 'NameLabel') '6006';
+					case (self.type = 'KindLabel') '6013';
+				}
+			
+			elif element.oclIsTypeOf(Message) and (element.oclIsKindOf(uml::Interaction)) and ((element.oclIsKindOf(uml::Lifeline) or element.oclIsKindOf(uml::InteractionFragment) or element.oclIsKindOf(uml::Gate))) then
+				return switch {
+							
+					case (self.type = 'NameLabel') '6007';
+					case (self.type = 'KindLabel') '6014';
+				}
+			
+			elif element.oclIsTypeOf(GeneralOrdering)  then
+				return switch {
+							
+					case (self.type = 'KindLabel') '6015';
+				}
+			
+		endif
+	} endif;
+}
+
+
+query View::getEdgeType(element : Element) : String {
+	return
+		if element.oclIsTypeOf(Message) then '4003'
+		elif element.oclIsTypeOf(Message) then '4004'
+		elif element.oclIsTypeOf(Message) then '4005'
+		elif element.oclIsTypeOf(Message) then '4006'
+		elif element.oclIsTypeOf(Message) then '4007'
+		elif element.oclIsTypeOf(Message) then '4008'
+		elif element.oclIsTypeOf(Message) then '4009'
+		elif element.oclIsTypeOf(GeneralOrdering) then '4012'
+		else self.fail()
+	endif;
+}
+
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAStateMachineDiagram.qvto b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAStateMachineDiagram.qvto
new file mode 100644
index 00000000000..52e86bec212
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAStateMachineDiagram.qvto
@@ -0,0 +1,379 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+import RSAToPapyrus;
+
+modeltype notation "strict" uses 'http://www.eclipse.org/gmf/runtime/1.0.2/notation';
+modeltype umlNotation "strict" uses 'http://www.eclipse.org/papyrus/umlnotation';
+modeltype uml "strict" uses 'http://www.eclipse.org/uml2/5.0.0/UML';
+modeltype ecore "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
+modeltype sash "strict" uses 'http://www.eclipse.org/papyrus/0.7.0/sashdi';
+modeltype config "strict" uses 'http:///RSAToPapyrusParameters.ecore';
+
+transformation RSAStateMachineDiagram(inout semantics : uml, inout graphics : notation, out di : sash, in param : config);
+
+main() {
+	semantics.rootObjects()[uml::Element]->map toOwnedDiagrams();
+}
+
+query View::getDiagramType() : String{
+	return 'PapyrusUMLStateMachineDiagram';
+}
+
+mapping notation::Diagram::generateDiagram() : notation::Diagram inherits Diagram::toPapyrusDiagram when {
+	self.type = 'Statechart'
+}{
+	end {
+		graphics.objectsOfType(DecorationNode)->select(type = '3002').map addInRegion();
+		graphics.objectsOfType(Shape)->select(type = '2000').map createIntermediateCompartment();
+		graphics.objectsOfType(Shape)->select(type = '6000').map createStructureCompartment();
+		graphics.objectsOfType(DecorationNode)->select(type = '2001').map addLayout();		
+		graphics.objectsOfType(DecorationNode)->select(type = '6001').map fixLayout();
+		
+		graphics.objectsOfType(Shape)->select(type='666').map addCommentDecoration();
+		graphics.objectsOfType(Shape)->select(type = '668').map addConstraintDecoration();
+	}
+}
+
+mapping inout Shape::createIntermediateCompartment() {
+	var compartment := object DecorationNode {
+		type := '2002';
+		layoutConstraint := object Bounds{}
+	};
+	
+	compartment.children := self.children->select(type = '3000');
+	
+	children := children->insertAt(2, compartment); /* Required for layout: the Structure Compartment of the Region must be in 2nd position */
+}
+
+mapping inout DecorationNode::addInRegion() {
+	var currentParent := self.oclAsType(EObject).eContainer();
+	var currentBounds := self.layoutConstraint.oclAsType(Bounds);
+
+	var region := object Shape {
+		type := '3000';
+		layoutConstraint := object Bounds{
+			x := currentBounds.x;
+			y := currentBounds.y;
+		};
+		element := self.element;
+		children := self;
+		eAnnotations := object EAnnotation {
+			source := "RegionAnnotationKey";
+			details := object EStringToStringMapEntry{
+				key := "RegionZoneKey";
+				value := 'B';
+			}
+		}
+	};
+	
+	if self.layoutConstraint.oclIsUndefined() then self.layoutConstraint := object Bounds{} endif;
+	self.styles := self.styles->reject(oclIsTypeOf(TitleStyle));
+	
+	currentParent.oclAsType(View).children += region;
+}
+
+mapping inout Shape::createStructureCompartment() when {
+	not self.children->exists(type = '6002')
+}{
+	var compartment := object DecorationNode {
+		type := '6002';
+		visible := self.children->exists(type='3000');
+		layoutConstraint := object Bounds{};
+	};
+	
+	compartment.children += children->select(type = '3000');
+	children := children->insertAt(2, compartment);
+}
+
+mapping inout DecorationNode::addLayout() {
+	if self.layoutConstraint.oclIsUndefined() then self.layoutConstraint := object Bounds{} endif;
+}
+
+mapping inout DecorationNode::fixLayout(){
+	var bounds := if self.layoutConstraint.oclIsUndefined() then object Bounds{} else self.layoutConstraint.oclAsType(Bounds) endif;
+	self.layoutConstraint := bounds;
+	
+	if bounds.height < 20 then bounds.height := 20 endif;
+}
+
+mapping Node::toNode() : Node disjuncts
+	UMLShape::toPapyrusShape,
+	UMLShapeCompartment::toStructureCompartment,
+	BasicSemanticCompartment::toListCompartment,
+	BasicDecorationNode::toConnectorLabel,
+	BasicDecorationNode::toLabel
+	//TODO: Disjunct nodes mapping
+;
+
+mapping Edge::toEdge() : Edge disjuncts
+	UMLConnector::toPapyrusConnector,
+	UMLConnector::toCommentLink
+	//TODO: Disjunct edges mapping
+;
+
+mapping UMLShapeCompartment::toStructureCompartment() : DecorationNode inherits UMLShapeCompartment::toAbstractStructureCompartment when {
+	not self.getType().oclIsUndefined();
+}{
+	
+}
+
+mapping inout Shape::addCommentDecoration() when {
+	self.type = '666' and self.diagram.type = self.getDiagramType()
+} {
+	
+	self.children += object DecorationNode{
+		type := '6666';
+	}
+
+}
+
+mapping inout Shape::addConstraintDecoration() when {
+	self.type = '668' and self.diagram.type = self.getDiagramType()
+} {
+	
+	self.children += object DecorationNode{
+		type := '6669'; //Constraint specification
+	}	
+
+}
+
+/***** Nodes **********/
+
+mapping UMLShape::toPapyrusShape() : Shape inherits Shape::toPapyrusShape when {
+	not self.getType().oclIsUndefined()
+}{
+	
+}
+
+
+/****** Connector Labels ******/
+
+mapping BasicDecorationNode::toConnectorLabel() : DecorationNode inherits Node::toPapyrusConnectorLabel when {
+	not self.getType().oclIsUndefined() and (
+		self.type = 'ToMultiplicityLabel' or
+		self.type = 'ToRoleLabel' or
+		self.type = 'FromMultiplicityLabel' or
+		self.type = 'FromRoleLabel' or
+		self.type = 'NameLabel' or
+		self.type = 'KindLabel'
+	)
+}{
+	
+}
+
+/****** Compartments *******/
+
+mapping BasicDecorationNode::toLabel() : DecorationNode inherits Node::toPapyrusNode when {
+	not self.getType().oclIsUndefined() and
+	self.element.oclIsKindOf(uml::NamedElement) and 
+	self.type = 'Name'
+}{
+	
+}
+
+mapping BasicSemanticCompartment::toListCompartment() : BasicCompartment inherits Node::toPapyrusNode, DrawerStyle::toDrawerStyle when {
+	self.type.endsWith('Compartment') and not self.getType().oclIsUndefined()
+}{
+	
+}
+
+
+mapping uml::State::fillTransition(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='';
+}{
+	init {
+		result := self.incoming->selectByKind(Transition).map toTransitionIn(node)->asSequence();
+	}
+}
+
+mapping uml::State::fillBehavior(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='';
+}{
+	init {
+		result := self.entry->selectByKind(Behavior).map toBehaviorIn(node)->asSequence();
+	}
+}
+
+mapping Transition::toTransitionIn(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '680';
+}
+
+mapping Behavior::toBehaviorIn(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '690';
+}
+
+
+
+/******* Edges ********/
+
+
+mapping UMLConnector::toPapyrusConnector() : Connector inherits Connector::toPapyrusConnector when {
+	self.type = '' and 
+	not self.getType().oclIsUndefined() and (
+		self.element.oclIsTypeOf(Transition)or
+		self.element.oclIsTypeOf(Generalization)
+	)
+}{
+	result.styles := self.map toFontStyle();
+}
+
+
+mapping UMLConnector::toCommentLink() : Connector inherits Connector::toCommentLink when{
+	self.type='Reference'
+}{	
+	result.type :='667';
+	result.bendpoints := self.bendpoints.toBendpoint(self.diagram);
+	result.sourceAnchor := object IdentityAnchor{};		
+}
+
+/****** Element Type queries ******/
+
+query View::getNodeType(element : Element) : String {
+	return
+		if element.oclIsTypeOf(Comment) then '666' 
+		elif element.oclIsTypeOf(FinalState) then '5000' 
+		elif element.oclIsTypeOf(Pseudostate) and element.oclAsType(Pseudostate).kind = PseudostateKind::join then '9000' 
+		elif element.oclIsTypeOf(State) then '6000' 
+		elif element.oclIsTypeOf(Pseudostate) and element.oclAsType(Pseudostate).kind = PseudostateKind::shallowHistory then '13000' 
+		elif element.oclIsTypeOf(Pseudostate) and element.oclAsType(Pseudostate).kind = PseudostateKind::terminate then '15000' 
+		elif element.oclIsTypeOf(Pseudostate) and element.oclAsType(Pseudostate).kind = PseudostateKind::choice then '11000' 
+		elif element.oclIsTypeOf(Constraint) then '668' 
+		elif element.oclIsTypeOf(StateMachine) then '2000' 
+		elif element.oclIsTypeOf(Pseudostate) and element.oclAsType(Pseudostate).kind = PseudostateKind::fork then '10000' 
+		elif element.oclIsTypeOf(Region) then '3000' 
+		elif element.oclIsTypeOf(Pseudostate) and element.oclAsType(Pseudostate).kind = PseudostateKind::junction then '12000' 
+		elif element.oclIsTypeOf(Pseudostate) and element.oclAsType(Pseudostate).kind = PseudostateKind::deepHistory then '14000' 
+		elif element.oclIsTypeOf(Pseudostate) and element.oclAsType(Pseudostate).kind = PseudostateKind::initial then '8000'
+		elif element.oclIsTypeOf(Pseudostate) and element.oclAsType(Pseudostate).kind = PseudostateKind::entryPoint then '16000'
+		elif element.oclIsTypeOf(Pseudostate) and element.oclAsType(Pseudostate).kind = PseudostateKind::exitPoint then '17000'
+		elif element.oclIsTypeOf(ConnectionPointReference) then '18000'
+		else self.fail()
+	endif;
+}
+
+
+query View::getDecorationType(element : Element) : String{
+	var res := self.doGetDecorationType(element);
+	
+	
+	/*log('Get papyrus ID for'+ self.element.eClass().name+', '+self.type);
+	
+	log(res);
+	
+	if self.container().oclIsKindOf(Node) then 
+		log('IsNode')
+	else 
+		log('IsEdge')
+	endif;*/
+	
+	
+	return res;
+}
+
+query View::doGetDecorationType(element : Element) : String{
+	return if self.container().oclIsKindOf(Node) then {
+		return if element.oclIsTypeOf(Pseudostate) then
+			return switch {
+				case (self.type = 'Name') '11001';
+				
+			}
+			elif element.oclIsTypeOf(Pseudostate) then
+				return switch {
+					case (self.type = 'Name') '17001';
+					
+				}
+			elif element.oclIsTypeOf(Pseudostate) then
+				return switch {
+					case (self.type = 'Name') '13001';
+					
+				}
+			elif element.oclIsTypeOf(Pseudostate) then
+				return switch {
+					case (self.type = 'Name') '9001';
+					
+				}
+			elif element.oclIsTypeOf(Pseudostate) then
+				return switch {
+					case (self.type = 'Name') '8001';
+					
+				}
+			elif element.oclIsTypeOf(Region) then
+				return switch {
+					
+					case (self.type = 'Region' or self.type = '') '3002';
+				}
+			elif element.oclIsTypeOf(ConnectionPointReference) then
+				return switch {
+					case (self.type = 'Name') '18001';
+					
+				}
+			elif element.oclIsTypeOf(State) then
+				return switch {
+					case (self.type = 'Name') '6001';
+				}
+			elif element.oclIsTypeOf(FinalState) then
+				return switch {
+					case (self.type = 'Name') '5001';
+					
+				}
+			elif element.oclIsTypeOf(Pseudostate) then
+				return switch {
+					case (self.type = 'Name') '14001';
+					
+				}
+			elif element.oclIsTypeOf(Pseudostate) then
+				return switch {
+					case (self.type = 'Name') '15001';
+					
+				}
+			elif element.oclIsTypeOf(Pseudostate) then
+				return switch {
+					case (self.type = 'Name') '10001';
+					
+				}
+			elif element.oclIsTypeOf(Pseudostate) then
+				return switch {
+					case (self.type = 'Name') '16001';
+					
+				}
+			elif element.oclIsTypeOf(StateMachine) then
+				return switch {
+					case (self.type = 'Name') '2001';
+					case (self.type = 'StructureCompartment') '2002';
+				}
+			elif element.oclIsTypeOf(Pseudostate) then
+				return switch {
+					case (self.type = 'Name') '12001';
+					
+				}
+		endif
+	} else {
+		return if element.oclIsTypeOf(Transition)  then
+			return switch {
+				case (self.type='Name') '7001';		
+				case (self.type = 'NameLabel') '7001';
+				
+				
+			}
+		endif
+	} endif;
+}
+
+
+query View::getEdgeType(element : Element) : String {
+	return
+		if element.oclIsTypeOf(Transition) then '7000'
+		elif element.oclIsTypeOf(Generalization) then '19000'
+		else self.fail()
+	endif;
+}
+
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAStructureDiagram.qvto b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAStructureDiagram.qvto
new file mode 100644
index 00000000000..98e347706a7
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAStructureDiagram.qvto
@@ -0,0 +1,817 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+import RSAToPapyrus;
+
+modeltype notation "strict" uses 'http://www.eclipse.org/gmf/runtime/1.0.2/notation';
+modeltype umlNotation "strict" uses 'http://www.eclipse.org/papyrus/umlnotation';
+modeltype uml "strict" uses 'http://www.eclipse.org/uml2/5.0.0/UML';
+modeltype ecore "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
+modeltype sash "strict" uses 'http://www.eclipse.org/papyrus/0.7.0/sashdi';
+modeltype config "strict" uses 'http:///RSAToPapyrusParameters.ecore';
+
+transformation RSAStructureDiagram(inout semantics : uml, inout graphics : notation, out di : sash, in param : config);
+
+main() {
+	semantics.rootObjects()[uml::Element]->map toOwnedDiagrams();
+}
+
+query View::getDiagramType() : String{
+	return 'CompositeStructure';
+}
+
+mapping notation::Diagram::generateDiagram() : notation::Diagram inherits Diagram::toPapyrusDiagram when {
+	self.type = 'Structure'
+}{
+	init {
+		
+	}
+	end {
+		graphics.objectsOfType(Shape)->select(type = '2109').map addCommentDecoration();
+		graphics.objectsOfType(Shape)->select(type = '2114').map addConstraintDecoration();
+	}
+}
+
+
+mapping inout Shape::addCommentDecoration() when {
+	self.type = '2109' and self.diagram.type = self.getDiagramType()
+} {
+	
+	self.children += object DecorationNode{
+		type := '5192'; //Comment body
+	}	
+
+}
+
+mapping inout Shape::addConstraintDecoration() when {
+	self.type = '2114' and self.diagram.type = self.getDiagramType()
+} {
+	
+	self.children += object DecorationNode{
+		type := '6039'; //Constraint specification
+	}
+}
+
+
+mapping Node::toNode() : Node disjuncts
+	UMLShape::toPapyrusShape,
+	UMLShapeCompartment::toStructureCompartment,
+	BasicSemanticCompartment::toListCompartment,
+	BasicDecorationNode::toConnectorLabel,
+	BasicDecorationNode::toLabel
+	//TODO: Disjunct nodes mapping
+;
+
+mapping Edge::toEdge() : Edge disjuncts
+	UMLConnector::toPapyrusConnector,
+	UMLConnector::toCommentLink
+	//TODO: Disjunct edges mapping
+;
+
+mapping UMLShapeCompartment::toStructureCompartment() : DecorationNode inherits UMLShapeCompartment::toAbstractStructureCompartment when {
+	self.type = 'StructureCompartment' or self.type = 'PackageContents' and not self.getType().oclIsUndefined();
+}{
+	
+}
+
+
+/***** Nodes **********/
+
+mapping UMLShape::toPapyrusShape() : Shape inherits Shape::toPapyrusShape when {
+	not self.getType().oclIsUndefined() and (
+		self.element.oclIsTypeOf(DurationInterval)or
+	self.element.oclIsTypeOf(UseCase)or
+	self.element.oclIsTypeOf(Port)or
+	self.element.oclIsTypeOf(LiteralInteger)or
+	self.element.oclIsTypeOf(Node)or
+	self.element.oclIsTypeOf(Class)or
+	self.element.oclIsTypeOf(Expression)or
+	self.element.oclIsTypeOf(IntervalConstraint)or
+	self.element.oclIsTypeOf(InteractionConstraint)or
+	self.element.oclIsTypeOf(TimeConstraint)or
+	self.element.oclIsTypeOf(OpaqueBehavior)or
+	self.element.oclIsTypeOf(Duration)or
+	self.element.oclIsTypeOf(Actor)or
+	self.element.oclIsTypeOf(TimeEvent)or
+	self.element.oclIsTypeOf(DurationConstraint)or
+	//self.element.oclIsTypeOf(Interface)or
+	self.element.oclIsTypeOf(SignalEvent)or
+	self.element.oclIsTypeOf(TimeExpression)or
+	self.element.oclIsTypeOf(Enumeration)or
+	self.element.oclIsTypeOf(OpaqueExpression)or
+	self.element.oclIsTypeOf(LiteralBoolean)or
+	self.element.oclIsTypeOf(AnyReceiveEvent)or
+	self.element.oclIsTypeOf(FunctionBehavior)or
+	self.element.oclIsTypeOf(LiteralUnlimitedNatural)or
+	self.element.oclIsTypeOf(Activity)or
+	self.element.oclIsTypeOf(Signal)or
+	self.element.oclIsTypeOf(Parameter)or
+	self.element.oclIsTypeOf(StringExpression)or
+	self.element.oclIsTypeOf(Interval)or
+	self.element.oclIsTypeOf(PrimitiveType)or
+	self.element.oclIsTypeOf(CollaborationUse)or
+	self.element.oclIsTypeOf(TimeObservation)or
+	self.element.oclIsTypeOf(DeploymentSpecification)or
+	self.element.oclIsTypeOf(StateMachine)or
+	self.element.oclIsTypeOf(Device)or
+	self.element.oclIsTypeOf(Comment)or
+	self.element.oclIsTypeOf(InformationItem)or
+	self.element.oclIsTypeOf(Artifact)or
+	self.element.oclIsTypeOf(Collaboration)or
+	self.element.oclIsTypeOf(ProtocolStateMachine)or
+	self.element.oclIsTypeOf(TimeInterval)or
+	self.element.oclIsTypeOf(CallEvent)or
+	self.element.oclIsTypeOf(InstanceValue)or
+	self.element.oclIsTypeOf(DurationObservation)or
+	self.element.oclIsTypeOf(Property)or
+	self.element.oclIsTypeOf(Constraint)or
+	self.element.oclIsTypeOf(ExecutionEnvironment)or
+	self.element.oclIsTypeOf(LiteralString)or
+	self.element.oclIsTypeOf(DataType)or
+	self.element.oclIsTypeOf(ChangeEvent)or
+	self.element.oclIsTypeOf(Component)or
+	self.element.oclIsTypeOf(LiteralNull)or
+	self.element.oclIsTypeOf(Interaction)
+	)
+}{
+	
+}
+
+
+/****** Connector Labels ******/
+
+mapping BasicDecorationNode::toConnectorLabel() : DecorationNode inherits Node::toPapyrusConnectorLabel when {
+	not self.getType().oclIsUndefined() and (
+		self.type = 'ToMultiplicityLabel' or
+		self.type = 'ToRoleLabel' or
+		self.type = 'FromMultiplicityLabel' or
+		self.type = 'FromRoleLabel' or
+		self.type = 'NameLabel' or
+		self.type = 'KindLabel' or
+		self.type = 'PartTextCompartment' or
+		self.type = 'PartName' or
+		self.type = 'CommentBody'
+	)
+}{
+	
+}
+
+/****** Compartments *******/
+
+mapping BasicDecorationNode::toLabel() : DecorationNode inherits Node::toPapyrusNode when {
+	not self.getType().oclIsUndefined() and
+	self.element.oclIsKindOf(uml::NamedElement) and 
+	self.type = 'Name' or self.type = 'PartName'
+}{
+	
+}
+
+mapping BasicSemanticCompartment::toListCompartment() : BasicCompartment inherits Node::toPapyrusNode, DrawerStyle::toDrawerStyle when {
+	self.type.endsWith('Compartment') and not self.getType().oclIsUndefined()
+}{
+	result.children := self.findElement().map toContents(self);
+}
+
+mapping Element::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	Enumeration::toContents,
+	DataType::toContents
+;
+
+mapping Enumeration::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	Enumeration::toliteralsContents
+;
+
+mapping DataType::toContents(node : BasicSemanticCompartment) : Sequence(Node) disjuncts
+	DataType::topropertiesContents,
+	DataType::tooperationsContents
+;
+
+mapping Enumeration::toliteralsContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'EnumerationLiteralCompartment';
+}{
+	init {
+		result := (self.map fillEnumerationLiteral(node))
+	}
+}
+
+mapping DataType::topropertiesContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'Compartment';
+}{
+	init {
+		result := (self.map fillProperty(node))
+	}
+}
+
+mapping DataType::tooperationsContents(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type = 'Compartment';
+}{
+	init {
+		result := (self.map fillOperation(node))
+	}
+}
+
+mapping uml::DataType::fillProperty(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='Compartment';
+}{
+	init {
+		result := self.ownedAttribute->selectByKind(Property).map toPropertyInDataType(node)->asSequence();
+	}
+}
+
+mapping uml::DataType::fillOperation(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='Compartment';
+}{
+	init {
+		result := self.ownedOperation->selectByKind(Operation).map toOperationInDataType(node)->asSequence();
+	}
+}
+
+
+
+mapping uml::Enumeration::fillEnumerationLiteral(node : BasicSemanticCompartment) : Sequence(Node) when {
+	node.type='EnumerationLiteralCompartment';
+}{
+	init {
+		result := self.ownedLiteral->selectByKind(EnumerationLiteral).map toEnumerationLiteralInEnumeration(node)->asSequence();
+	}
+}
+
+mapping UMLConnector::toCommentLink() : Connector inherits Connector::toCommentLink when{
+	self.type='Reference'
+}{	
+	result.type :='4002';
+	result.bendpoints := self.bendpoints.toBendpoint(self.diagram);
+	result.sourceAnchor := object IdentityAnchor{};		
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+mapping Property::toPropertyInDataType(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3101';
+}
+
+mapping Operation::toOperationInDataType(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3102';
+}
+
+mapping Reception::toReceptionIn(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3100';
+}
+
+mapping EnumerationLiteral::toEnumerationLiteralInEnumeration(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3066';
+}
+
+mapping Activity::toActivityIn(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3103';
+}
+
+mapping Interaction::toInteractionIn(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3104';
+}
+
+mapping ProtocolStateMachine::toProtocolStateMachineIn(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3105';
+}
+
+mapping StateMachine::toStateMachineIn(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3106';
+}
+
+mapping FunctionBehavior::toFunctionBehaviorIn(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3107';
+}
+
+mapping OpaqueBehavior::toOpaqueBehaviorIn(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3108';
+}
+
+mapping Collaboration::toCollaborationIn(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3109';
+}
+
+mapping Interface::toInterfaceIn(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3110';
+}
+
+mapping Enumeration::toEnumerationIn(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3111';
+}
+
+mapping PrimitiveType::toPrimitiveTypeIn(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3112';
+}
+
+mapping DataType::toDataTypeIn(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3113';
+}
+
+mapping Class::toClassIn(node : Node) : Shape inherits Element::toCompartmentEntry {
+	result.type := '3114';
+}
+
+
+
+/******* Edges ********/
+
+
+mapping UMLConnector::toPapyrusConnector() : notation::Connector inherits Connector::toPapyrusConnector when {
+	not self.getType().oclIsUndefined() and (
+		self.element.oclIsTypeOf(ComponentRealization)or
+		self.element.oclIsTypeOf(InterfaceRealization)or
+		self.element.oclIsTypeOf(Substitution)or
+		self.element.oclIsTypeOf(Realization)or
+		self.element.oclIsTypeOf(Manifestation)or
+		self.element.oclIsTypeOf(Abstraction)or
+		self.element.oclIsTypeOf(Usage)or
+		self.element.oclIsTypeOf(Deployment)or
+		self.element.oclIsTypeOf(Dependency)or
+		self.element.oclIsTypeOf(Dependency)or
+		self.element.oclIsTypeOf(uml::Connector)or
+		self.element.oclIsTypeOf(Generalization)or
+		self.element.oclIsTypeOf(InformationFlow)
+	)
+}{
+	result.styles := self.map toFontStyle();
+}
+
+/****** Element Type queries ******/
+
+query View::getNodeType(element : Element) : String {
+	return
+		if element.oclIsTypeOf(DurationInterval) then '2106' 
+		elif element.oclIsTypeOf(UseCase) then '2082' 
+		elif element.oclIsTypeOf(Port) then '3069' 
+		elif element.oclIsTypeOf(LiteralInteger) then '2096' 
+		elif element.oclIsTypeOf(Node) then '2072' 
+		elif element.oclIsTypeOf(Class) then '2073' 
+		elif element.oclIsTypeOf(Expression) then '2103' 
+		elif element.oclIsTypeOf(IntervalConstraint) then '2112' 
+		elif element.oclIsTypeOf(InteractionConstraint) then '2113' 
+		elif element.oclIsTypeOf(TimeConstraint) then '2111' 
+		elif element.oclIsTypeOf(OpaqueBehavior) then '2065' 
+		elif element.oclIsTypeOf(Duration) then '2104' 
+		elif element.oclIsTypeOf(Actor) then '2077' 
+		elif element.oclIsTypeOf(TimeEvent) then '2089' 
+		elif element.oclIsTypeOf(DurationConstraint) then '2110' 
+		//elif element.oclIsTypeOf(Interface) then '2076' 
+		elif element.oclIsTypeOf(SignalEvent) then '2083' 
+		elif element.oclIsTypeOf(TimeExpression) then '2102' 
+		elif element.oclIsTypeOf(Enumeration) then '2067' 
+		elif element.oclIsTypeOf(OpaqueExpression) then '2101' 
+		elif element.oclIsTypeOf(LiteralBoolean) then '2095' 
+		elif element.oclIsTypeOf(AnyReceiveEvent) then '2085' 
+		elif element.oclIsTypeOf(FunctionBehavior) then '2064' 
+		elif element.oclIsTypeOf(LiteralUnlimitedNatural) then '2099' 
+		elif element.oclIsTypeOf(Activity) then '2060' 
+		elif element.oclIsTypeOf(Signal) then '2081' 
+		elif element.oclIsTypeOf(Parameter) then '3088' 
+		elif element.oclIsTypeOf(StringExpression) then '2100' 
+		elif element.oclIsTypeOf(Interval) then '2107' 
+		elif element.oclIsTypeOf(PrimitiveType) then '2066' 
+		elif element.oclIsTypeOf(CollaborationUse) then '3071' 
+		elif element.oclIsTypeOf(TimeObservation) then '2094' 
+		elif element.oclIsTypeOf(DeploymentSpecification) then '2078' 
+		elif element.oclIsTypeOf(StateMachine) then '2063' 
+		elif element.oclIsTypeOf(Device) then '2070' 
+		elif element.oclIsTypeOf(Comment) then '2109' 
+		elif element.oclIsTypeOf(InformationItem) then '2080' 
+		elif element.oclIsTypeOf(Artifact) then '2079' 
+		elif element.oclIsTypeOf(Collaboration) then '2075' 
+		elif element.oclIsTypeOf(ProtocolStateMachine) then '2062' 
+		elif element.oclIsTypeOf(TimeInterval) then '2105' 
+		elif element.oclIsTypeOf(CallEvent) then '2084' 
+		elif element.oclIsTypeOf(InstanceValue) then '2108' 
+		elif element.oclIsTypeOf(DurationObservation) then '2093' 
+		elif element.oclIsTypeOf(Property) then '3070' 
+		elif element.oclIsTypeOf(Constraint) then '2114' 
+		elif element.oclIsTypeOf(ExecutionEnvironment) then '2071' 
+		elif element.oclIsTypeOf(LiteralString) then '2098' 
+		elif element.oclIsTypeOf(DataType) then '2068' 
+		elif element.oclIsTypeOf(ChangeEvent) then '2088' 
+		elif element.oclIsTypeOf(Component) then '2069' 
+		elif element.oclIsTypeOf(LiteralNull) then '2097' 
+		elif element.oclIsTypeOf(Interaction) then '2061' 
+		else self.fail()
+	endif;
+}
+
+
+query View::getDecorationType(element : Element) : String{
+	var res := self.doGetDecorationType(element);
+	
+	
+	/*log('Get papyrus ID for'+ self.element.eClass().name+', '+self.type);
+	
+	log(res);
+	
+	if self.container().oclIsKindOf(Node) then 
+		log('IsNode')
+	else 
+		log('IsEdge')
+	endif;*/
+	
+	
+	return res;
+}
+
+query View::doGetDecorationType(element : Element) : String{
+	return if self.container().oclIsKindOf(Node) then {
+		return if element.oclIsTypeOf(DurationInterval) then
+			return switch {
+				case (self.type = 'Name' or self.type = 'PartName') '5189';
+				
+			}
+			elif element.oclIsTypeOf(UseCase) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5165';
+					
+				}
+			elif element.oclIsTypeOf(Port) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5125';
+					
+				}
+			elif element.oclIsTypeOf(LiteralInteger) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5179';
+					
+				}
+			elif element.oclIsTypeOf(Node) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5124';
+					case (self.type = 'StructureCompartment') '7072';
+				}
+			elif element.oclIsTypeOf(Class) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5156';
+					case (self.type = 'StructureCompartment') '7073';
+				}
+			elif element.oclIsTypeOf(Expression) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5186';
+					
+				}
+			elif element.oclIsTypeOf(IntervalConstraint) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5195';
+					
+				}
+			elif element.oclIsTypeOf(InteractionConstraint) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5196';
+					
+				}
+			elif element.oclIsTypeOf(TimeConstraint) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5194';
+					
+				}
+			elif element.oclIsTypeOf(OpaqueBehavior) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5117';
+					case (self.type = 'StructureCompartment') '7068';
+				}
+			elif element.oclIsTypeOf(Duration) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5187';
+					
+				}
+			elif element.oclIsTypeOf(Actor) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5160';
+					
+				}
+			elif element.oclIsTypeOf(TimeEvent) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5172';
+					
+				}
+			elif element.oclIsTypeOf(DurationConstraint) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5193';
+					
+				}
+			elif element.oclIsTypeOf(Interface) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5159';
+					
+				}
+			elif element.oclIsTypeOf(SignalEvent) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5166';
+					
+				}
+			elif element.oclIsTypeOf(TimeExpression) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5185';
+					
+				}
+			elif element.oclIsTypeOf(Enumeration) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5119';
+					case (self.type = 'EnumerationLiteralCompartment') '7048';
+				}
+			elif element.oclIsTypeOf(OpaqueExpression) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5184';
+					
+				}
+			elif element.oclIsTypeOf(LiteralBoolean) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5178';
+					
+				}
+			elif element.oclIsTypeOf(AnyReceiveEvent) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5168';
+					
+				}
+			elif element.oclIsTypeOf(FunctionBehavior) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5116';
+					case (self.type = 'StructureCompartment') '7067';
+				}
+			elif element.oclIsTypeOf(LiteralUnlimitedNatural) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5182';
+					
+				}
+			elif element.oclIsTypeOf(Activity) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5112';
+					case (self.type = 'StructureCompartment') '7063';
+				}
+			elif element.oclIsTypeOf(Signal) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5164';
+					
+				}
+			elif element.oclIsTypeOf(Parameter) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '6033';
+					
+				}
+			elif element.oclIsTypeOf(StringExpression) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5183';
+					
+				}
+			elif element.oclIsTypeOf(Interval) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5190';
+					
+				}
+			elif element.oclIsTypeOf(PrimitiveType) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5118';
+					
+				}
+			elif element.oclIsTypeOf(CollaborationUse) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5127';
+					
+				}
+			elif element.oclIsTypeOf(TimeObservation) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5142';
+					
+				}
+			elif element.oclIsTypeOf(DeploymentSpecification) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5161';
+					
+				}
+			elif element.oclIsTypeOf(StateMachine) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5115';
+					case (self.type = 'StructureCompartment') '7066';
+				}
+			elif element.oclIsTypeOf(Device) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5122';
+					case (self.type = 'StructureCompartment') '7070';
+				}
+			elif element.oclIsTypeOf(InformationItem) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5163';
+					
+				}
+			elif element.oclIsTypeOf(Artifact) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5162';
+					
+				}
+			elif element.oclIsTypeOf(Collaboration) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5158';
+					case (self.type = 'StructureCompartment') '7075';
+				}
+			elif element.oclIsTypeOf(ProtocolStateMachine) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5114';
+					case (self.type = 'StructureCompartment') '7065';
+				}
+			elif element.oclIsTypeOf(TimeInterval) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5188';
+					
+				}
+			elif element.oclIsTypeOf(CallEvent) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5167';
+					
+				}
+			elif element.oclIsTypeOf(InstanceValue) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5191';
+					
+				}
+			elif element.oclIsTypeOf(DurationObservation) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5151';
+					
+				}
+			elif element.oclIsTypeOf(Property) then
+				return switch {
+					case (self.type = 'PartName' or self.type='PartTextCompartment') '5126';
+					case (self.type = 'StructureCompartment') '7077';
+				}
+			elif element.oclIsTypeOf(Constraint) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5197';
+					
+				}
+			elif element.oclIsTypeOf(ExecutionEnvironment) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5123';
+					case (self.type = 'StructureCompartment') '7071';
+				}
+			elif element.oclIsTypeOf(LiteralString) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5181';
+					
+				}
+			elif element.oclIsTypeOf(DataType) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5120';
+					case (self.type = 'Compartment') '7033';
+				case (self.type = 'Compartment') '7034';
+				}
+			elif element.oclIsTypeOf(ChangeEvent) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5171';
+					
+				}
+			elif element.oclIsTypeOf(Component) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5121';
+					case (self.type = 'StructureCompartment') '7069';
+				}
+			elif element.oclIsTypeOf(LiteralNull) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5180';
+					
+				}
+			elif element.oclIsTypeOf(Interaction) then
+				return switch {
+					case (self.type = 'Name' or self.type = 'PartName') '5113';
+					case (self.type = 'StructureCompartment') '7064';
+				}
+			elif element.oclIsTypeOf(Comment) then
+				return switch {
+					case (self.type = 'CommentBody') '5192';
+				}
+		endif
+	} else {
+		return if element.oclIsTypeOf(ComponentRealization)  then
+			return switch {
+				case (self.type='Name') '6001';		
+				case (self.type = 'NameLabel') '6001';
+				case (self.type = 'KindLabel') '6015';
+			}
+			elif element.oclIsTypeOf(InterfaceRealization)  then
+				return switch {
+					case (self.type='Name') '6002';		
+					case (self.type = 'NameLabel') '6002';
+					case (self.type = 'KindLabel') '6016';
+				}
+			elif element.oclIsTypeOf(Substitution)  then
+				return switch {
+					case (self.type='Name') '6003';		
+					case (self.type = 'NameLabel') '6003';
+					case (self.type = 'KindLabel') '6017';
+				}
+			elif element.oclIsTypeOf(Realization)  then
+				return switch {
+					case (self.type='Name') '6004';		
+					case (self.type = 'NameLabel') '6004';
+					case (self.type = 'KindLabel') '6018';
+				}
+			elif element.oclIsTypeOf(Manifestation)  then
+				return switch {
+					case (self.type='Name') '6005';		
+					case (self.type = 'NameLabel') '6005';
+					case (self.type = 'KindLabel') '6019';
+				}
+			elif element.oclIsTypeOf(Abstraction)  then
+				return switch {
+					case (self.type='Name') '6006';		
+					case (self.type = 'NameLabel') '6006';
+					case (self.type = 'KindLabel') '6020';
+				}
+			elif element.oclIsTypeOf(Usage)  then
+				return switch {
+					case (self.type='Name') '6007';		
+					case (self.type = 'NameLabel') '6007';
+					case (self.type = 'KindLabel') '6021';
+				}
+			elif element.oclIsTypeOf(Deployment)  then
+				return switch {
+					case (self.type='Name') '6008';		
+					case (self.type = 'NameLabel') '6008';
+					case (self.type = 'KindLabel') '6022';
+				}
+			elif element.oclIsTypeOf(Dependency)  then
+				return switch {
+					case (self.type='Name') '6027';		
+					case (self.type = 'NameLabel') '6027';
+					case (self.type = 'KindLabel') '6028';
+				}
+			elif element.oclIsTypeOf(Dependency)  then
+				return switch {
+					case (self.type='Name') '6009';		
+					case (self.type = 'NameLabel') '6009';
+					case (self.type = 'KindLabel') '6023';
+				}
+			elif element.oclIsTypeOf(uml::Connector)  then
+				return switch {
+					case (self.type='Name') '6050';		
+					case (self.type = 'KindLabel') '6025';
+					case (self.type = 'NameLabel') '6050';
+					case (self.type = 'FromMultiplicityLabel') '6051';
+					case (self.type = 'ToMultiplicityLabel') '6052';
+				}
+			elif element.oclIsTypeOf(Generalization)  then
+				return switch {
+							
+					case (self.type = 'KindLabel') '6024';
+				}
+			elif element.oclIsTypeOf(InformationFlow)  then
+				return switch {
+							
+					
+					case (self.type = 'KindLabel') '6032';
+				}
+		endif
+	} endif;
+}
+
+
+query View::getEdgeType(element : Element) : String {
+	return
+		if element.oclIsTypeOf(ComponentRealization) then '4004'
+		elif element.oclIsTypeOf(InterfaceRealization) then '4005'
+		elif element.oclIsTypeOf(Substitution) then '4011'
+		elif element.oclIsTypeOf(Realization) then '4006'
+		elif element.oclIsTypeOf(Manifestation) then '4012'
+		elif element.oclIsTypeOf(Abstraction) then '4007'
+		elif element.oclIsTypeOf(Usage) then '4008'
+		elif element.oclIsTypeOf(Deployment) then '4009'
+		elif element.oclIsTypeOf(Dependency) then '4017'
+		elif element.oclIsTypeOf(Dependency) then '4010'
+		elif element.oclIsTypeOf(uml::Connector) then '4013'
+		elif element.oclIsTypeOf(Generalization) then '4015'
+		elif element.oclIsTypeOf(InformationFlow) then '4021'
+		else self.fail()
+	endif;
+}
+
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAToPapyrus.qvto b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAToPapyrus.qvto
new file mode 100644
index 00000000000..9ef1c7c1ba9
--- /dev/null
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAToPapyrus.qvto
@@ -0,0 +1,379 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+import org.eclipse.papyrus.m2m.qvto.UI;
+import org.eclipse.papyrus.m2m.qvto.NotationTypes;
+import libraries.EclipseUI;
+
+modeltype notation "strict" uses 'http://www.eclipse.org/gmf/runtime/1.0.2/notation';
+modeltype umlNotation "strict" uses 'http://www.eclipse.org/papyrus/umlnotation';
+modeltype uml "strict" uses 'http://www.eclipse.org/uml2/5.0.0/UML';
+modeltype ecore "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
+modeltype config "strict" uses 'http:///RSAToPapyrusParameters.ecore';
+
+/**
+*	Abstract transformation rules for importing notation diagrams into Papyrus
+*/
+transformation RSAToPapyrus(inout semantics : uml, out graphics : notation, in param : config);
+
+
+main() {
+	semantics.rootObjects()[uml::Element]->map toOwnedDiagrams();
+}
+
+mapping inout Element::toOwnedDiagrams(){
+	self.ownedElement.map toOwnedDiagrams();
+	
+	self.eAnnotations->select (source = 'uml2.diagrams' or source = 'uml2.profile.diagrams').map toOwnedDiagrams();
+	//self.eAnnotations := self.eAnnotations->reject(source = 'uml2.diagrams' or source = 'uml2.profile.diagrams'); /* Delete diagrams from resulting UML Model */
+}
+
+mapping EAnnotation::toOwnedDiagrams()
+	when { self.source = 'uml2.diagrams' or self.source = 'uml2.profile.diagrams'}{
+	
+	self.contents->selectByKind(notation::Diagram).map generateDiagram();
+	
+}
+
+
+
+
+/** Abstract mappings. Never called directly, inherited only */
+
+
+abstract mapping notation::View::toPapyrusView() : notation::View {
+	result.element := self.element; /* UML Model is in-out. No mapping required. */
+	result.visible := self.visible;
+	
+	result.children := self.children.map toNode();
+	result.type := self.getType();
+}
+
+abstract mapping Edge::toPapyrusEdge() : Edge inherits View::toPapyrusView {
+	result.bendpoints := self.bendpoints.map toBendpoint(self.diagram);
+	result.sourceAnchor := self.sourceAnchor.map toAnchor();
+	result.targetAnchor := self.targetAnchor.map toAnchor();
+	
+	result.source := self.source.map toView();
+	result.target := self.target.map toView();
+}
+
+abstract mapping Connector::toPapyrusConnector() : Connector inherits Edge::toPapyrusEdge, RoutingStyle::toRoutingstyle, LineStyle::toLineStyle {};
+
+abstract mapping Connector::toCommentLink() : Connector inherits Connector::toPapyrusConnector{};
+
+abstract mapping Node::toPapyrusNode() : Node inherits View::toPapyrusView{};
+
+abstract mapping inout Shape::addCommentDecoration(){};
+
+abstract mapping Node::toPapyrusConnectorLabel() : Node {
+	result.visible := self.visible;
+	result.type := self.getType();
+	
+	var initX := self.layoutConstraint.oclAsType(Location).x;
+	var initY := self.layoutConstraint.oclAsType(Location).y;
+	
+	if self.diagram.isHimetric() then {
+		initX := initX.toPixels();
+		initY := initY.toPixels();
+	} endif;
+	
+	result.layoutConstraint := object Location {
+		x := initX;
+		y := initY;
+	};
+	
+	//Do not set element
+	//Do not set children
+}
+
+abstract mapping Shape::toPapyrusShape() : Shape inherits Node::toPapyrusNode, FillStyle::toFillStyle, FontStyle::toFontStyle, LineStyle::toLineStyle{
+	result.layoutConstraint := self.layoutConstraint.map toLayout(self.diagram);
+}
+
+abstract mapping DrawerStyle::toDrawerStyle() : DrawerStyle {
+	result.collapsed := self.collapsed;
+}
+
+abstract mapping BasicSemanticCompartment::toBasicCompartment() : BasicCompartment inherits Node::toPapyrusNode, DrawerStyle::toDrawerStyle {
+	result.styles := object TitleStyle{
+		showTitle := self.styles->selectByKind(TitleStyle)->any(true).showTitle;
+	};
+}
+
+abstract mapping UMLShapeCompartment::toAbstractStructureCompartment() : DecorationNode inherits Node::toPapyrusNode {
+	result.styles := object TitleStyle{
+		showTitle := self.showTitle;
+	};
+}
+
+abstract mapping Diagram::toPapyrusDiagram() : notation::Diagram inherits notation::View::toPapyrusView {
+
+	population {
+		result.name := self.getName();
+		
+		/* Papyrus uses Pixel, whereas RSA uses Himetric. Forcing the conversion to Pixel is a bad idea */
+		result.measurementUnit := MeasurementUnit::Pixel; 
+		result.styles := createDiagramStyle();
+		
+		result.element := self.findElement().oclAsType(EObject);
+	//	log(result.element.eClass().name);
+	//	log(result.element.toString());
+		result.edges := self.edges.map toEdge();
+	}
+	
+	end {
+		worked(1);
+	}
+}
+
+query Diagram::getName() : String{
+	return if self.name.oclIsUndefined() or self.name = '' then {
+		var element := self.findElement();
+		return if element.oclIsKindOf(NamedElement) then
+			element.oclAsType(NamedElement).getDiagramName()
+		else
+			''
+		endif;
+	} else
+		self.name
+	endif;	
+}
+
+query NamedElement::getDiagramName() : String {
+	return if self.oclIsKindOf(Behavior) then
+		self.owner.oclAsType(NamedElement).getDiagramName()
+	else
+		self.name
+	endif;
+}
+
+query Diagram::findElement() : Element {
+	return if self.container().container().oclIsUndefined() then semantics.rootObjects()[Element]->any(true) else self.container().container().oclAsType(Element) endif;
+}
+
+abstract mapping Element::toCompartmentEntry(node : Node) : Shape {
+	result.element := self.oclAsType(EObject);
+	//result.type := self.findType(node);
+}
+
+helper createDiagramStyle() : DiagramStyle {
+	return object DiagramStyle {
+		
+	};
+}
+
+
+/** Common mappings: Copy (Call or Inherit) */
+
+mapping FontStyle::toFontStyle() : FontStyle {
+	result.fontColor := self.fontColor;
+	result.fontName := self.fontName;
+	result.fontHeight := self.fontHeight;
+	result.bold := self.bold;
+	result.italic := self.italic;
+	result.underline := self.underline;
+	result.strikeThrough := self.strikeThrough;
+}
+
+mapping FillStyle::toFillStyle() : FillStyle {
+	result.fillColor := self.fillColor;
+	result.transparency := self.transparency;
+	
+	//TODO: Gradient
+}
+
+mapping LineStyle::toLineStyle() : LineStyle {
+	result.lineColor := self.lineColor;
+	result.lineWidth := self.lineWidth;
+}
+
+mapping RoutingStyle::toRoutingstyle() : RoutingStyle {
+	result.roundedBendpointsRadius := self.roundedBendpointsRadius;
+	result.routing := self.routing;
+	result.smoothness := self.smoothness;
+	result.avoidObstructions := self.avoidObstructions;
+	result.closestDistance := self.closestDistance;
+	result.jumpLinkStatus := self.jumpLinkStatus;
+	result.jumpLinkType := self.jumpLinkType;
+	result.jumpLinksReverse := self.jumpLinksReverse;
+}
+
+abstract mapping Bendpoints::toBendpoint(diagram: Diagram) : Bendpoints disjuncts 
+	RelativeBendpoints::toBendpoint
+;
+
+mapping RelativeBendpoints::toBendpoint(diagram: Diagram) : Bendpoints {
+	init {
+		result := object RelativeBendpoints {}
+	}
+	
+	var convertToPixels := diagram.isHimetric();
+	self.copyBendpoints(result.oclAsType(RelativeBendpoints), convertToPixels);
+}
+
+mapping LayoutConstraint::toLayout(diagram : Diagram) : LayoutConstraint disjuncts 
+	Bounds::toLayout{
+}
+
+mapping Bounds::toLayout(diagram : Diagram) : LayoutConstraint {
+	init {
+		result := object Bounds{}
+	}
+	
+	var bounds : Bounds := result.oclAsType(Bounds);
+	
+	if diagram.isHimetric() then {
+		bounds.x := self.x.toPixels();
+		bounds.y := self.y.toPixels();
+		if self.width > 0 then bounds.width := self.width.toPixels() endif;
+		if self.height > 0 then bounds.height := self.height.toPixels() endif;
+	} else{
+		bounds.x := self.x;
+		bounds.y := self.y;
+		if self.width > 0 then bounds.width := self.width endif;
+		if self.height > 0 then bounds.height := self.height endif;
+	} endif;
+}
+
+query View::isHimetric() : Boolean {
+	return self.diagram.measurementUnit = MeasurementUnit::Himetric
+}
+
+query Integer::toPixels() : Integer{
+	return self.div(25); //FIXME: Approx.
+}
+
+mapping Anchor::toAnchor() : Anchor disjuncts
+	IdentityAnchor::toAnchor{
+	
+}
+
+mapping IdentityAnchor::toAnchor() : Anchor {
+	init {
+		result := object IdentityAnchor {
+		}
+	}
+
+	var id := if self.oclAsType(EObject).isHimetric() then {
+		var id := self.id;
+		var part1 := id.substringBefore(':').asInteger();
+		var part2 := id.substringAfter(':').asInteger();
+		var newId := if part1.oclIsInvalid() or part2.oclIsInvalid() then 
+			self.id 
+		else
+			(part1.toPixels().toString())+':'+(part2.toPixels().toString())
+		endif;
+		newId;
+	} else {
+		self.id;
+	} endif;
+	
+	result.oclAsType(IdentityAnchor).id := id;
+}
+
+query EObject::isHimetric() : Boolean {
+	return if self.oclIsKindOf(Diagram) then
+		self.oclAsType(Diagram).isHimetric()
+	else
+		self.eContainer().isHimetric()
+	endif;
+}
+
+helper View::fail() : String {
+	var type := self.type;
+	var isProxy := self.element != null and self.element.oclIsUndefined();
+	var semanticEClassName := if isProxy then 'Unresolved (proxy) reference' elif self.element = null then 'No semantic element' else self.element.eClass().name endif;
+	warning('Unknown element type. Type = "'+self.type+'", element type = "'+semanticEClassName+'"');
+	return '';
+}
+
+
+/** Generic mapping logic */
+
+query View::getType(): String{
+	var element : Element := self.findElement();
+	
+	return
+	
+		if self.oclIsKindOf(Diagram) then
+			self.getDiagramType()
+		elif self.oclIsKindOf(Edge) then 
+			self.getEdgeType(element)
+		elif self.oclIsKindOf(BasicDecorationNode) then
+			self.getDecorationType(element)
+		elif self.oclIsKindOf(Node) then  
+			self.getNodeType(element)
+		else self.fail()
+	
+	endif;
+}
+
+query View::findElement() : Element {
+	return self.findAssociatedElement().oclAsType(Element);
+}
+
+query View::findAssociatedElement() : EObject {
+	return if self.element.oclIsUndefined() then
+		self.container().oclAsType(View).findAssociatedElement()
+	else
+		self.element
+	endif;
+}
+
+query Sequence(Node)::safeUnion(unionWith: Sequence(Node)) : Sequence(Node) {
+	var res := if self->oclIsUndefined() and unionWith->oclIsUndefined() then 
+		object Sequence(Object){}
+	elif self->oclIsUndefined() then
+		unionWith
+	elif unionWith->oclIsUndefined() then
+		self
+	else
+		self->union(unionWith)
+	endif;
+	
+	return res;
+}
+
+mapping View::toView() : View disjuncts Node::toNode, Edge::toEdge;
+
+
+/** Diagram-specific transformations (Implement only) */
+
+abstract mapping Node::toNode() : Node;
+
+abstract mapping Edge::toEdge() : Edge;
+
+abstract query View::getDiagramType() : String;
+
+//Distinction between TopNode and ChildNode is not important in the Notation model.
+//Simply use the TopNode Type.
+abstract query View::getNodeType(element : Element) : String;
+
+abstract query View::getEdgeType(element : Element) : String;
+
+abstract query View::getDecorationType(element : Element) : String;
+
+/** Main diagram mapping */
+abstract mapping notation::Diagram::generateDiagram() : notation::Diagram;
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.alf.resources/META-INF/MANIFEST.MF b/extraplugins/moka/org.eclipse.papyrus.moka.alf.resources/META-INF/MANIFEST.MF
index 84d1e0e9842..964356a94df 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.alf.resources/META-INF/MANIFEST.MF
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.alf.resources/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

  org.eclipse.emf.ecore;bundle-version="2.10.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Moka ALF Resources (Incubation)

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.moka.alf.resources.Activator

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.alf.resources/pom.xml b/extraplugins/moka/org.eclipse.papyrus.moka.alf.resources/pom.xml
index 16648601012..0b50ea1b9a1 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.alf.resources/pom.xml
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.alf.resources/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.moka.alf.resources</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.async.fuml/META-INF/MANIFEST.MF b/extraplugins/moka/org.eclipse.papyrus.moka.async.fuml/META-INF/MANIFEST.MF
index b719819984c..b6bc6ecbe69 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.async.fuml/META-INF/MANIFEST.MF
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.async.fuml/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.uml2.uml;bundle-version="4.0.1",

- org.eclipse.papyrus.moka;bundle-version="1.0.1",

- org.eclipse.papyrus.moka.fuml;bundle-version="1.0.1",

+ org.eclipse.papyrus.moka;bundle-version="1.1.0",

+ org.eclipse.papyrus.moka.fuml;bundle-version="1.1.0",

  org.eclipse.debug.core;bundle-version="3.8.0",

- org.eclipse.papyrus.moka.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.moka.composites;bundle-version="1.0.1",

- org.eclipse.papyrus.moka.fuml.standardlibrary;bundle-version="1.0.1",

+ org.eclipse.papyrus.moka.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.moka.composites;bundle-version="1.1.0",

+ org.eclipse.papyrus.moka.fuml.standardlibrary;bundle-version="1.1.0",

  org.eclipse.ui.console,

  org.apache.commons.lang,

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.moka.async.fuml,

  org.eclipse.papyrus.moka.async.fuml.Semantics.Classes.Kernel,

  org.eclipse.papyrus.moka.async.fuml.Semantics.CommonBehaviors.Communications,

@@ -20,7 +20,7 @@ Export-Package: org.eclipse.papyrus.moka.async.fuml,
  org.eclipse.papyrus.moka.async.fuml.debug

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Moka Async Runner (Incubation)

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.moka.async.fuml.Activator

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.async.fuml/pom.xml b/extraplugins/moka/org.eclipse.papyrus.moka.async.fuml/pom.xml
index c5d90962a0e..0f13a155105 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.async.fuml/pom.xml
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.async.fuml/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.moka.async.fuml</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF b/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF
index 0bcc26060ed..fefa7e3fa98 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF
@@ -4,20 +4,20 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.uml2.uml;bundle-version="4.0.1",

  org.junit,

  org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.moka.fuml;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.moka.fuml;bundle-version="1.1.0",

  org.eclipse.ui;bundle-version="3.106.0",

  org.eclipse.gmf.runtime.diagram.ui,

- org.eclipse.papyrus.uml.icons;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

- org.eclipse.papyrus.moka.composites;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.icons;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

+ org.eclipse.papyrus.moka.composites;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.moka.composites.utils.handlers

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Moka Composite Utils (Incubation)

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.moka.composites.utils.Activator

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/pom.xml b/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/pom.xml
index f0ab7435dde..f978cbbf00d 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/pom.xml
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.moka.composites.utils</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.composites/META-INF/MANIFEST.MF b/extraplugins/moka/org.eclipse.papyrus.moka.composites/META-INF/MANIFEST.MF
index f4f6c40aae2..64c62ef2660 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.composites/META-INF/MANIFEST.MF
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.composites/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.uml2.uml;bundle-version="4.0.1",

- org.eclipse.papyrus.moka.fuml;bundle-version="1.0.1",

- org.eclipse.papyrus.moka;bundle-version="1.0.1",

+ org.eclipse.papyrus.moka.fuml;bundle-version="1.1.0",

+ org.eclipse.papyrus.moka;bundle-version="1.1.0",

  org.eclipse.debug.core;bundle-version="3.8.0"

 Export-Package: org.eclipse.papyrus.moka.composites,

  org.eclipse.papyrus.moka.composites.Semantics.Actions.CompleteActions,

@@ -15,7 +15,7 @@ Export-Package: org.eclipse.papyrus.moka.composites,
  org.eclipse.papyrus.moka.composites.Semantics.Loci.LociL3

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Moka Composites Extension (Incubation)

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.moka.composites.Activator

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.composites/pom.xml b/extraplugins/moka/org.eclipse.papyrus.moka.composites/pom.xml
index eaebe5a564d..dd385f076be 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.composites/pom.xml
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.composites/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.moka.composites</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.activeobjectcontrollerlibrary/META-INF/MANIFEST.MF b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.activeobjectcontrollerlibrary/META-INF/MANIFEST.MF
index 19a302a3ef5..204df7c85fe 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.activeobjectcontrollerlibrary/META-INF/MANIFEST.MF
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.activeobjectcontrollerlibrary/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.moka.fuml;bundle-version="1.0.1",

+ org.eclipse.papyrus.moka.fuml;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="5.0.0",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

- org.eclipse.papyrus.moka.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.moka.composites;bundle-version="1.0.1",

- org.eclipse.papyrus.moka.async.fuml;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

+ org.eclipse.papyrus.moka.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.moka.composites;bundle-version="1.1.0",

+ org.eclipse.papyrus.moka.async.fuml;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.debug.ui

 Export-Package: org.eclipse.papyrus.moka.fuml.activeobjectcontrollerlibrary,

  org.eclipse.papyrus.moka.fuml.activeobjectcontrollerlibrary.proxy,

@@ -16,7 +16,7 @@ Export-Package: org.eclipse.papyrus.moka.fuml.activeobjectcontrollerlibrary,
  org.eclipse.papyrus.moka.fuml.activeobjectcontrollerlibrary.ui

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Moka Active Object Controller Library (Incubation)

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.moka.fuml.activeobjectcontroller

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.activeobjectcontrollerlibrary/pom.xml b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.activeobjectcontrollerlibrary/pom.xml
index 5a78957a638..f3ba1c58893 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.activeobjectcontrollerlibrary/pom.xml
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.activeobjectcontrollerlibrary/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.moka.fuml.activeobjectcontrollerlibrary</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF
index fabaf5ebbc4..3151addecad 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.moka.fuml;bundle-version="1.0.1",

+ org.eclipse.papyrus.moka.fuml;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="5.0.0",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

  org.eclipse.ui.workbench,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.moka.fuml.assertionlibrary.utils

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Moka Assertion Library (Incubation)

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.moka.fuml.assertionlibrary.Activ

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.assertionlibrary/pom.xml b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.assertionlibrary/pom.xml
index cbead16fec6..7ab766b83ed 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.assertionlibrary/pom.xml
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.assertionlibrary/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.moka.fuml.assertionlibrary</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
index dbe78f8ad40..f0d91a676f7 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.moka.fuml;bundle-version="1.0.1",

+ org.eclipse.papyrus.moka.fuml;bundle-version="1.1.0",

  org.eclipse.emf.common;bundle-version="2.9.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

  org.eclipse.emf;bundle-version="2.6.0",

- org.eclipse.papyrus.moka;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.moka;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.ui.console;bundle-version="3.5.200"

 Export-Package: org.eclipse.papyrus.moka.fuml.standardlibrary.library.boolean_,

  org.eclipse.papyrus.moka.fuml.standardlibrary.library.integer,

@@ -18,7 +18,7 @@ Export-Package: org.eclipse.papyrus.moka.fuml.standardlibrary.library.boolean_,
  org.eclipse.papyrus.moka.fuml.standardlibrary.library.unlimitednatural

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Moka fUML Standard Library (Incubation)

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.moka.fuml.standardlibrary.Activa

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary/pom.xml b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary/pom.xml
index 398f522d02a..21771b26be8 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary/pom.xml
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.moka.fuml.standardlibrary</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF
index ca83dab039f..a534a841a58 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.uml2.uml;bundle-version="5.0.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Moka Validation Rules for fUML/PSCS models (Incubation)

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.moka.fuml.validation.Activator

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/pom.xml b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/pom.xml
index 97bda1b80c4..23856be811b 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/pom.xml
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.moka.fuml.validation</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF b/extraplugins/moka/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
index 06f0101cd39..e14ecf8d3cb 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

  org.eclipse.emf;bundle-version="2.6.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.moka;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.moka;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.debug.core;bundle-version="3.8.0",

- org.eclipse.papyrus.moka.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.moka.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.apache.commons.lang;bundle-version="2.6.0",

  org.eclipse.emf.ecore,

  org.eclipse.emf.codegen;bundle-version="2.9.0",

@@ -35,7 +35,7 @@ Export-Package: org.eclipse.papyrus.moka.fuml;uses:="org.eclipse.ui.plugin,org.o
 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Eclipse-BuddyPolicy: registered

 Bundle-Name: Moka fUML (Incubation)

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml/pom.xml b/extraplugins/moka/org.eclipse.papyrus.moka.fuml/pom.xml
index 217bd63abb8..bf06ecde3dd 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml/pom.xml
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.moka.fuml</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF b/extraplugins/moka/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF
index a4eb2511bb4..912df022463 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF
@@ -1,31 +1,31 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.moka;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.moka;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.debug.core;bundle-version="3.8.0",

  org.eclipse.debug.ui;bundle-version="3.9.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.gef;bundle-version="3.9.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.decoration;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.decoration;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.9.0",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.0.1",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.1.0",

  org.eclipse.e4.ui.css.core;bundle-version="0.10.100",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0"

 Export-Package: org.eclipse.papyrus.moka.ui.launch,

  org.eclipse.papyrus.moka.ui.presentation

 Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Moka UI (Incubation)

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.moka.ui.Activator

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.ui/pom.xml b/extraplugins/moka/org.eclipse.papyrus.moka.ui/pom.xml
index 25ed43f1bf1..0f1738fab88 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.ui/pom.xml
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.moka.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF b/extraplugins/moka/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF
index e8c167ab339..82ae062427c 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF
+++ b/extraplugins/moka/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.debug.core;bundle-version="3.7.100",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.1",

  org.eclipse.emf.transaction;bundle-version="1.8.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.9.0"

 Export-Package: org.eclipse.papyrus.moka,

  org.eclipse.papyrus.moka.communication,

@@ -29,7 +29,7 @@ Export-Package: org.eclipse.papyrus.moka,
  org.eclipse.papyrus.moka.launch

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Moka (Incubation)

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.moka.Activator

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka/pom.xml b/extraplugins/moka/org.eclipse.papyrus.moka/pom.xml
index aef56a41e91..251ba42c6ec 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka/pom.xml
+++ b/extraplugins/moka/org.eclipse.papyrus.moka/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.moka</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/META-INF/MANIFEST.MF
index f833ddb194c..f7c99b5b6c4 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/META-INF/MANIFEST.MF
@@ -5,10 +5,10 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.uml2.uml,

  org.eclipse.uml2.types;visibility:=reexport,

  org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

  org.eclipse.ui;bundle-version="3.105.0"

 Export-Package: org.eclipse.papyrus.FCM,

  org.eclipse.papyrus.FCM.impl,

@@ -16,7 +16,7 @@ Export-Package: org.eclipse.papyrus.FCM,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/pom.xml b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/pom.xml
index 7f650080fec..ac4966fbeaa 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/pom.xml
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.fcm.profile</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/META-INF/MANIFEST.MF
index 5ae1c038b21..35e634bb44f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/META-INF/MANIFEST.MF
@@ -16,30 +16,30 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.uml2.uml,

  org.eclipse.ui.ide,

  org.eclipse.core.resources,

- org.eclipse.papyrus.fcm.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.marte.static.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.qompass.designer.vsl;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.fcm.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.marte.static.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.qompass.designer.vsl;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="1.1.0",

  org.eclipse.emf.compare;bundle-version="3.0.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

  org.eclipse.acceleo.engine;bundle-version="3.1.0",

  org.eclipse.acceleo.parser;bundle-version="3.1.0",

- org.eclipse.papyrus.cpp.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.cpp.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.7.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.acceleo;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.acceleo;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.ui,

- org.eclipse.papyrus.codegen.extensionpoints;bundle-version="1.0.1"

+ org.eclipse.papyrus.codegen.extensionpoints;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.qompass.designer.core.Activator

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/pom.xml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/pom.xml
index c6de8f15cf2..4bf24ffe622 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/pom.xml
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.qompass.designer.core</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/META-INF/MANIFEST.MF
index 74bcbd8af73..5423cebc9f7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.cheatsheets;bundle-version="3.4.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.qompass.designer.doc.Activator

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/pom.xml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/pom.xml
index 658b38ac37d..987ff0a6548 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/pom.xml
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.qompass.designer.doc</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/META-INF/MANIFEST.MF
index 4001192917d..67946f9bedd 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/META-INF/MANIFEST.MF
@@ -6,38 +6,38 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.uml2.uml,

  org.eclipse.core.resources,

  org.eclipse.ui.ide,

- org.eclipse.papyrus.fcm.profile;bundle-version="1.0.1",

+ org.eclipse.papyrus.fcm.profile;bundle-version="1.1.0",

  org.eclipse.emf.edit.ui,

- org.eclipse.papyrus.marte.static.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.qompass.designer.vsl;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.marte.static.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.qompass.designer.vsl;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="1.1.0",

  org.eclipse.emf.compare;bundle-version="3.0.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.widgets;bundle-version="1.1.0",

  org.eclipse.draw2d;bundle-version="3.8.0",

- org.eclipse.papyrus.uml.modelexplorer;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.modelexplorer;bundle-version="1.1.0",

  org.eclipse.gef;bundle-version="3.8.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

- org.eclipse.papyrus.uml.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

  org.eclipse.acceleo.engine;bundle-version="3.1.0",

  org.eclipse.acceleo.parser;bundle-version="3.1.0",

- org.eclipse.papyrus.cpp.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.cpp.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.7.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.acceleo;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

- org.eclipse.papyrus.qompass.designer.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.acceleo;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

+ org.eclipse.papyrus.qompass.designer.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.qompass.designer.ui.Activator

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/pom.xml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/pom.xml
index d9203a9e606..27d1586ca73 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/pom.xml
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.qompass.designer.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/META-INF/MANIFEST.MF
index 675f921f2e9..ca7ed77381b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.uml2.uml;bundle-version="3.0.1",

  org.eclipse.emf.validation;bundle-version="1.3.0",

- org.eclipse.papyrus.qompass.designer.core;bundle-version="1.0.1",

- org.eclipse.papyrus.fcm.profile;bundle-version="1.0.1",

+ org.eclipse.papyrus.qompass.designer.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.fcm.profile;bundle-version="1.1.0",

  org.eclipse.ui,

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.qompass.designer.validation.Acti

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/pom.xml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/pom.xml
index 8be0cee857d..c4575822b8f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/pom.xml
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.qompass.designer.validation</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/META-INF/MANIFEST.MF
index e35d5df11fa..08f46149b88 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.qompass.designer.vsl

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.marte.vsl;bundle-version="1.0.1",

+ org.eclipse.papyrus.marte.vsl;bundle-version="1.1.0",

  org.eclipse.xtext;bundle-version="2.4.0",

- org.eclipse.papyrus.marte.static.profile;bundle-version="1.0.1"

+ org.eclipse.papyrus.marte.static.profile;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.qompass.designer.vsl.Activator

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/pom.xml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/pom.xml
index 90d90ac02e6..24ba19b1d17 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/pom.xml
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.qompass.designer.vsl</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/META-INF/MANIFEST.MF
index e67e3024042..7200b375626 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/META-INF/MANIFEST.MF
@@ -4,18 +4,18 @@ Export-Package: org.eclipse.papyrus.qompass.modellibs.core,
 Require-Bundle: org.eclipse.ui,

  org.eclipse.ui.ide;bundle-version="3.8.0",

  org.eclipse.core.runtime,

- org.eclipse.papyrus.fcm.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.qompass.designer.core;bundle-version="1.0.1",

- org.eclipse.papyrus.qompass.designer.vsl;bundle-version="1.0.1",

+ org.eclipse.papyrus.fcm.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.qompass.designer.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.qompass.designer.vsl;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.core.resources,

- org.eclipse.papyrus.cpp.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.1"

+ org.eclipse.papyrus.cpp.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.qompass.modellibs.core.Activator

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/pom.xml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/pom.xml
index 374b81e8feb..611dd6d7586 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/pom.xml
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.qompass.modellibs.core</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/META-INF/MANIFEST.MF
index b6671a1867c..162e983c615 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/META-INF/MANIFEST.MF
@@ -1,8 +1,4 @@
 Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.services.tracepoints,

- org.eclipse.papyrus.infra.services.tracepoints.commands,

- org.eclipse.papyrus.infra.services.tracepoints.dialogs,

- org.eclipse.papyrus.infra.services.tracepoints.preferences

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.emf;bundle-version="2.6.0",

@@ -11,22 +7,26 @@ Require-Bundle: org.eclipse.ui,
  org.apache.commons.lang;bundle-version="2.3.0",

  org.eclipse.emf.edit.ui;bundle-version="2.6.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.0.100",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.decoration;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.decoration;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.1.0"

+Export-Package: org.eclipse.papyrus.infra.services.tracepoints,

+ org.eclipse.papyrus.infra.services.tracepoints.commands,

+ org.eclipse.papyrus.infra.services.tracepoints.dialogs,

+ org.eclipse.papyrus.infra.services.tracepoints.preferences

 Bundle-Vendor: %pluginProvider

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

-Bundle-Localization: plugin

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

+Bundle-Localization: plugin

+Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.infra.services.tracepoints.Activ

  ator

-Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.tracepoints;si

  ngleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/pom.xml b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/pom.xml
index 53ef1ae399e..aafcf09a112 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/pom.xml
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.tracepoints</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF
index 25f70f11647..8742b5cc44d 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
 Manifest-Version: 1.0

 Export-Package: org.eclipse.papyrus.qompass.modellibs.tracing,

  org.eclipse.papyrus.qompass.modellibs.tracing.acceleo

-Require-Bundle: org.eclipse.papyrus.fcm.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.qompass.modellibs.core;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.fcm.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.qompass.modellibs.core;bundle-version="1.1.0",

  org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.qompass.designer.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.tracepoints;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.qompass.designer.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.tracepoints;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.emf.workspace;bundle-version="1.5.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.qompass.designer.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.qompass.designer.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.qompass.modellibs.tracing.Activa

diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/pom.xml b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/pom.xml
index a20b4860d97..50fee57ffff 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/pom.xml
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.qompass.modellibs.tracing</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF
index 57c9d0d5254..9d21a19d1a5 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.services.tracepoints;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.tracepoints;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.7.0",

  org.eclipse.emf.ecore;bundle-version="2.8.0",

  org.eclipse.gef;bundle-version="3.8.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.common.ui;bundle-version="1.5.0",

  org.eclipse.ui.ide;bundle-version="3.8.100",

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.decoration;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.decoration;bundle-version="1.1.0"

 Bundle-Vendor: %pluginProvider

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.views.tracepoints.Activator

diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/pom.xml b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/pom.xml
index 2cf809d585d..bcee9cb909e 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/pom.xml
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.tracepoints</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/robotml/generators/org.eclipse.papyrus.robotml.generators.common/META-INF/MANIFEST.MF b/extraplugins/robotml/generators/org.eclipse.papyrus.robotml.generators.common/META-INF/MANIFEST.MF
index f1fe1849509..bbb1b70382c 100644
--- a/extraplugins/robotml/generators/org.eclipse.papyrus.robotml.generators.common/META-INF/MANIFEST.MF
+++ b/extraplugins/robotml/generators/org.eclipse.papyrus.robotml.generators.common/META-INF/MANIFEST.MF
@@ -18,12 +18,12 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.acceleo.profiler;bundle-version="3.1.0",

  org.eclipse.acceleo.engine;bundle-version="3.1.0",

  org.eclipse.uml2.uml;bundle-version="3.1.2",

- org.eclipse.papyrus.robotml;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.robotml;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Eclipse-LazyStart: true

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: RobotML generators common queries (Incubation)

 Bundle-Activator: org.eclipse.papyrus.robotml.generators.common.Activa

  tor

diff --git a/extraplugins/robotml/generators/org.eclipse.papyrus.robotml.generators.common/pom.xml b/extraplugins/robotml/generators/org.eclipse.papyrus.robotml.generators.common/pom.xml
index 2dc5750f963..3feb0ec7eb0 100644
--- a/extraplugins/robotml/generators/org.eclipse.papyrus.robotml.generators.common/pom.xml
+++ b/extraplugins/robotml/generators/org.eclipse.papyrus.robotml.generators.common/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.robotml.generators.common</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui/META-INF/MANIFEST.MF b/extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui/META-INF/MANIFEST.MF
index 3db3bd0f189..a7cf577f3f9 100644
--- a/extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui/META-INF/MANIFEST.MF
@@ -10,23 +10,23 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.acceleo.engine,

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.common.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.modelexplorer;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.robotml.generators.intempora.rtmaps;bundle-version="1.0.1",

- org.eclipse.papyrus.robotml.generators.common;bundle-version="1.0.1",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1"

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.modelexplorer;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.robotml.generators.intempora.rtmaps;bundle-version="1.1.0",

+ org.eclipse.papyrus.robotml.generators.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Eclipse-LazyStart: true

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: RobotML RTMaps Generator Module IDE Plug-in (Incubation)

 Bundle-Activator: org.eclipse.papyrus.robotml.generators.intempora.rtm

  aps.ui.Activator

diff --git a/extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui/pom.xml b/extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui/pom.xml
index cb012810dae..8a35b7c73a1 100644
--- a/extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui/pom.xml
+++ b/extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps/META-INF/MANIFEST.MF b/extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps/META-INF/MANIFEST.MF
index 66bb1db0347..279836a9e56 100644
--- a/extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps/META-INF/MANIFEST.MF
+++ b/extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps/META-INF/MANIFEST.MF
@@ -17,12 +17,12 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.acceleo.engine;bundle-version="3.1.0",

  org.eclipse.uml2.uml;bundle-version="3.2.100",

  org.eclipse.core.resources;bundle-version="3.7.100",

- org.eclipse.papyrus.robotml.generators.common;bundle-version="1.0.1",

- org.eclipse.papyrus.robotml;bundle-version="1.0.1"

+ org.eclipse.papyrus.robotml.generators.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.robotml;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Eclipse-LazyStart: true

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: RTMaps generator for RobotML (Incubation)

 Bundle-Activator: org.eclipse.papyrus.robotml.generators.intempora.rtm

  aps.Activator

diff --git a/extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps/pom.xml b/extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps/pom.xml
index c49b0dc87af..135da6cddc1 100644
--- a/extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps/pom.xml
+++ b/extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.robotml.generators.intempora.rtmaps</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.deployment/META-INF/MANIFEST.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.deployment/META-INF/MANIFEST.MF
index f423c31ae2d..e2eec881a05 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.deployment/META-INF/MANIFEST.MF
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.deployment/META-INF/MANIFEST.MF
@@ -5,15 +5,15 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.ecore,

  org.eclipse.gmf.runtime.common.core,

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.robotml;bundle-version="1.0.1",

+ org.eclipse.papyrus.robotml;bundle-version="1.1.0",

  org.eclipse.gef,

  org.eclipse.gmf.runtime.notation.edit,

  org.eclipse.emf.transaction,

  org.eclipse.gmf.runtime.emf.commands.core,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.robotml.deployment.Activator

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.deployment/pom.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.deployment/pom.xml
index 9f535a00f37..0cd4abeff5e 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.deployment/pom.xml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.deployment/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.robotml.deployment</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/META-INF/MANIFEST.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/META-INF/MANIFEST.MF
index 774a6edb20e..baafbf041d9 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/META-INF/MANIFEST.MF
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.robotml.diagram.common.commands,

  org.eclipse.papyrus.robotml.diagram.common.editpolicies

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.core.expressions,

- org.eclipse.papyrus.robotml;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.robotml;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.gef.ui;bundle-version="1.4.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",

- org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.9.0",

  org.eclipse.gmf.runtime.notation.edit,

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.robotml.diagram.common.Activator

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/build.properties b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/build.properties
index a27337f278b..6786b8581b6 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/build.properties
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/build.properties
@@ -8,5 +8,6 @@ bin.includes = META-INF/,\
                build.properties,\
                about.html,\
                viewpoints/,\
-               diagrams/
+               diagrams/,\
+               css/
 src.includes = about.html
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/pom.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/pom.xml
index b9bd2bcf284..9ad72105c8d 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/pom.xml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.robotml.diagram.common</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.ui/META-INF/MANIFEST.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.ui/META-INF/MANIFEST.MF
index fb3e42e6a72..353bc0cc2ce 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.ui/META-INF/MANIFEST.MF
@@ -3,15 +3,15 @@ Export-Package: org.eclipse.papyrus.robotml.diagram.ui
 Require-Bundle: org.eclipse.ui,

  org.eclipse.ui.ide,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.robotml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.robotml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.8.0",

  org.eclipse.ui.workbench;bundle-version="3.105.0",

  org.eclipse.jface;bundle-version="3.9.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.robotml.diagram.ui.Activator

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.ui/pom.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.ui/pom.xml
index c9c9f447035..cf909eba378 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.ui/pom.xml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.robotml.diagram.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.doc/META-INF/MANIFEST.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.doc/META-INF/MANIFEST.MF
index 1cc75e3e48a..5815412016e 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.doc/META-INF/MANIFEST.MF
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.doc/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.robotml.doc.Activator

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.doc/pom.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.doc/pom.xml
index 301e01a38fd..1271c45e587 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.doc/pom.xml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.doc/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.robotml.doc</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.help/META-INF/MANIFEST.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.help/META-INF/MANIFEST.MF
index 65ce190ac67..817c34cae12 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.help/META-INF/MANIFEST.MF
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.help/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0

 Bundle-Vendor: %Bundle-Vendor

-Bundle-Version: 1.0.1.qualifier

-Bundle-Localization: plugin

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

+Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.robotml.help;singleton:=true

 

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.modelexplorer/META-INF/MANIFEST.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.modelexplorer/META-INF/MANIFEST.MF
index 7284bc6c9d2..29cc49b20a1 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.modelexplorer/META-INF/MANIFEST.MF
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.modelexplorer/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",

  org.eclipse.uml2.uml;bundle-version="3.2.0",

  org.eclipse.emf.facet.infra.query.core,

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .,

  bin

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.robotml.modelexplorer.Activator

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.modelexplorer/pom.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.modelexplorer/pom.xml
index 38cefbf6804..43356b1521c 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.modelexplorer/pom.xml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.modelexplorer/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.robotml.modelexplorer</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.perspective/META-INF/MANIFEST.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.perspective/META-INF/MANIFEST.MF
index 0a32c967a0b..3bea44de393 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.perspective/META-INF/MANIFEST.MF
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.perspective/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.perspective;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.perspective;bundle-version="1.1.0",

  org.eclipse.ui.cheatsheets

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.robotml.perspective.Activator

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.perspective/pom.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.perspective/pom.xml
index 61c47b64048..c459b8c1aee 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.perspective/pom.xml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.perspective/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.robotml.perspective</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.templaterepository/META-INF/MANIFEST.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.templaterepository/META-INF/MANIFEST.MF
index bb4b3548e18..5a227c7b6b0 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.templaterepository/META-INF/MANIFEST.MF
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.templaterepository/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.robotml.templaterepository.Activ

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.templaterepository/pom.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.templaterepository/pom.xml
index 72c56e51786..14508058c62 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.templaterepository/pom.xml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.templaterepository/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.robotml.templaterepository</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.validation/META-INF/MANIFEST.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.validation/META-INF/MANIFEST.MF
index b9db6c516e0..90388d78b48 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.validation/META-INF/MANIFEST.MF
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.validation/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.robotml;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.robotml;bundle-version="1.1.0",

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

  org.eclipse.emf.ecore,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.robotml.validation.Activator

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.validation/pom.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.validation/pom.xml
index d40fd05e3a8..d734f6ef566 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.validation/pom.xml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.validation/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.robotml.validation</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/META-INF/MANIFEST.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml/META-INF/MANIFEST.MF
index e49f271270b..f9f3c1d0c6a 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/META-INF/MANIFEST.MF
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Export-Package: org.eclipse.papyrus.RobotML,
  org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.std_datatypes,

  org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.std_datatypes.impl,

  org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.std_datatypes.util

-Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

  org.eclipse.core.runtime,

  org.eclipse.emf.ecore,

  org.eclipse.emf.ecore.xmi;visibility:=reexport,

@@ -35,7 +35,7 @@ Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/pom.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml/pom.xml
index 2532399df94..d1b8dfa86ad 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/pom.xml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.robotml</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/spem2/org.eclipse.papyrus.spem2.profile/META-INF/MANIFEST.MF b/extraplugins/spem2/org.eclipse.papyrus.spem2.profile/META-INF/MANIFEST.MF
index 2b280ecd01d..7e6b7e507f6 100644
--- a/extraplugins/spem2/org.eclipse.papyrus.spem2.profile/META-INF/MANIFEST.MF
+++ b/extraplugins/spem2/org.eclipse.papyrus.spem2.profile/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.emf.ecore,

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.spem2.profile

 Bundle-Vendor: %pluginProvider

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.spem2.profile.Activator

diff --git a/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/META-INF/MANIFEST.MF b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/META-INF/MANIFEST.MF
index 125d5615d24..6ca65803dac 100644
--- a/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/META-INF/MANIFEST.MF
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/META-INF/MANIFEST.MF
@@ -1,23 +1,23 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.table.instance;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.table.instance;bundle-version="1.1.0",

  org.eclipse.emf.facet.widgets.nattable.instance;bundle-version="0.3.0",

  org.eclipse.core.expressions,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.uml.nattable.converter.Activator

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/pom.xml b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/pom.xml
index 101794ac604..f582b47b4ce 100644
--- a/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/pom.xml
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.emf.nattable.converter</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF
index 79edee3c476..8c804df2384 100644
--- a/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.facet.infra.browser.custom;visibility:=reexport,

  org.eclipse.ui.workbench,

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.table.instance,

  org.eclipse.papyrus.infra.table.instance.papyrustableinstance;uses:="org.eclipse.emf.ecore,org.eclipse.emf.facet.widgets.nattable.instance.tableinstance",

  org.eclipse.papyrus.infra.table.instance.papyrustableinstance.impl,

@@ -22,7 +22,7 @@ Export-Package: org.eclipse.papyrus.infra.table.instance,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.table.instance.Activator

diff --git a/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/pom.xml b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/pom.xml
index a1f0c126eb3..57d819afb4f 100644
--- a/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/pom.xml
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.table.instance</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF
index 19d0d84a786..95b1cacea2a 100644
--- a/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF
@@ -9,10 +9,10 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Require-Bundle: org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0",

  org.eclipse.emf.facet.infra.browser.custom.core,

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

  org.eclipse.core.expressions,

  org.eclipse.emf.facet.widgets.nattable.instance;bundle-version="0.1.0",

- org.eclipse.papyrus.infra.table.instance;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.table.instance;bundle-version="1.1.0",

  org.eclipse.uml2.uml,

  org.eclipse.emf.facet.infra.query.core,

  org.eclipse.core.runtime;bundle-version="3.7.0",

@@ -20,15 +20,15 @@ Require-Bundle: org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0
  org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.eclipse.jface;bundle-version="3.8.0",

  org.eclipse.ui,

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0"

 Bundle-Vendor: %pluginProvider

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.infra.table.modelexplorer.Activa

  tor

diff --git a/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/pom.xml b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/pom.xml
index 92a31d28fb1..b02a2e280fd 100644
--- a/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/pom.xml
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.table.modelexplorer</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/META-INF/MANIFEST.MF b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/META-INF/MANIFEST.MF
index d5ed825ae2f..7aaa4103ed4 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/META-INF/MANIFEST.MF
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/META-INF/MANIFEST.MF
@@ -1,29 +1,29 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.common.core,

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.team.collaborative.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.team.collaborative.core;bundle-version="1.1.0",

  com.google.guava,

- org.eclipse.papyrus.infra.gmfdiag.modelexplorer;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.modelexplorer;bundle-version="1.1.0",

  org.eclipse.ui.navigator;bundle-version="3.5.101",

  org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.2",

- org.eclipse.papyrus.team.collaborative.strategy;bundle-version="1.0.1",

- org.eclipse.papyrus.team.collaborative.svn;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.modelexplorer;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.team.collaborative.strategy;bundle-version="1.1.0",

+ org.eclipse.papyrus.team.collaborative.svn;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.modelexplorer;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.team.svn.core;bundle-version="1.1.0",

  org.eclipse.emf.facet.infra.query.core,

  org.eclipse.emf.facet.infra.browser.custom,

  org.eclipse.emf.common.ui,

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1"

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.team.collaborative.core.integrat

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/META-INF/MANIFEST.MF b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/META-INF/MANIFEST.MF
index 156a961960a..dd5c662393e 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/META-INF/MANIFEST.MF
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Export-Package: org.eclipse.papyrus.team.collaborative.core,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.team.collaborative.core.Activato

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/META-INF/MANIFEST.MF b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/META-INF/MANIFEST.MF
index 70ca4116bcc..fd7d524af28 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/META-INF/MANIFEST.MF
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/META-INF/MANIFEST.MF
@@ -1,33 +1,33 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.team.collaborative.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.team.collaborative.core;bundle-version="1.1.0",

  com.google.guava,

  org.eclipse.emf.ecore;bundle-version="2.7.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.modelexplorer;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.modelexplorer;bundle-version="1.1.0",

  org.eclipse.ui.navigator;bundle-version="3.5.101",

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.1.0",

  org.eclipse.core.expressions,

  org.eclipse.uml2.uml;bundle-version="3.2.100",

  org.eclipse.emf.edit,

  org.eclipse.gmf.runtime.common.ui,

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

  org.eclipse.ui.ide,

  org.eclipse.ui.views.properties.tabbed,

  org.eclipse.emf.transaction,

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.team.collaborative.strategy.ui.actions,

  org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs,

  org.eclipse.papyrus.team.collaborative.strategy.ui.providers,

  org.eclipse.papyrus.team.collaborative.strategy.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.team.collaborative.core.integrat

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/META-INF/MANIFEST.MF b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/META-INF/MANIFEST.MF
index f778e4771eb..db90334b0f3 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/META-INF/MANIFEST.MF
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.team.collaborative.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.team.collaborative.core;bundle-version="1.1.0",

  org.eclipse.emf.ecore,

  com.google.guava,

  org.eclipse.core.resources,

@@ -16,7 +16,7 @@ Export-Package: org.eclipse.papyrus.team.collaborative.svn,
  org.eclipse.papyrus.team.collaborative.svn.versioncontroller

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.team.collaborative.svn.Activator

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/META-INF/MANIFEST.MF b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/META-INF/MANIFEST.MF
index c68c8453dad..64b4fb46f79 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/META-INF/MANIFEST.MF
@@ -3,17 +3,17 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

  org.eclipse.core.expressions;bundle-version="3.4.500",

  org.eclipse.core.resources;bundle-version="3.8.100",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.emf.compare.ide.ui;bundle-version="3.0.0",

  org.eclipse.emf.edit;bundle-version="2.9.0",

  org.eclipse.emf.common,

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.uml2.uml.edit;bundle-version="4.1.0",

  org.eclipse.emf.compare.edit;bundle-version="3.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.compare.ui.Activator

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare/META-INF/MANIFEST.MF b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare/META-INF/MANIFEST.MF
index 271a5275bb3..7bafe023bfa 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare/META-INF/MANIFEST.MF
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Export-Package: org.eclipse.papyrus.uml.compare.postprocessor,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare/pom.xml b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare/pom.xml
index 122782cb2be..5c1a40b4c8c 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare/pom.xml
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.compare</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF b/extraplugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF
index f944bef6012..624d6259cf7 100644
--- a/extraplugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF
+++ b/extraplugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF
@@ -1,29 +1,29 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="3.2.0",

  org.eclipse.uml2.common.edit,

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

  org.eclipse.core.expressions,

  org.eclipse.pde.ui;bundle-version="3.7.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.core.filebuffers,

  org.eclipse.gmf.runtime.common.ui,

- org.eclipse.papyrus.eclipse.project.editors;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

+ org.eclipse.papyrus.eclipse.project.editors;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

  org.eclipse.pde.build,

  com.ibm.icu,

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.export.Activator

diff --git a/extraplugins/uml/org.eclipse.papyrus.uml.export/pom.xml b/extraplugins/uml/org.eclipse.papyrus.uml.export/pom.xml
index fb71c87a8e5..a32c1622550 100644
--- a/extraplugins/uml/org.eclipse.papyrus.uml.export/pom.xml
+++ b/extraplugins/uml/org.eclipse.papyrus.uml.export/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.export</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/META-INF/MANIFEST.MF b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/META-INF/MANIFEST.MF
index 04f297967a8..9288e80b7da 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/META-INF/MANIFEST.MF
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.umlrt;bundle-version="1.0.1"

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.umlrt;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: UML RealTime Properties (Incubation)

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.umlrt.properties.Activator

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/pom.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/pom.xml
index 36152d22dee..76d0453680f 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/pom.xml
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.umlrt.properties</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation/META-INF/MANIFEST.MF b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation/META-INF/MANIFEST.MF
index 34233d75a8e..260091a244e 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation/META-INF/MANIFEST.MF
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.uml2.uml

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: UML RealTime Validation (Incubation)

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.umlrt.validation.Activator

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation/plugin.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation/plugin.xml
index b19f7152429..f131528df2d 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation/plugin.xml
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation/plugin.xml
@@ -4,7 +4,7 @@
   <extension point="org.eclipse.emf.validation.constraintProviders">

       <category id="org.eclipse.papyrus.umlrt.validation.umlrealtimestatemach" mandatory="false" name="org.eclipse.papyrus.umlrt.validation.umlrealtimestatemach"/>

       <constraintProvider cache="false" mode="Batch">

-         <package namespaceUri="http:///schemas/UMLRealTimeStateMach/_6TmMwBMoEeSz2qq_H0HScA/14"/>

+         <package namespaceUri="http://www.eclipse.org/papyrus/umlrt/statemachine"/>

          <constraints categories="org.eclipse.papyrus.umlrt.validation.umlrealtimestatemach">

             <constraint id="hasExactlyOneRegion" isEnabledByDefault="true" lang="OCL" mode="Batch" name="An RT state machine has exactly one region" severity="ERROR" statusCode="1">

                <message>An RT state machine has exactly one region</message><![CDATA[base_StateMachine.region->size() = 1]]></constraint>

@@ -81,7 +81,7 @@ and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))]]></constraint>
 <extension point="org.eclipse.emf.validation.constraintProviders">

       <category id="org.eclipse.papyrus.umlrt.validation.umlrealtime" mandatory="false" name="org.eclipse.papyrus.umlrt.validation.umlrealtime"/>

       <constraintProvider cache="false" mode="Batch">

-         <package namespaceUri="http:///schemas/UMLRealTime/_lVqk0BMpEeSz2qq_H0HScA/27"/>

+         <package namespaceUri="http://www.eclipse.org/papyrus/umlrt"/>

          <constraints categories="org.eclipse.papyrus.umlrt.validation.umlrealtime">

             <constraint id="isActiveEntity" isEnabledByDefault="true" lang="OCL" mode="Batch" name="Capsules are always active" severity="ERROR" statusCode="1">

                <message>Capsules are always active entities</message><![CDATA[base_Class.isActive]]></constraint>

@@ -181,4 +181,4 @@ el.oclIsKindOf(UML::Transition))]]></constraint>
          <constraint ref="org.eclipse.papyrus.umlrt.validation.exclusionOnlyOnUmlrt"/>

       </binding>

    </extension>   

-</plugin>
\ No newline at end of file
+</plugin>

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation/pom.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation/pom.xml
index cd4a84f0024..7b84b6e47af 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation/pom.xml
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.umlrt.validation</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.wizard/META-INF/MANIFEST.MF b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.wizard/META-INF/MANIFEST.MF
index bb2bf2a5551..1d6bfbb2f03 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.wizard/META-INF/MANIFEST.MF
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.wizard/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.1",

- org.eclipse.papyrus.umlrt;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.0",

+ org.eclipse.papyrus.umlrt;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.9.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: UML RealTime Wizard (Incubation)

 Bundle-Activator: org.eclipse.papyrus.umlrt.wizard.Activator

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.wizard/pom.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.wizard/pom.xml
index c26309a5587..cd261a9d87d 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.wizard/pom.xml
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.wizard/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.umlrt.wizard</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.wizard/resources/templates/rt-template.uml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.wizard/resources/templates/rt-template.uml
index 0dac7c31066..75003df1078 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.wizard/resources/templates/rt-template.uml
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.wizard/resources/templates/rt-template.uml
@@ -2,7 +2,7 @@
 <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="_M6LNQN2REeK2yvTixhtyWQ" name="UML RealTime Model">

   <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_879wkBQBEeSvMMEKfvV2mQ">

     <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_87--sBQBEeSvMMEKfvV2mQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-      <references xmi:type="ecore:EPackage" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_lVrL4BMpEeSz2qq_H0HScA"/>

+      <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/umlrt#/"/>

     </eAnnotations>

     <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_1h74oEeVEeO0lv5O1DTHOQ"/>

   </profileApplication>

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/META-INF/MANIFEST.MF b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/META-INF/MANIFEST.MF
index 9f0a61603e0..ce689c5fe36 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/META-INF/MANIFEST.MF
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

  org.eclipse.core.runtime,

  org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

+ org.eclipse.emf.ecore.xmi,

  org.eclipse.uml2.types;visibility:=reexport,

- org.eclipse.uml2.uml;bundle-version="4.1.0"

+ org.eclipse.uml2.uml;bundle-version="5.0.0";visibility:=reexport

 Export-Package: org.eclipse.papyrus.umlrt.UMLRealTime,

  org.eclipse.papyrus.umlrt.UMLRealTime.impl,

  org.eclipse.papyrus.umlrt.UMLRealTime.util,

@@ -14,7 +14,7 @@ Export-Package: org.eclipse.papyrus.umlrt.UMLRealTime,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml
index 5dc9f4045a2..5adeb35fe4c 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml
@@ -7,8 +7,6 @@
             class="org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage"

             genModel="umlProfile/uml-rt.genmodel"/>

    </extension>

-

-

    <extension point="org.eclipse.emf.ecore.generated_package">

       <!-- @generated UMLRealTimeSM -->

       <package

@@ -56,5 +54,4 @@
       </profile>

    </extension>

 

-
 </plugin>
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/pom.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/pom.xml
index 5a2dff7a272..ada92cdf705 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/pom.xml
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.umlrt</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/Capsule.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/Capsule.java
index f61a0bbabad..96587bf96c1 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/Capsule.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/Capsule.java
@@ -8,10 +8,6 @@
  */

 package org.eclipse.papyrus.umlrt.UMLRealTime;

 

-import java.util.Map;

-

-import org.eclipse.emf.common.util.DiagnosticChain;

-

 import org.eclipse.emf.ecore.EObject;

 

 /**

@@ -19,6 +15,19 @@ import org.eclipse.emf.ecore.EObject;
  * A representation of the model object '<em><b>Capsule</b></em>'.

  * <!-- end-user-doc -->

  *

+ * <!-- begin-model-doc -->

+ * base_Class.isActive

+ * base_Class.ownedReception->isEmpty()

+ * not(base_Class.isFinalSpecialization)

+ * (base_Class.generalization->size()) <= 1

+ * (base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))

+ * base_Class.ownedAttribute->forAll(at | at.type->size() = 1)

+ * base_Class.feature->forAll (f | f.visibility <> UML::VisibilityKind::private)

+ * base_Class.nestedClassifier->isEmpty()

+ * base_Class.ownedOperation->notEmpty() implies

+ * (base_Class.ownedOperation->forAll(op | op.concurrency = UML::CallConcurrencyKind::sequential))

+ * <!-- end-model-doc -->

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -38,7 +47,7 @@ public interface Capsule extends EObject {
 	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Class</em>' reference.

 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage#getCapsule_Base_Class()

@@ -51,7 +60,7 @@ public interface Capsule extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#getBase_Class <em>Base Class</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Base Class</em>' reference.

 	 * @see #getBase_Class()

@@ -59,149 +68,4 @@ public interface Capsule extends EObject {
 	 */

 	void setBase_Class(org.eclipse.uml2.uml.Class value);

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * base_Class.isActive

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='Capsules are always active'"

-	 * @generated

-	 */

-	boolean Capsulesarealwaysactive(DiagnosticChain diagnostics, Map<Object, Object> context);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * base_Class.ownedReception->isEmpty()

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='A capsule cannot have Reception features'"

-	 * @generated

-	 */

-	boolean AcapsulecannothaveReceptionfeatures(DiagnosticChain diagnostics, Map<Object, Object> context);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * not(base_Class.isFinalSpecialization)

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='A capsule class can always be subclassed'"

-	 * @generated

-	 */

-	boolean Acapsuleclasscanalwaysbesubclassed(DiagnosticChain diagnostics, Map<Object, Object> context);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * (base_Class.generalization->size()) <= 1

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='A capsule can have at most one superclass'"

-	 * @generated

-	 */

-	boolean Acapsulecanhaveatmostonesuperclass(DiagnosticChain diagnostics, Map<Object, Object> context);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * (base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='Capsule classes are always substitutable'"

-	 * @generated

-	 */

-	boolean Capsuleclassesarealwayssubstitutable(DiagnosticChain diagnostics, Map<Object, Object> context);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * base_Class.ownedAttribute->forAll(at | at.type->size() = 1)

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='All attributes of a capsule class have exactly one type'"

-	 * @generated

-	 */

-	boolean Allattributesofacapsuleclasshaveexactlyonetype(DiagnosticChain diagnostics, Map<Object, Object> context);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * base_Class.feature->forAll (f | f.visibility <> UML::VisibilityKind::private)

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='Private visibility is not supported on capsule features'"

-	 * @generated

-	 */

-	boolean Privatevisibilityisnotsupportedoncapsulefeatures(DiagnosticChain diagnostics, Map<Object, Object> context);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * base_Class.nestedClassifier->isEmpty()

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='A capsule class cannot have nested classifiers'"

-	 * @generated

-	 */

-	boolean Acapsuleclasscannothavenestedclassifiers(DiagnosticChain diagnostics, Map<Object, Object> context);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * base_Class.ownedOperation->notEmpty() implies

-	 * (base_Class.ownedOperation->forAll(op | op.concurrency = UML::CallConcurrencyKind::sequential))

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='All operations of a capsule are sequential'"

-	 * @generated

-	 */

-	boolean Alloperationsofacapsulearesequential(DiagnosticChain diagnostics, Map<Object, Object> context);

-

 } // Capsule

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/CapsulePart.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/CapsulePart.java
index 0d4d582fff7..0315c1dda4f 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/CapsulePart.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/CapsulePart.java
@@ -9,7 +9,6 @@
 package org.eclipse.papyrus.umlrt.UMLRealTime;

 

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.uml2.uml.Property;

 

 /**

@@ -36,7 +35,7 @@ public interface CapsulePart extends EObject {
 	 * If the meaning of the '<em>Base Property</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Property</em>' reference.

 	 * @see #setBase_Property(Property)

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage#getCapsulePart_Base_Property()

@@ -49,7 +48,7 @@ public interface CapsulePart extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.CapsulePart#getBase_Property <em>Base Property</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Base Property</em>' reference.

 	 * @see #getBase_Property()

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/PortRegistrationType.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/PortRegistrationType.java
index 71f0fc494d6..5ee691f1bfc 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/PortRegistrationType.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/PortRegistrationType.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>Port Registration Type</b></em>',

  * and utility methods for working with them.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage#getPortRegistrationType()

  * @model

  * @generated

@@ -29,7 +29,7 @@ public enum PortRegistrationType implements Enumerator {
 	 * The '<em><b>Automatic</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #AUTOMATIC_VALUE

 	 * @generated

 	 * @ordered

@@ -40,7 +40,7 @@ public enum PortRegistrationType implements Enumerator {
 	 * The '<em><b>Application</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #APPLICATION_VALUE

 	 * @generated

 	 * @ordered

@@ -51,7 +51,7 @@ public enum PortRegistrationType implements Enumerator {
 	 * The '<em><b>Application Locked</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #APPLICATION_LOCKED_VALUE

 	 * @generated

 	 * @ordered

@@ -65,7 +65,7 @@ public enum PortRegistrationType implements Enumerator {
 	 * If the meaning of '<em><b>Automatic</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #AUTOMATIC

 	 * @model name="Automatic"

 	 * @generated

@@ -80,7 +80,7 @@ public enum PortRegistrationType implements Enumerator {
 	 * If the meaning of '<em><b>Application</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #APPLICATION

 	 * @model name="Application"

 	 * @generated

@@ -95,7 +95,7 @@ public enum PortRegistrationType implements Enumerator {
 	 * If the meaning of '<em><b>Application Locked</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #APPLICATION_LOCKED

 	 * @model name="ApplicationLocked"

 	 * @generated

@@ -107,7 +107,7 @@ public enum PortRegistrationType implements Enumerator {
 	 * An array of all the '<em><b>Port Registration Type</b></em>' enumerators.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private static final PortRegistrationType[] VALUES_ARRAY =

@@ -121,7 +121,7 @@ public enum PortRegistrationType implements Enumerator {
 	 * A public read-only list of all the '<em><b>Port Registration Type</b></em>' enumerators.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static final List<PortRegistrationType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

@@ -130,7 +130,7 @@ public enum PortRegistrationType implements Enumerator {
 	 * Returns the '<em><b>Port Registration Type</b></em>' literal with the specified literal value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static PortRegistrationType get(String literal) {

@@ -147,7 +147,7 @@ public enum PortRegistrationType implements Enumerator {
 	 * Returns the '<em><b>Port Registration Type</b></em>' literal with the specified name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static PortRegistrationType getByName(String name) {

@@ -164,7 +164,7 @@ public enum PortRegistrationType implements Enumerator {
 	 * Returns the '<em><b>Port Registration Type</b></em>' literal with the specified integer value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static PortRegistrationType get(int value) {

@@ -182,7 +182,7 @@ public enum PortRegistrationType implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private final int value;

@@ -190,7 +190,7 @@ public enum PortRegistrationType implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private final String name;

@@ -198,7 +198,7 @@ public enum PortRegistrationType implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private final String literal;

@@ -207,7 +207,7 @@ public enum PortRegistrationType implements Enumerator {
 	 * Only this class can construct instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private PortRegistrationType(int value, String name, String literal) {

@@ -219,7 +219,7 @@ public enum PortRegistrationType implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -230,7 +230,7 @@ public enum PortRegistrationType implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -241,7 +241,7 @@ public enum PortRegistrationType implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -253,7 +253,7 @@ public enum PortRegistrationType implements Enumerator {
 	 * Returns the literal value of the enumerator, which is its string representation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/Protocol.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/Protocol.java
index a9886c8840c..982f4dbc585 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/Protocol.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/Protocol.java
@@ -8,12 +8,7 @@
  */

 package org.eclipse.papyrus.umlrt.UMLRealTime;

 

-import java.util.Map;

-

-import org.eclipse.emf.common.util.DiagnosticChain;

-

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.uml2.uml.Collaboration;

 

 /**

@@ -21,6 +16,10 @@ import org.eclipse.uml2.uml.Collaboration;
  * A representation of the model object '<em><b>Protocol</b></em>'.

  * <!-- end-user-doc -->

  *

+ * <!-- begin-model-doc -->

+ * base_Collaboration.generalization->size() <= 1

+ * <!-- end-model-doc -->

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -40,7 +39,7 @@ public interface Protocol extends EObject {
 	 * If the meaning of the '<em>Base Collaboration</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Collaboration</em>' reference.

 	 * @see #setBase_Collaboration(Collaboration)

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage#getProtocol_Base_Collaboration()

@@ -53,7 +52,7 @@ public interface Protocol extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.Protocol#getBase_Collaboration <em>Base Collaboration</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Base Collaboration</em>' reference.

 	 * @see #getBase_Collaboration()

@@ -61,20 +60,4 @@ public interface Protocol extends EObject {
 	 */

 	void setBase_Collaboration(Collaboration value);

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * base_Collaboration.generalization->size() <= 1

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='Protocols can have at most one generalization'"

-	 * @generated

-	 */

-	boolean Protocolscanhaveatmostonegeneralization(DiagnosticChain diagnostics, Map<Object, Object> context);

-

 } // Protocol

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/ProtocolContainer.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/ProtocolContainer.java
index 5fc40b4cf50..e917a0bfeb0 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/ProtocolContainer.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/ProtocolContainer.java
@@ -34,7 +34,7 @@ public interface ProtocolContainer extends EObject {
 	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Package</em>' reference.

 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage#getProtocolContainer_Base_Package()

@@ -47,7 +47,7 @@ public interface ProtocolContainer extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.ProtocolContainer#getBase_Package <em>Base Package</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Base Package</em>' reference.

 	 * @see #getBase_Package()

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTConnector.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTConnector.java
index d6173e9bd0a..2582e99dd0a 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTConnector.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTConnector.java
@@ -8,12 +8,7 @@
  */

 package org.eclipse.papyrus.umlrt.UMLRealTime;

 

-import java.util.Map;

-

-import org.eclipse.emf.common.util.DiagnosticChain;

-

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.uml2.uml.Connector;

 

 /**

@@ -21,6 +16,10 @@ import org.eclipse.uml2.uml.Connector;
  * A representation of the model object '<em><b>RT Connector</b></em>'.

  * <!-- end-user-doc -->

  *

+ * <!-- begin-model-doc -->

+ * base_Connector.end->size() = 2

+ * <!-- end-model-doc -->

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -40,7 +39,7 @@ public interface RTConnector extends EObject {
 	 * If the meaning of the '<em>Base Connector</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Connector</em>' reference.

 	 * @see #setBase_Connector(Connector)

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage#getRTConnector_Base_Connector()

@@ -53,7 +52,7 @@ public interface RTConnector extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTConnector#getBase_Connector <em>Base Connector</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Base Connector</em>' reference.

 	 * @see #getBase_Connector()

@@ -61,20 +60,4 @@ public interface RTConnector extends EObject {
 	 */

 	void setBase_Connector(Connector value);

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * base_Connector.end->size() = 2

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='Only binary connectors are allowed'"

-	 * @generated

-	 */

-	boolean Onlybinaryconnectorsareallowed(DiagnosticChain diagnostics, Map<Object, Object> context);

-

 } // RTConnector

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTMessageKind.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTMessageKind.java
index 0f0621ce484..46289d016b4 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTMessageKind.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTMessageKind.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>RT Message Kind</b></em>',

  * and utility methods for working with them.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage#getRTMessageKind()

  * @model

  * @generated

@@ -29,7 +29,7 @@ public enum RTMessageKind implements Enumerator {
 	 * The '<em><b>In</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #IN_VALUE

 	 * @generated

 	 * @ordered

@@ -40,7 +40,7 @@ public enum RTMessageKind implements Enumerator {
 	 * The '<em><b>Out</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #OUT_VALUE

 	 * @generated

 	 * @ordered

@@ -51,7 +51,7 @@ public enum RTMessageKind implements Enumerator {
 	 * The '<em><b>In Out</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #IN_OUT_VALUE

 	 * @generated

 	 * @ordered

@@ -65,7 +65,7 @@ public enum RTMessageKind implements Enumerator {
 	 * If the meaning of '<em><b>In</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #IN

 	 * @model name="in"

 	 * @generated

@@ -80,7 +80,7 @@ public enum RTMessageKind implements Enumerator {
 	 * If the meaning of '<em><b>Out</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #OUT

 	 * @model name="out"

 	 * @generated

@@ -95,7 +95,7 @@ public enum RTMessageKind implements Enumerator {
 	 * If the meaning of '<em><b>In Out</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #IN_OUT

 	 * @model name="inOut"

 	 * @generated

@@ -107,7 +107,7 @@ public enum RTMessageKind implements Enumerator {
 	 * An array of all the '<em><b>RT Message Kind</b></em>' enumerators.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private static final RTMessageKind[] VALUES_ARRAY =

@@ -121,7 +121,7 @@ public enum RTMessageKind implements Enumerator {
 	 * A public read-only list of all the '<em><b>RT Message Kind</b></em>' enumerators.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static final List<RTMessageKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

@@ -130,7 +130,7 @@ public enum RTMessageKind implements Enumerator {
 	 * Returns the '<em><b>RT Message Kind</b></em>' literal with the specified literal value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static RTMessageKind get(String literal) {

@@ -147,7 +147,7 @@ public enum RTMessageKind implements Enumerator {
 	 * Returns the '<em><b>RT Message Kind</b></em>' literal with the specified name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static RTMessageKind getByName(String name) {

@@ -164,7 +164,7 @@ public enum RTMessageKind implements Enumerator {
 	 * Returns the '<em><b>RT Message Kind</b></em>' literal with the specified integer value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static RTMessageKind get(int value) {

@@ -182,7 +182,7 @@ public enum RTMessageKind implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private final int value;

@@ -190,7 +190,7 @@ public enum RTMessageKind implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private final String name;

@@ -198,7 +198,7 @@ public enum RTMessageKind implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private final String literal;

@@ -207,7 +207,7 @@ public enum RTMessageKind implements Enumerator {
 	 * Only this class can construct instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private RTMessageKind(int value, String name, String literal) {

@@ -219,7 +219,7 @@ public enum RTMessageKind implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -230,7 +230,7 @@ public enum RTMessageKind implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -241,7 +241,7 @@ public enum RTMessageKind implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -253,7 +253,7 @@ public enum RTMessageKind implements Enumerator {
 	 * Returns the literal value of the enumerator, which is its string representation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTMessageSet.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTMessageSet.java
index e453111bd7a..a5e2a15431a 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTMessageSet.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTMessageSet.java
@@ -9,7 +9,6 @@
 package org.eclipse.papyrus.umlrt.UMLRealTime;

 

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.uml2.uml.Interface;

 

 /**

@@ -37,7 +36,7 @@ public interface RTMessageSet extends EObject {
 	 * If the meaning of the '<em>Base Interface</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Interface</em>' reference.

 	 * @see #setBase_Interface(Interface)

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage#getRTMessageSet_Base_Interface()

@@ -50,7 +49,7 @@ public interface RTMessageSet extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageSet#getBase_Interface <em>Base Interface</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Base Interface</em>' reference.

 	 * @see #getBase_Interface()

@@ -60,19 +59,19 @@ public interface RTMessageSet extends EObject {
 

 	/**

 	 * Returns the value of the '<em><b>Rt Msg Kind</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

+	 * The default value is <code>"in"</code>.

 	 * The literals are from the enumeration {@link org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageKind}.

 	 * <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Rt Msg Kind</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Rt Msg Kind</em>' attribute.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageKind

 	 * @see #setRtMsgKind(RTMessageKind)

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage#getRTMessageSet_RtMsgKind()

-	 * @model default="true" required="true" ordered="false"

+	 * @model default="in" required="true" ordered="false"

 	 * @generated

 	 */

 	RTMessageKind getRtMsgKind();

@@ -81,7 +80,7 @@ public interface RTMessageSet extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageSet#getRtMsgKind <em>Rt Msg Kind</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Rt Msg Kind</em>' attribute.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageKind

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTPort.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTPort.java
index 2a68e9f9349..015955707b3 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTPort.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTPort.java
@@ -8,12 +8,7 @@
  */

 package org.eclipse.papyrus.umlrt.UMLRealTime;

 

-import java.util.Map;

-

-import org.eclipse.emf.common.util.DiagnosticChain;

-

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.uml2.uml.Port;

 

 /**

@@ -21,6 +16,16 @@ import org.eclipse.uml2.uml.Port;
  * A representation of the model object '<em><b>RT Port</b></em>'.

  * <!-- end-user-doc -->

  *

+ * <!-- begin-model-doc -->

+ * isWired implies not isPublish

+ * (base_Port.visibility = UML::VisibilityKind::public)

+ * implies base_Port.isService

+ * (not isWired and not isPublish)

+ * implies (base_Port.visibility = UML::VisibilityKind::protected)

+ * (not isWired and isPublish) implies

+ * (base_Port.visibility = UML::VisibilityKind::public)

+ * <!-- end-model-doc -->

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -46,7 +51,7 @@ public interface RTPort extends EObject {
 	 * If the meaning of the '<em>Is Notification</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Is Notification</em>' attribute.

 	 * @see #setIsNotification(boolean)

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage#getRTPort_IsNotification()

@@ -59,7 +64,7 @@ public interface RTPort extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#isNotification <em>Is Notification</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Is Notification</em>' attribute.

 	 * @see #isNotification()

@@ -75,7 +80,7 @@ public interface RTPort extends EObject {
 	 * If the meaning of the '<em>Is Publish</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Is Publish</em>' attribute.

 	 * @see #setIsPublish(boolean)

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage#getRTPort_IsPublish()

@@ -88,7 +93,7 @@ public interface RTPort extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#isPublish <em>Is Publish</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Is Publish</em>' attribute.

 	 * @see #isPublish()

@@ -104,7 +109,7 @@ public interface RTPort extends EObject {
 	 * If the meaning of the '<em>Is Wired</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Is Wired</em>' attribute.

 	 * @see #setIsWired(boolean)

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage#getRTPort_IsWired()

@@ -117,7 +122,7 @@ public interface RTPort extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#isWired <em>Is Wired</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Is Wired</em>' attribute.

 	 * @see #isWired()

@@ -133,7 +138,7 @@ public interface RTPort extends EObject {
 	 * If the meaning of the '<em>Registration</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Registration</em>' attribute.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.PortRegistrationType

 	 * @see #setRegistration(PortRegistrationType)

@@ -147,7 +152,7 @@ public interface RTPort extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#getRegistration <em>Registration</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Registration</em>' attribute.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.PortRegistrationType

@@ -164,7 +169,7 @@ public interface RTPort extends EObject {
 	 * If the meaning of the '<em>Registration Override</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Registration Override</em>' attribute.

 	 * @see #setRegistrationOverride(String)

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage#getRTPort_RegistrationOverride()

@@ -177,7 +182,7 @@ public interface RTPort extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#getRegistrationOverride <em>Registration Override</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Registration Override</em>' attribute.

 	 * @see #getRegistrationOverride()

@@ -192,7 +197,7 @@ public interface RTPort extends EObject {
 	 * If the meaning of the '<em>Base Port</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Port</em>' reference.

 	 * @see #setBase_Port(Port)

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage#getRTPort_Base_Port()

@@ -205,7 +210,7 @@ public interface RTPort extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#getBase_Port <em>Base Port</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Base Port</em>' reference.

 	 * @see #getBase_Port()

@@ -213,71 +218,4 @@ public interface RTPort extends EObject {
 	 */

 	void setBase_Port(Port value);

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * isWired implies not isPublish

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='A wired port cannot publish its name'"

-	 * @generated

-	 */

-	boolean Awiredportcannotpublishitsname(DiagnosticChain diagnostics, Map<Object, Object> context);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * (base_Port.visibility = UML::VisibilityKind::public)

-	 * implies base_Port.isService

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='A public port must be defined as a service port'"

-	 * @generated

-	 */

-	boolean Apublicportmustbedefinedasaserviceport(DiagnosticChain diagnostics, Map<Object, Object> context);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * (not isWired and not isPublish)

-	 * implies (base_Port.visibility = UML::VisibilityKind::protected)

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='A SAP (unwired & unpublished) must have protected visibility '"

-	 * @generated

-	 */

-	boolean ASAPunwiredunpublishedmusthaveprotectedvisibility(DiagnosticChain diagnostics, Map<Object, Object> context);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * (not isWired and isPublish) implies

-	 * (base_Port.visibility = UML::VisibilityKind::public)

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='An SPP (unwired and published) must have public visibility'"

-	 * @generated

-	 */

-	boolean AnSPPunwiredandpublishedmusthavepublicvisibility(DiagnosticChain diagnostics, Map<Object, Object> context);

-

 } // RTPort

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTRExcludedElement.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTRExcludedElement.java
index 26a8abbc603..d5f1a6a5206 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTRExcludedElement.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTRExcludedElement.java
@@ -8,12 +8,7 @@
  */

 package org.eclipse.papyrus.umlrt.UMLRealTime;

 

-import java.util.Map;

-

-import org.eclipse.emf.common.util.DiagnosticChain;

-

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.uml2.uml.RedefinableElement;

 

 /**

@@ -21,6 +16,16 @@ import org.eclipse.uml2.uml.RedefinableElement;
  * A representation of the model object '<em><b>RTR Excluded Element</b></em>'.

  * <!-- end-user-doc -->

  *

+ * <!-- begin-model-doc -->

+ * let el = base_RedefinableElement in

+ * (el.oclIsKindOf(UML::Port) or

+ * el.oclIsKindOf(UML::Property) or

+ * el.oclIsKindOf(UML::Operation) or

+ * el.oclIsKindOf(UML::Behavior) or

+ * el.oclIsKindOf(UML::State) or

+ * el.oclIsKindOf(UML::Transition))

+ * <!-- end-model-doc -->

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -40,7 +45,7 @@ public interface RTRExcludedElement extends EObject {
 	 * If the meaning of the '<em>Base Redefinable Element</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Redefinable Element</em>' reference.

 	 * @see #setBase_RedefinableElement(RedefinableElement)

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage#getRTRExcludedElement_Base_RedefinableElement()

@@ -53,7 +58,7 @@ public interface RTRExcludedElement extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTRExcludedElement#getBase_RedefinableElement <em>Base Redefinable Element</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Base Redefinable Element</em>' reference.

 	 * @see #getBase_RedefinableElement()

@@ -61,26 +66,4 @@ public interface RTRExcludedElement extends EObject {
 	 */

 	void setBase_RedefinableElement(RedefinableElement value);

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * let el = base_RedefinableElement in

-	 * (el.oclIsKindOf(UML::Port) or

-	 * el.oclIsKindOf(UML::Property) or

-	 * el.oclIsKindOf(UML::Operation) or

-	 * el.oclIsKindOf(UML::Behavior) or

-	 * el.oclIsKindOf(UML::State) or

-	 * el.oclIsKindOf(UML::Transition))

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='Exclusion can only be applied to some UML-RT model elements'"

-	 * @generated

-	 */

-	boolean ExclusioncanonlybeappliedtosomeUMLRTmodelelements(DiagnosticChain diagnostics, Map<Object, Object> context);

-

 } // RTRExcludedElement

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/UMLRealTimeFactory.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/UMLRealTimeFactory.java
index 29c9f2ac9e9..7308deed295 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/UMLRealTimeFactory.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/UMLRealTimeFactory.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.

  * It provides a create method for each non-abstract class of the model.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage

  * @generated

  */

@@ -24,7 +24,7 @@ public interface UMLRealTimeFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	UMLRealTimeFactory eINSTANCE = org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimeFactoryImpl.init();

@@ -33,7 +33,7 @@ public interface UMLRealTimeFactory extends EFactory {
 	 * Returns a new object of class '<em>Capsule</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Capsule</em>'.

 	 * @generated

 	 */

@@ -43,7 +43,7 @@ public interface UMLRealTimeFactory extends EFactory {
 	 * Returns a new object of class '<em>Capsule Part</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Capsule Part</em>'.

 	 * @generated

 	 */

@@ -53,7 +53,7 @@ public interface UMLRealTimeFactory extends EFactory {
 	 * Returns a new object of class '<em>Protocol</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Protocol</em>'.

 	 * @generated

 	 */

@@ -63,7 +63,7 @@ public interface UMLRealTimeFactory extends EFactory {
 	 * Returns a new object of class '<em>RT Port</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>RT Port</em>'.

 	 * @generated

 	 */

@@ -73,7 +73,7 @@ public interface UMLRealTimeFactory extends EFactory {
 	 * Returns a new object of class '<em>RT Connector</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>RT Connector</em>'.

 	 * @generated

 	 */

@@ -83,7 +83,7 @@ public interface UMLRealTimeFactory extends EFactory {
 	 * Returns a new object of class '<em>Protocol Container</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>Protocol Container</em>'.

 	 * @generated

 	 */

@@ -93,7 +93,7 @@ public interface UMLRealTimeFactory extends EFactory {
 	 * Returns a new object of class '<em>RTR Excluded Element</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>RTR Excluded Element</em>'.

 	 * @generated

 	 */

@@ -103,7 +103,7 @@ public interface UMLRealTimeFactory extends EFactory {
 	 * Returns a new object of class '<em>RT Message Set</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>RT Message Set</em>'.

 	 * @generated

 	 */

@@ -113,7 +113,7 @@ public interface UMLRealTimeFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/UMLRealTimePackage.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/UMLRealTimePackage.java
index 8125514e15a..0d22ed454ec 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/UMLRealTimePackage.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/UMLRealTimePackage.java
@@ -11,7 +11,6 @@ package org.eclipse.papyrus.umlrt.UMLRealTime;
 import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EOperation;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EReference;

 

@@ -27,7 +26,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimeFactory

  * @model kind="package"

  * @generated

@@ -37,7 +36,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The package name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNAME = "UMLRealTime"; //$NON-NLS-1$

@@ -46,16 +45,16 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The package namespace URI.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

-	String eNS_URI = "http:///UMLRealTime.ecore"; //$NON-NLS-1$

+	String eNS_URI = "http://www.eclipse.org/papyrus/umlrt"; //$NON-NLS-1$

 

 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "UMLRealTime"; //$NON-NLS-1$

@@ -64,7 +63,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	UMLRealTimePackage eINSTANCE = org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl.init();

@@ -73,7 +72,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.impl.CapsuleImpl <em>Capsule</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.CapsuleImpl

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getCapsule()

 	 * @generated

@@ -84,7 +83,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -94,117 +93,27 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The number of structural features of the '<em>Capsule</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

 	int CAPSULE_FEATURE_COUNT = 1;

 

 	/**

-	 * The operation id for the '<em>Capsulesarealwaysactive</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int CAPSULE___CAPSULESAREALWAYSACTIVE__DIAGNOSTICCHAIN_MAP = 0;

-

-	/**

-	 * The operation id for the '<em>Acapsulecannothave Receptionfeatures</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int CAPSULE___ACAPSULECANNOTHAVE_RECEPTIONFEATURES__DIAGNOSTICCHAIN_MAP = 1;

-

-	/**

-	 * The operation id for the '<em>Acapsuleclasscanalwaysbesubclassed</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int CAPSULE___ACAPSULECLASSCANALWAYSBESUBCLASSED__DIAGNOSTICCHAIN_MAP = 2;

-

-	/**

-	 * The operation id for the '<em>Acapsulecanhaveatmostonesuperclass</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int CAPSULE___ACAPSULECANHAVEATMOSTONESUPERCLASS__DIAGNOSTICCHAIN_MAP = 3;

-

-	/**

-	 * The operation id for the '<em>Capsuleclassesarealwayssubstitutable</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int CAPSULE___CAPSULECLASSESAREALWAYSSUBSTITUTABLE__DIAGNOSTICCHAIN_MAP = 4;

-

-	/**

-	 * The operation id for the '<em>Allattributesofacapsuleclasshaveexactlyonetype</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int CAPSULE___ALLATTRIBUTESOFACAPSULECLASSHAVEEXACTLYONETYPE__DIAGNOSTICCHAIN_MAP = 5;

-

-	/**

-	 * The operation id for the '<em>Privatevisibilityisnotsupportedoncapsulefeatures</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int CAPSULE___PRIVATEVISIBILITYISNOTSUPPORTEDONCAPSULEFEATURES__DIAGNOSTICCHAIN_MAP = 6;

-

-	/**

-	 * The operation id for the '<em>Acapsuleclasscannothavenestedclassifiers</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int CAPSULE___ACAPSULECLASSCANNOTHAVENESTEDCLASSIFIERS__DIAGNOSTICCHAIN_MAP = 7;

-

-	/**

-	 * The operation id for the '<em>Alloperationsofacapsulearesequential</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int CAPSULE___ALLOPERATIONSOFACAPSULEARESEQUENTIAL__DIAGNOSTICCHAIN_MAP = 8;

-

-	/**

 	 * The number of operations of the '<em>Capsule</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

-	int CAPSULE_OPERATION_COUNT = 9;

+	int CAPSULE_OPERATION_COUNT = 0;

 

 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.impl.CapsulePartImpl <em>Capsule Part</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.CapsulePartImpl

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getCapsulePart()

 	 * @generated

@@ -215,7 +124,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Property</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -225,7 +134,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The number of structural features of the '<em>Capsule Part</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -235,7 +144,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The number of operations of the '<em>Capsule Part</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -245,7 +154,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.impl.ProtocolImpl <em>Protocol</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.ProtocolImpl

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getProtocol()

 	 * @generated

@@ -256,7 +165,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Collaboration</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -266,37 +175,27 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The number of structural features of the '<em>Protocol</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

 	int PROTOCOL_FEATURE_COUNT = 1;

 

 	/**

-	 * The operation id for the '<em>Protocolscanhaveatmostonegeneralization</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int PROTOCOL___PROTOCOLSCANHAVEATMOSTONEGENERALIZATION__DIAGNOSTICCHAIN_MAP = 0;

-

-	/**

 	 * The number of operations of the '<em>Protocol</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

-	int PROTOCOL_OPERATION_COUNT = 1;

+	int PROTOCOL_OPERATION_COUNT = 0;

 

 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.impl.RTPortImpl <em>RT Port</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.RTPortImpl

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getRTPort()

 	 * @generated

@@ -307,7 +206,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The feature id for the '<em><b>Is Notification</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -317,7 +216,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The feature id for the '<em><b>Is Publish</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -327,7 +226,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The feature id for the '<em><b>Is Wired</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -337,7 +236,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The feature id for the '<em><b>Registration</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -347,7 +246,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The feature id for the '<em><b>Registration Override</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -357,7 +256,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Port</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -367,67 +266,27 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The number of structural features of the '<em>RT Port</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

 	int RT_PORT_FEATURE_COUNT = 6;

 

 	/**

-	 * The operation id for the '<em>Awiredportcannotpublishitsname</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int RT_PORT___AWIREDPORTCANNOTPUBLISHITSNAME__DIAGNOSTICCHAIN_MAP = 0;

-

-	/**

-	 * The operation id for the '<em>Apublicportmustbedefinedasaserviceport</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int RT_PORT___APUBLICPORTMUSTBEDEFINEDASASERVICEPORT__DIAGNOSTICCHAIN_MAP = 1;

-

-	/**

-	 * The operation id for the '<em>ASA Punwiredunpublishedmusthaveprotectedvisibility</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int RT_PORT___ASA_PUNWIREDUNPUBLISHEDMUSTHAVEPROTECTEDVISIBILITY__DIAGNOSTICCHAIN_MAP = 2;

-

-	/**

-	 * The operation id for the '<em>An SP Punwiredandpublishedmusthavepublicvisibility</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int RT_PORT___AN_SP_PUNWIREDANDPUBLISHEDMUSTHAVEPUBLICVISIBILITY__DIAGNOSTICCHAIN_MAP = 3;

-

-	/**

 	 * The number of operations of the '<em>RT Port</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

-	int RT_PORT_OPERATION_COUNT = 4;

+	int RT_PORT_OPERATION_COUNT = 0;

 

 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.impl.RTConnectorImpl <em>RT Connector</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.RTConnectorImpl

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getRTConnector()

 	 * @generated

@@ -438,7 +297,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Connector</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -448,37 +307,27 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The number of structural features of the '<em>RT Connector</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

 	int RT_CONNECTOR_FEATURE_COUNT = 1;

 

 	/**

-	 * The operation id for the '<em>Onlybinaryconnectorsareallowed</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int RT_CONNECTOR___ONLYBINARYCONNECTORSAREALLOWED__DIAGNOSTICCHAIN_MAP = 0;

-

-	/**

 	 * The number of operations of the '<em>RT Connector</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

-	int RT_CONNECTOR_OPERATION_COUNT = 1;

+	int RT_CONNECTOR_OPERATION_COUNT = 0;

 

 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.impl.ProtocolContainerImpl <em>Protocol Container</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.ProtocolContainerImpl

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getProtocolContainer()

 	 * @generated

@@ -489,7 +338,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -499,7 +348,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The number of structural features of the '<em>Protocol Container</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -509,7 +358,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The number of operations of the '<em>Protocol Container</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -519,7 +368,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.impl.RTRExcludedElementImpl <em>RTR Excluded Element</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.RTRExcludedElementImpl

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getRTRExcludedElement()

 	 * @generated

@@ -530,7 +379,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Redefinable Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -540,37 +389,27 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The number of structural features of the '<em>RTR Excluded Element</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

 	int RTR_EXCLUDED_ELEMENT_FEATURE_COUNT = 1;

 

 	/**

-	 * The operation id for the '<em>Exclusioncanonlybeappliedtosome UMLR Tmodelelements</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int RTR_EXCLUDED_ELEMENT___EXCLUSIONCANONLYBEAPPLIEDTOSOME_UMLR_TMODELELEMENTS__DIAGNOSTICCHAIN_MAP = 0;

-

-	/**

 	 * The number of operations of the '<em>RTR Excluded Element</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

-	int RTR_EXCLUDED_ELEMENT_OPERATION_COUNT = 1;

+	int RTR_EXCLUDED_ELEMENT_OPERATION_COUNT = 0;

 

 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.impl.RTMessageSetImpl <em>RT Message Set</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.RTMessageSetImpl

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getRTMessageSet()

 	 * @generated

@@ -581,7 +420,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Interface</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -591,7 +430,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The feature id for the '<em><b>Rt Msg Kind</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -601,7 +440,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The number of structural features of the '<em>RT Message Set</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -611,7 +450,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The number of operations of the '<em>RT Message Set</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -621,7 +460,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.PortRegistrationType <em>Port Registration Type</em>}' enum.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.PortRegistrationType

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getPortRegistrationType()

 	 * @generated

@@ -632,7 +471,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageKind <em>RT Message Kind</em>}' enum.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageKind

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getRTMessageKind()

 	 * @generated

@@ -644,7 +483,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umlrt.UMLRealTime.Capsule <em>Capsule</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Capsule</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.Capsule

 	 * @generated

@@ -655,7 +494,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#getBase_Class <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#getBase_Class()

 	 * @see #getCapsule()

@@ -664,111 +503,10 @@ public interface UMLRealTimePackage extends EPackage {
 	EReference getCapsule_Base_Class();

 

 	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#Capsulesarealwaysactive(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Capsulesarealwaysactive</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>Capsulesarealwaysactive</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#Capsulesarealwaysactive(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getCapsule__Capsulesarealwaysactive__DiagnosticChain_Map();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#AcapsulecannothaveReceptionfeatures(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Acapsulecannothave Receptionfeatures</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>Acapsulecannothave Receptionfeatures</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#AcapsulecannothaveReceptionfeatures(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getCapsule__AcapsulecannothaveReceptionfeatures__DiagnosticChain_Map();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#Acapsuleclasscanalwaysbesubclassed(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Acapsuleclasscanalwaysbesubclassed</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>Acapsuleclasscanalwaysbesubclassed</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#Acapsuleclasscanalwaysbesubclassed(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getCapsule__Acapsuleclasscanalwaysbesubclassed__DiagnosticChain_Map();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#Acapsulecanhaveatmostonesuperclass(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Acapsulecanhaveatmostonesuperclass</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>Acapsulecanhaveatmostonesuperclass</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#Acapsulecanhaveatmostonesuperclass(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getCapsule__Acapsulecanhaveatmostonesuperclass__DiagnosticChain_Map();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#Capsuleclassesarealwayssubstitutable(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Capsuleclassesarealwayssubstitutable</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>Capsuleclassesarealwayssubstitutable</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#Capsuleclassesarealwayssubstitutable(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getCapsule__Capsuleclassesarealwayssubstitutable__DiagnosticChain_Map();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#Allattributesofacapsuleclasshaveexactlyonetype(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Allattributesofacapsuleclasshaveexactlyonetype</em>}'

-	 * operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>Allattributesofacapsuleclasshaveexactlyonetype</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#Allattributesofacapsuleclasshaveexactlyonetype(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getCapsule__Allattributesofacapsuleclasshaveexactlyonetype__DiagnosticChain_Map();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#Privatevisibilityisnotsupportedoncapsulefeatures(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Privatevisibilityisnotsupportedoncapsulefeatures</em>}

-	 * ' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>Privatevisibilityisnotsupportedoncapsulefeatures</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#Privatevisibilityisnotsupportedoncapsulefeatures(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getCapsule__Privatevisibilityisnotsupportedoncapsulefeatures__DiagnosticChain_Map();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#Acapsuleclasscannothavenestedclassifiers(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Acapsuleclasscannothavenestedclassifiers</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>Acapsuleclasscannothavenestedclassifiers</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#Acapsuleclasscannothavenestedclassifiers(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getCapsule__Acapsuleclasscannothavenestedclassifiers__DiagnosticChain_Map();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#Alloperationsofacapsulearesequential(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Alloperationsofacapsulearesequential</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>Alloperationsofacapsulearesequential</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.Capsule#Alloperationsofacapsulearesequential(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getCapsule__Alloperationsofacapsulearesequential__DiagnosticChain_Map();

-

-	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umlrt.UMLRealTime.CapsulePart <em>Capsule Part</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Capsule Part</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.CapsulePart

 	 * @generated

@@ -779,7 +517,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umlrt.UMLRealTime.CapsulePart#getBase_Property <em>Base Property</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Property</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.CapsulePart#getBase_Property()

 	 * @see #getCapsulePart()

@@ -791,7 +529,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umlrt.UMLRealTime.Protocol <em>Protocol</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Protocol</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.Protocol

 	 * @generated

@@ -802,7 +540,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umlrt.UMLRealTime.Protocol#getBase_Collaboration <em>Base Collaboration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Collaboration</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.Protocol#getBase_Collaboration()

 	 * @see #getProtocol()

@@ -811,21 +549,10 @@ public interface UMLRealTimePackage extends EPackage {
 	EReference getProtocol_Base_Collaboration();

 

 	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.Protocol#Protocolscanhaveatmostonegeneralization(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Protocolscanhaveatmostonegeneralization</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>Protocolscanhaveatmostonegeneralization</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.Protocol#Protocolscanhaveatmostonegeneralization(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getProtocol__Protocolscanhaveatmostonegeneralization__DiagnosticChain_Map();

-

-	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTPort <em>RT Port</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>RT Port</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTPort

 	 * @generated

@@ -836,7 +563,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#isNotification <em>Is Notification</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the attribute '<em>Is Notification</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#isNotification()

 	 * @see #getRTPort()

@@ -848,7 +575,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#isPublish <em>Is Publish</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the attribute '<em>Is Publish</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#isPublish()

 	 * @see #getRTPort()

@@ -860,7 +587,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#isWired <em>Is Wired</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the attribute '<em>Is Wired</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#isWired()

 	 * @see #getRTPort()

@@ -872,7 +599,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#getRegistration <em>Registration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the attribute '<em>Registration</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#getRegistration()

 	 * @see #getRTPort()

@@ -884,7 +611,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#getRegistrationOverride <em>Registration Override</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the attribute '<em>Registration Override</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#getRegistrationOverride()

 	 * @see #getRTPort()

@@ -896,7 +623,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#getBase_Port <em>Base Port</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Port</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#getBase_Port()

 	 * @see #getRTPort()

@@ -905,56 +632,10 @@ public interface UMLRealTimePackage extends EPackage {
 	EReference getRTPort_Base_Port();

 

 	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#Awiredportcannotpublishitsname(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Awiredportcannotpublishitsname</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>Awiredportcannotpublishitsname</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#Awiredportcannotpublishitsname(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getRTPort__Awiredportcannotpublishitsname__DiagnosticChain_Map();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#Apublicportmustbedefinedasaserviceport(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Apublicportmustbedefinedasaserviceport</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>Apublicportmustbedefinedasaserviceport</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#Apublicportmustbedefinedasaserviceport(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getRTPort__Apublicportmustbedefinedasaserviceport__DiagnosticChain_Map();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#ASAPunwiredunpublishedmusthaveprotectedvisibility(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * <em>ASA Punwiredunpublishedmusthaveprotectedvisibility</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>ASA Punwiredunpublishedmusthaveprotectedvisibility</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#ASAPunwiredunpublishedmusthaveprotectedvisibility(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getRTPort__ASAPunwiredunpublishedmusthaveprotectedvisibility__DiagnosticChain_Map();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#AnSPPunwiredandpublishedmusthavepublicvisibility(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * <em>An SP Punwiredandpublishedmusthavepublicvisibility</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>An SP Punwiredandpublishedmusthavepublicvisibility</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTPort#AnSPPunwiredandpublishedmusthavepublicvisibility(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getRTPort__AnSPPunwiredandpublishedmusthavepublicvisibility__DiagnosticChain_Map();

-

-	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTConnector <em>RT Connector</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>RT Connector</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTConnector

 	 * @generated

@@ -965,7 +646,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTConnector#getBase_Connector <em>Base Connector</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Connector</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTConnector#getBase_Connector()

 	 * @see #getRTConnector()

@@ -974,21 +655,10 @@ public interface UMLRealTimePackage extends EPackage {
 	EReference getRTConnector_Base_Connector();

 

 	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTConnector#Onlybinaryconnectorsareallowed(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Onlybinaryconnectorsareallowed</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>Onlybinaryconnectorsareallowed</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTConnector#Onlybinaryconnectorsareallowed(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getRTConnector__Onlybinaryconnectorsareallowed__DiagnosticChain_Map();

-

-	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umlrt.UMLRealTime.ProtocolContainer <em>Protocol Container</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>Protocol Container</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.ProtocolContainer

 	 * @generated

@@ -999,7 +669,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umlrt.UMLRealTime.ProtocolContainer#getBase_Package <em>Base Package</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Package</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.ProtocolContainer#getBase_Package()

 	 * @see #getProtocolContainer()

@@ -1011,7 +681,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTRExcludedElement <em>RTR Excluded Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>RTR Excluded Element</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTRExcludedElement

 	 * @generated

@@ -1022,7 +692,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTRExcludedElement#getBase_RedefinableElement <em>Base Redefinable Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Redefinable Element</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTRExcludedElement#getBase_RedefinableElement()

 	 * @see #getRTRExcludedElement()

@@ -1031,22 +701,10 @@ public interface UMLRealTimePackage extends EPackage {
 	EReference getRTRExcludedElement_Base_RedefinableElement();

 

 	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTRExcludedElement#ExclusioncanonlybeappliedtosomeUMLRTmodelelements(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * <em>Exclusioncanonlybeappliedtosome UMLR Tmodelelements</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>Exclusioncanonlybeappliedtosome UMLR Tmodelelements</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTRExcludedElement#ExclusioncanonlybeappliedtosomeUMLRTmodelelements(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getRTRExcludedElement__ExclusioncanonlybeappliedtosomeUMLRTmodelelements__DiagnosticChain_Map();

-

-	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageSet <em>RT Message Set</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>RT Message Set</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageSet

 	 * @generated

@@ -1057,7 +715,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageSet#getBase_Interface <em>Base Interface</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Interface</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageSet#getBase_Interface()

 	 * @see #getRTMessageSet()

@@ -1069,7 +727,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageSet#getRtMsgKind <em>Rt Msg Kind</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the attribute '<em>Rt Msg Kind</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageSet#getRtMsgKind()

 	 * @see #getRTMessageSet()

@@ -1081,7 +739,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.umlrt.UMLRealTime.PortRegistrationType <em>Port Registration Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for enum '<em>Port Registration Type</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.PortRegistrationType

 	 * @generated

@@ -1092,7 +750,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageKind <em>RT Message Kind</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for enum '<em>RT Message Kind</em>'.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageKind

 	 * @generated

@@ -1103,7 +761,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -1120,7 +778,7 @@ public interface UMLRealTimePackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	interface Literals {

@@ -1128,7 +786,7 @@ public interface UMLRealTimePackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.impl.CapsuleImpl <em>Capsule</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.CapsuleImpl

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getCapsule()

 		 * @generated

@@ -1139,97 +797,16 @@ public interface UMLRealTimePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference CAPSULE__BASE_CLASS = eINSTANCE.getCapsule_Base_Class();

 

 		/**

-		 * The meta object literal for the '<em><b>Capsulesarealwaysactive</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation CAPSULE___CAPSULESAREALWAYSACTIVE__DIAGNOSTICCHAIN_MAP = eINSTANCE.getCapsule__Capsulesarealwaysactive__DiagnosticChain_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>Acapsulecannothave Receptionfeatures</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation CAPSULE___ACAPSULECANNOTHAVE_RECEPTIONFEATURES__DIAGNOSTICCHAIN_MAP = eINSTANCE.getCapsule__AcapsulecannothaveReceptionfeatures__DiagnosticChain_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>Acapsuleclasscanalwaysbesubclassed</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation CAPSULE___ACAPSULECLASSCANALWAYSBESUBCLASSED__DIAGNOSTICCHAIN_MAP = eINSTANCE.getCapsule__Acapsuleclasscanalwaysbesubclassed__DiagnosticChain_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>Acapsulecanhaveatmostonesuperclass</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation CAPSULE___ACAPSULECANHAVEATMOSTONESUPERCLASS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getCapsule__Acapsulecanhaveatmostonesuperclass__DiagnosticChain_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>Capsuleclassesarealwayssubstitutable</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation CAPSULE___CAPSULECLASSESAREALWAYSSUBSTITUTABLE__DIAGNOSTICCHAIN_MAP = eINSTANCE.getCapsule__Capsuleclassesarealwayssubstitutable__DiagnosticChain_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>Allattributesofacapsuleclasshaveexactlyonetype</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation CAPSULE___ALLATTRIBUTESOFACAPSULECLASSHAVEEXACTLYONETYPE__DIAGNOSTICCHAIN_MAP = eINSTANCE.getCapsule__Allattributesofacapsuleclasshaveexactlyonetype__DiagnosticChain_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>Privatevisibilityisnotsupportedoncapsulefeatures</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation CAPSULE___PRIVATEVISIBILITYISNOTSUPPORTEDONCAPSULEFEATURES__DIAGNOSTICCHAIN_MAP = eINSTANCE.getCapsule__Privatevisibilityisnotsupportedoncapsulefeatures__DiagnosticChain_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>Acapsuleclasscannothavenestedclassifiers</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation CAPSULE___ACAPSULECLASSCANNOTHAVENESTEDCLASSIFIERS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getCapsule__Acapsuleclasscannothavenestedclassifiers__DiagnosticChain_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>Alloperationsofacapsulearesequential</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation CAPSULE___ALLOPERATIONSOFACAPSULEARESEQUENTIAL__DIAGNOSTICCHAIN_MAP = eINSTANCE.getCapsule__Alloperationsofacapsulearesequential__DiagnosticChain_Map();

-

-		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.impl.CapsulePartImpl <em>Capsule Part</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.CapsulePartImpl

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getCapsulePart()

 		 * @generated

@@ -1240,7 +817,7 @@ public interface UMLRealTimePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference CAPSULE_PART__BASE_PROPERTY = eINSTANCE.getCapsulePart_Base_Property();

@@ -1249,7 +826,7 @@ public interface UMLRealTimePackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.impl.ProtocolImpl <em>Protocol</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.ProtocolImpl

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getProtocol()

 		 * @generated

@@ -1260,25 +837,16 @@ public interface UMLRealTimePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Collaboration</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference PROTOCOL__BASE_COLLABORATION = eINSTANCE.getProtocol_Base_Collaboration();

 

 		/**

-		 * The meta object literal for the '<em><b>Protocolscanhaveatmostonegeneralization</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation PROTOCOL___PROTOCOLSCANHAVEATMOSTONEGENERALIZATION__DIAGNOSTICCHAIN_MAP = eINSTANCE.getProtocol__Protocolscanhaveatmostonegeneralization__DiagnosticChain_Map();

-

-		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.impl.RTPortImpl <em>RT Port</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.RTPortImpl

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getRTPort()

 		 * @generated

@@ -1289,7 +857,7 @@ public interface UMLRealTimePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Is Notification</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EAttribute RT_PORT__IS_NOTIFICATION = eINSTANCE.getRTPort_IsNotification();

@@ -1298,7 +866,7 @@ public interface UMLRealTimePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Is Publish</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EAttribute RT_PORT__IS_PUBLISH = eINSTANCE.getRTPort_IsPublish();

@@ -1307,7 +875,7 @@ public interface UMLRealTimePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Is Wired</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EAttribute RT_PORT__IS_WIRED = eINSTANCE.getRTPort_IsWired();

@@ -1316,7 +884,7 @@ public interface UMLRealTimePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Registration</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EAttribute RT_PORT__REGISTRATION = eINSTANCE.getRTPort_Registration();

@@ -1325,7 +893,7 @@ public interface UMLRealTimePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Registration Override</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EAttribute RT_PORT__REGISTRATION_OVERRIDE = eINSTANCE.getRTPort_RegistrationOverride();

@@ -1334,52 +902,16 @@ public interface UMLRealTimePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Port</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference RT_PORT__BASE_PORT = eINSTANCE.getRTPort_Base_Port();

 

 		/**

-		 * The meta object literal for the '<em><b>Awiredportcannotpublishitsname</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation RT_PORT___AWIREDPORTCANNOTPUBLISHITSNAME__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRTPort__Awiredportcannotpublishitsname__DiagnosticChain_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>Apublicportmustbedefinedasaserviceport</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation RT_PORT___APUBLICPORTMUSTBEDEFINEDASASERVICEPORT__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRTPort__Apublicportmustbedefinedasaserviceport__DiagnosticChain_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>ASA Punwiredunpublishedmusthaveprotectedvisibility</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation RT_PORT___ASA_PUNWIREDUNPUBLISHEDMUSTHAVEPROTECTEDVISIBILITY__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRTPort__ASAPunwiredunpublishedmusthaveprotectedvisibility__DiagnosticChain_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>An SP Punwiredandpublishedmusthavepublicvisibility</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation RT_PORT___AN_SP_PUNWIREDANDPUBLISHEDMUSTHAVEPUBLICVISIBILITY__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRTPort__AnSPPunwiredandpublishedmusthavepublicvisibility__DiagnosticChain_Map();

-

-		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.impl.RTConnectorImpl <em>RT Connector</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.RTConnectorImpl

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getRTConnector()

 		 * @generated

@@ -1390,25 +922,16 @@ public interface UMLRealTimePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Connector</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference RT_CONNECTOR__BASE_CONNECTOR = eINSTANCE.getRTConnector_Base_Connector();

 

 		/**

-		 * The meta object literal for the '<em><b>Onlybinaryconnectorsareallowed</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation RT_CONNECTOR___ONLYBINARYCONNECTORSAREALLOWED__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRTConnector__Onlybinaryconnectorsareallowed__DiagnosticChain_Map();

-

-		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.impl.ProtocolContainerImpl <em>Protocol Container</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.ProtocolContainerImpl

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getProtocolContainer()

 		 * @generated

@@ -1419,7 +942,7 @@ public interface UMLRealTimePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference PROTOCOL_CONTAINER__BASE_PACKAGE = eINSTANCE.getProtocolContainer_Base_Package();

@@ -1428,7 +951,7 @@ public interface UMLRealTimePackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.impl.RTRExcludedElementImpl <em>RTR Excluded Element</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.RTRExcludedElementImpl

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getRTRExcludedElement()

 		 * @generated

@@ -1439,25 +962,16 @@ public interface UMLRealTimePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Redefinable Element</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference RTR_EXCLUDED_ELEMENT__BASE_REDEFINABLE_ELEMENT = eINSTANCE.getRTRExcludedElement_Base_RedefinableElement();

 

 		/**

-		 * The meta object literal for the '<em><b>Exclusioncanonlybeappliedtosome UMLR Tmodelelements</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation RTR_EXCLUDED_ELEMENT___EXCLUSIONCANONLYBEAPPLIEDTOSOME_UMLR_TMODELELEMENTS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRTRExcludedElement__ExclusioncanonlybeappliedtosomeUMLRTmodelelements__DiagnosticChain_Map();

-

-		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.impl.RTMessageSetImpl <em>RT Message Set</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.RTMessageSetImpl

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getRTMessageSet()

 		 * @generated

@@ -1468,7 +982,7 @@ public interface UMLRealTimePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Interface</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference RT_MESSAGE_SET__BASE_INTERFACE = eINSTANCE.getRTMessageSet_Base_Interface();

@@ -1477,7 +991,7 @@ public interface UMLRealTimePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Rt Msg Kind</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EAttribute RT_MESSAGE_SET__RT_MSG_KIND = eINSTANCE.getRTMessageSet_RtMsgKind();

@@ -1486,7 +1000,7 @@ public interface UMLRealTimePackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.PortRegistrationType <em>Port Registration Type</em>}' enum.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.PortRegistrationType

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getPortRegistrationType()

 		 * @generated

@@ -1497,7 +1011,7 @@ public interface UMLRealTimePackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageKind <em>RT Message Kind</em>}' enum.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageKind

 		 * @see org.eclipse.papyrus.umlrt.UMLRealTime.impl.UMLRealTimePackageImpl#getRTMessageKind()

 		 * @generated

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/CapsuleImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/CapsuleImpl.java
index 17281c3fb03..18d940ca221 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/CapsuleImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/CapsuleImpl.java
@@ -8,32 +8,14 @@
  */

 package org.eclipse.papyrus.umlrt.UMLRealTime.impl;

 

-import java.lang.reflect.InvocationTargetException;

-

-import java.util.Map;

-

 import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.EList;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-

-import org.eclipse.emf.ecore.util.EObjectValidator;

-

 import org.eclipse.papyrus.umlrt.UMLRealTime.Capsule;

 import org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage;

 

-import org.eclipse.papyrus.umlrt.UMLRealTime.util.UMLRealTimeValidator;

-

 /**

  * <!-- begin-user-doc -->

  * An implementation of the model object '<em><b>Capsule</b></em>'.

@@ -52,7 +34,7 @@ public class CapsuleImpl extends MinimalEObjectImpl.Container implements Capsule
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Class()

 	 * @generated

 	 * @ordered

@@ -62,7 +44,7 @@ public class CapsuleImpl extends MinimalEObjectImpl.Container implements Capsule
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected CapsuleImpl() {

@@ -72,7 +54,7 @@ public class CapsuleImpl extends MinimalEObjectImpl.Container implements Capsule
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -83,7 +65,7 @@ public class CapsuleImpl extends MinimalEObjectImpl.Container implements Capsule
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -103,7 +85,7 @@ public class CapsuleImpl extends MinimalEObjectImpl.Container implements Capsule
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {

@@ -113,7 +95,7 @@ public class CapsuleImpl extends MinimalEObjectImpl.Container implements Capsule
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -128,250 +110,7 @@ public class CapsuleImpl extends MinimalEObjectImpl.Container implements Capsule
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean Capsulesarealwaysactive(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeValidator.CAPSULE__CAPSULESAREALWAYSACTIVE,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "Capsulesarealwaysactive", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean AcapsulecannothaveReceptionfeatures(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeValidator.CAPSULE__ACAPSULECANNOTHAVE_RECEPTIONFEATURES,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "AcapsulecannothaveReceptionfeatures", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean Acapsuleclasscanalwaysbesubclassed(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeValidator.CAPSULE__ACAPSULECLASSCANALWAYSBESUBCLASSED,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "Acapsuleclasscanalwaysbesubclassed", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean Acapsulecanhaveatmostonesuperclass(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeValidator.CAPSULE__ACAPSULECANHAVEATMOSTONESUPERCLASS,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "Acapsulecanhaveatmostonesuperclass", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean Capsuleclassesarealwayssubstitutable(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeValidator.CAPSULE__CAPSULECLASSESAREALWAYSSUBSTITUTABLE,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "Capsuleclassesarealwayssubstitutable", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean Allattributesofacapsuleclasshaveexactlyonetype(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeValidator.CAPSULE__ALLATTRIBUTESOFACAPSULECLASSHAVEEXACTLYONETYPE,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "Allattributesofacapsuleclasshaveexactlyonetype", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean Privatevisibilityisnotsupportedoncapsulefeatures(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeValidator.CAPSULE__PRIVATEVISIBILITYISNOTSUPPORTEDONCAPSULEFEATURES,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "Privatevisibilityisnotsupportedoncapsulefeatures", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean Acapsuleclasscannothavenestedclassifiers(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeValidator.CAPSULE__ACAPSULECLASSCANNOTHAVENESTEDCLASSIFIERS,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "Acapsuleclasscannothavenestedclassifiers", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean Alloperationsofacapsulearesequential(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeValidator.CAPSULE__ALLOPERATIONSOFACAPSULEARESEQUENTIAL,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "Alloperationsofacapsulearesequential", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -389,7 +128,7 @@ public class CapsuleImpl extends MinimalEObjectImpl.Container implements Capsule
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -405,7 +144,7 @@ public class CapsuleImpl extends MinimalEObjectImpl.Container implements Capsule
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -421,7 +160,7 @@ public class CapsuleImpl extends MinimalEObjectImpl.Container implements Capsule
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -433,36 +172,4 @@ public class CapsuleImpl extends MinimalEObjectImpl.Container implements Capsule
 		return super.eIsSet(featureID);

 	}

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	@SuppressWarnings("unchecked")

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-		case UMLRealTimePackage.CAPSULE___CAPSULESAREALWAYSACTIVE__DIAGNOSTICCHAIN_MAP:

-			return Capsulesarealwaysactive((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		case UMLRealTimePackage.CAPSULE___ACAPSULECANNOTHAVE_RECEPTIONFEATURES__DIAGNOSTICCHAIN_MAP:

-			return AcapsulecannothaveReceptionfeatures((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		case UMLRealTimePackage.CAPSULE___ACAPSULECLASSCANALWAYSBESUBCLASSED__DIAGNOSTICCHAIN_MAP:

-			return Acapsuleclasscanalwaysbesubclassed((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		case UMLRealTimePackage.CAPSULE___ACAPSULECANHAVEATMOSTONESUPERCLASS__DIAGNOSTICCHAIN_MAP:

-			return Acapsulecanhaveatmostonesuperclass((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		case UMLRealTimePackage.CAPSULE___CAPSULECLASSESAREALWAYSSUBSTITUTABLE__DIAGNOSTICCHAIN_MAP:

-			return Capsuleclassesarealwayssubstitutable((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		case UMLRealTimePackage.CAPSULE___ALLATTRIBUTESOFACAPSULECLASSHAVEEXACTLYONETYPE__DIAGNOSTICCHAIN_MAP:

-			return Allattributesofacapsuleclasshaveexactlyonetype((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		case UMLRealTimePackage.CAPSULE___PRIVATEVISIBILITYISNOTSUPPORTEDONCAPSULEFEATURES__DIAGNOSTICCHAIN_MAP:

-			return Privatevisibilityisnotsupportedoncapsulefeatures((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		case UMLRealTimePackage.CAPSULE___ACAPSULECLASSCANNOTHAVENESTEDCLASSIFIERS__DIAGNOSTICCHAIN_MAP:

-			return Acapsuleclasscannothavenestedclassifiers((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		case UMLRealTimePackage.CAPSULE___ALLOPERATIONSOFACAPSULEARESEQUENTIAL__DIAGNOSTICCHAIN_MAP:

-			return Alloperationsofacapsulearesequential((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-

 } // CapsuleImpl

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/CapsulePartImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/CapsulePartImpl.java
index 94613c403c6..2fe216df3f3 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/CapsulePartImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/CapsulePartImpl.java
@@ -9,16 +9,12 @@
 package org.eclipse.papyrus.umlrt.UMLRealTime.impl;

 

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

 import org.eclipse.papyrus.umlrt.UMLRealTime.CapsulePart;

 import org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage;

-

 import org.eclipse.uml2.uml.Property;

 

 /**

@@ -39,7 +35,7 @@ public class CapsulePartImpl extends MinimalEObjectImpl.Container implements Cap
 	 * The cached value of the '{@link #getBase_Property() <em>Base Property</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Property()

 	 * @generated

 	 * @ordered

@@ -49,7 +45,7 @@ public class CapsulePartImpl extends MinimalEObjectImpl.Container implements Cap
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected CapsulePartImpl() {

@@ -59,7 +55,7 @@ public class CapsulePartImpl extends MinimalEObjectImpl.Container implements Cap
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -70,7 +66,7 @@ public class CapsulePartImpl extends MinimalEObjectImpl.Container implements Cap
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -90,7 +86,7 @@ public class CapsulePartImpl extends MinimalEObjectImpl.Container implements Cap
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Property basicGetBase_Property() {

@@ -100,7 +96,7 @@ public class CapsulePartImpl extends MinimalEObjectImpl.Container implements Cap
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -115,7 +111,7 @@ public class CapsulePartImpl extends MinimalEObjectImpl.Container implements Cap
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -133,7 +129,7 @@ public class CapsulePartImpl extends MinimalEObjectImpl.Container implements Cap
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -149,7 +145,7 @@ public class CapsulePartImpl extends MinimalEObjectImpl.Container implements Cap
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -165,7 +161,7 @@ public class CapsulePartImpl extends MinimalEObjectImpl.Container implements Cap
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/ProtocolContainerImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/ProtocolContainerImpl.java
index 5b7d1f59958..205825cabf1 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/ProtocolContainerImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/ProtocolContainerImpl.java
@@ -9,13 +9,10 @@
 package org.eclipse.papyrus.umlrt.UMLRealTime.impl;

 

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

 import org.eclipse.papyrus.umlrt.UMLRealTime.ProtocolContainer;

 import org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage;

 

@@ -37,7 +34,7 @@ public class ProtocolContainerImpl extends MinimalEObjectImpl.Container implemen
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Package()

 	 * @generated

 	 * @ordered

@@ -47,7 +44,7 @@ public class ProtocolContainerImpl extends MinimalEObjectImpl.Container implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ProtocolContainerImpl() {

@@ -57,7 +54,7 @@ public class ProtocolContainerImpl extends MinimalEObjectImpl.Container implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -68,7 +65,7 @@ public class ProtocolContainerImpl extends MinimalEObjectImpl.Container implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -88,7 +85,7 @@ public class ProtocolContainerImpl extends MinimalEObjectImpl.Container implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {

@@ -98,7 +95,7 @@ public class ProtocolContainerImpl extends MinimalEObjectImpl.Container implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -113,7 +110,7 @@ public class ProtocolContainerImpl extends MinimalEObjectImpl.Container implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -131,7 +128,7 @@ public class ProtocolContainerImpl extends MinimalEObjectImpl.Container implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -147,7 +144,7 @@ public class ProtocolContainerImpl extends MinimalEObjectImpl.Container implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -163,7 +160,7 @@ public class ProtocolContainerImpl extends MinimalEObjectImpl.Container implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/ProtocolImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/ProtocolImpl.java
index 81392a1811d..3a274ff71d5 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/ProtocolImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/ProtocolImpl.java
@@ -8,32 +8,13 @@
  */

 package org.eclipse.papyrus.umlrt.UMLRealTime.impl;

 

-import java.lang.reflect.InvocationTargetException;

-

-import java.util.Map;

-

 import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.EList;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-

-import org.eclipse.emf.ecore.util.EObjectValidator;

-

 import org.eclipse.papyrus.umlrt.UMLRealTime.Protocol;

 import org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage;

-

-import org.eclipse.papyrus.umlrt.UMLRealTime.util.UMLRealTimeValidator;

-

 import org.eclipse.uml2.uml.Collaboration;

 

 /**

@@ -54,7 +35,7 @@ public class ProtocolImpl extends MinimalEObjectImpl.Container implements Protoc
 	 * The cached value of the '{@link #getBase_Collaboration() <em>Base Collaboration</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Collaboration()

 	 * @generated

 	 * @ordered

@@ -64,7 +45,7 @@ public class ProtocolImpl extends MinimalEObjectImpl.Container implements Protoc
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected ProtocolImpl() {

@@ -74,7 +55,7 @@ public class ProtocolImpl extends MinimalEObjectImpl.Container implements Protoc
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -85,7 +66,7 @@ public class ProtocolImpl extends MinimalEObjectImpl.Container implements Protoc
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -105,7 +86,7 @@ public class ProtocolImpl extends MinimalEObjectImpl.Container implements Protoc
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Collaboration basicGetBase_Collaboration() {

@@ -115,7 +96,7 @@ public class ProtocolImpl extends MinimalEObjectImpl.Container implements Protoc
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -130,34 +111,7 @@ public class ProtocolImpl extends MinimalEObjectImpl.Container implements Protoc
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean Protocolscanhaveatmostonegeneralization(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeValidator.PROTOCOL__PROTOCOLSCANHAVEATMOSTONEGENERALIZATION,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "Protocolscanhaveatmostonegeneralization", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -175,7 +129,7 @@ public class ProtocolImpl extends MinimalEObjectImpl.Container implements Protoc
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -191,7 +145,7 @@ public class ProtocolImpl extends MinimalEObjectImpl.Container implements Protoc
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -207,7 +161,7 @@ public class ProtocolImpl extends MinimalEObjectImpl.Container implements Protoc
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -219,20 +173,4 @@ public class ProtocolImpl extends MinimalEObjectImpl.Container implements Protoc
 		return super.eIsSet(featureID);

 	}

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	@SuppressWarnings("unchecked")

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-		case UMLRealTimePackage.PROTOCOL___PROTOCOLSCANHAVEATMOSTONEGENERALIZATION__DIAGNOSTICCHAIN_MAP:

-			return Protocolscanhaveatmostonegeneralization((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-

 } // ProtocolImpl

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTConnectorImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTConnectorImpl.java
index 60a73dcdf98..dc1ec5111b6 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTConnectorImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTConnectorImpl.java
@@ -8,32 +8,13 @@
  */

 package org.eclipse.papyrus.umlrt.UMLRealTime.impl;

 

-import java.lang.reflect.InvocationTargetException;

-

-import java.util.Map;

-

 import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.EList;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-

-import org.eclipse.emf.ecore.util.EObjectValidator;

-

 import org.eclipse.papyrus.umlrt.UMLRealTime.RTConnector;

 import org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage;

-

-import org.eclipse.papyrus.umlrt.UMLRealTime.util.UMLRealTimeValidator;

-

 import org.eclipse.uml2.uml.Connector;

 

 /**

@@ -54,7 +35,7 @@ public class RTConnectorImpl extends MinimalEObjectImpl.Container implements RTC
 	 * The cached value of the '{@link #getBase_Connector() <em>Base Connector</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Connector()

 	 * @generated

 	 * @ordered

@@ -64,7 +45,7 @@ public class RTConnectorImpl extends MinimalEObjectImpl.Container implements RTC
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected RTConnectorImpl() {

@@ -74,7 +55,7 @@ public class RTConnectorImpl extends MinimalEObjectImpl.Container implements RTC
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -85,7 +66,7 @@ public class RTConnectorImpl extends MinimalEObjectImpl.Container implements RTC
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -105,7 +86,7 @@ public class RTConnectorImpl extends MinimalEObjectImpl.Container implements RTC
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Connector basicGetBase_Connector() {

@@ -115,7 +96,7 @@ public class RTConnectorImpl extends MinimalEObjectImpl.Container implements RTC
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -130,34 +111,7 @@ public class RTConnectorImpl extends MinimalEObjectImpl.Container implements RTC
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean Onlybinaryconnectorsareallowed(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeValidator.RT_CONNECTOR__ONLYBINARYCONNECTORSAREALLOWED,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "Onlybinaryconnectorsareallowed", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -175,7 +129,7 @@ public class RTConnectorImpl extends MinimalEObjectImpl.Container implements RTC
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -191,7 +145,7 @@ public class RTConnectorImpl extends MinimalEObjectImpl.Container implements RTC
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -207,7 +161,7 @@ public class RTConnectorImpl extends MinimalEObjectImpl.Container implements RTC
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -219,20 +173,4 @@ public class RTConnectorImpl extends MinimalEObjectImpl.Container implements RTC
 		return super.eIsSet(featureID);

 	}

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	@SuppressWarnings("unchecked")

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-		case UMLRealTimePackage.RT_CONNECTOR___ONLYBINARYCONNECTORSAREALLOWED__DIAGNOSTICCHAIN_MAP:

-			return Onlybinaryconnectorsareallowed((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-

 } // RTConnectorImpl

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTMessageSetImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTMessageSetImpl.java
index 54da5f7d83c..d2fcf2d3074 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTMessageSetImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTMessageSetImpl.java
@@ -9,17 +9,13 @@
 package org.eclipse.papyrus.umlrt.UMLRealTime.impl;

 

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

 import org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageKind;

 import org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageSet;

 import org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage;

-

 import org.eclipse.uml2.uml.Interface;

 

 /**

@@ -41,7 +37,7 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
 	 * The cached value of the '{@link #getBase_Interface() <em>Base Interface</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Interface()

 	 * @generated

 	 * @ordered

@@ -52,7 +48,7 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
 	 * The default value of the '{@link #getRtMsgKind() <em>Rt Msg Kind</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getRtMsgKind()

 	 * @generated

 	 * @ordered

@@ -63,7 +59,7 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
 	 * The cached value of the '{@link #getRtMsgKind() <em>Rt Msg Kind</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getRtMsgKind()

 	 * @generated

 	 * @ordered

@@ -73,7 +69,7 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected RTMessageSetImpl() {

@@ -83,7 +79,7 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -94,7 +90,7 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -114,7 +110,7 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Interface basicGetBase_Interface() {

@@ -124,7 +120,7 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -139,7 +135,7 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -150,7 +146,7 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -165,7 +161,7 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -185,7 +181,7 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -204,7 +200,7 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -223,7 +219,7 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -240,7 +236,7 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTPortImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTPortImpl.java
index db56d7b3270..2127eaa25a2 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTPortImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTPortImpl.java
@@ -8,33 +8,14 @@
  */

 package org.eclipse.papyrus.umlrt.UMLRealTime.impl;

 

-import java.lang.reflect.InvocationTargetException;

-

-import java.util.Map;

-

 import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.EList;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-

-import org.eclipse.emf.ecore.util.EObjectValidator;

-

 import org.eclipse.papyrus.umlrt.UMLRealTime.PortRegistrationType;

 import org.eclipse.papyrus.umlrt.UMLRealTime.RTPort;

 import org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage;

-

-import org.eclipse.papyrus.umlrt.UMLRealTime.util.UMLRealTimeValidator;

-

 import org.eclipse.uml2.uml.Port;

 

 /**

@@ -60,7 +41,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	 * The default value of the '{@link #isNotification() <em>Is Notification</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #isNotification()

 	 * @generated

 	 * @ordered

@@ -71,7 +52,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	 * The cached value of the '{@link #isNotification() <em>Is Notification</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #isNotification()

 	 * @generated

 	 * @ordered

@@ -82,7 +63,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	 * The default value of the '{@link #isPublish() <em>Is Publish</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #isPublish()

 	 * @generated

 	 * @ordered

@@ -93,7 +74,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	 * The cached value of the '{@link #isPublish() <em>Is Publish</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #isPublish()

 	 * @generated

 	 * @ordered

@@ -104,7 +85,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	 * The default value of the '{@link #isWired() <em>Is Wired</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #isWired()

 	 * @generated

 	 * @ordered

@@ -115,7 +96,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	 * The cached value of the '{@link #isWired() <em>Is Wired</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #isWired()

 	 * @generated

 	 * @ordered

@@ -126,7 +107,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	 * The default value of the '{@link #getRegistration() <em>Registration</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getRegistration()

 	 * @generated

 	 * @ordered

@@ -137,7 +118,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	 * The cached value of the '{@link #getRegistration() <em>Registration</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getRegistration()

 	 * @generated

 	 * @ordered

@@ -148,7 +129,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	 * The default value of the '{@link #getRegistrationOverride() <em>Registration Override</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getRegistrationOverride()

 	 * @generated

 	 * @ordered

@@ -159,7 +140,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	 * The cached value of the '{@link #getRegistrationOverride() <em>Registration Override</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getRegistrationOverride()

 	 * @generated

 	 * @ordered

@@ -170,7 +151,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	 * The cached value of the '{@link #getBase_Port() <em>Base Port</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Port()

 	 * @generated

 	 * @ordered

@@ -180,7 +161,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected RTPortImpl() {

@@ -190,7 +171,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -201,7 +182,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -212,7 +193,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -227,7 +208,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -238,7 +219,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -253,7 +234,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -264,7 +245,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -279,7 +260,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -290,7 +271,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -305,7 +286,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -316,7 +297,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -331,7 +312,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -351,7 +332,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Port basicGetBase_Port() {

@@ -361,7 +342,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -376,115 +357,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean Awiredportcannotpublishitsname(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeValidator.RT_PORT__AWIREDPORTCANNOTPUBLISHITSNAME,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "Awiredportcannotpublishitsname", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean Apublicportmustbedefinedasaserviceport(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeValidator.RT_PORT__APUBLICPORTMUSTBEDEFINEDASASERVICEPORT,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "Apublicportmustbedefinedasaserviceport", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean ASAPunwiredunpublishedmusthaveprotectedvisibility(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeValidator.RT_PORT__ASA_PUNWIREDUNPUBLISHEDMUSTHAVEPROTECTEDVISIBILITY,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "ASAPunwiredunpublishedmusthaveprotectedvisibility", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean AnSPPunwiredandpublishedmusthavepublicvisibility(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeValidator.RT_PORT__AN_SP_PUNWIREDANDPUBLISHEDMUSTHAVEPUBLICVISIBILITY,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "AnSPPunwiredandpublishedmusthavepublicvisibility", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -512,7 +385,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -543,7 +416,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -574,7 +447,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -599,29 +472,7 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	@SuppressWarnings("unchecked")

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-		case UMLRealTimePackage.RT_PORT___AWIREDPORTCANNOTPUBLISHITSNAME__DIAGNOSTICCHAIN_MAP:

-			return Awiredportcannotpublishitsname((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		case UMLRealTimePackage.RT_PORT___APUBLICPORTMUSTBEDEFINEDASASERVICEPORT__DIAGNOSTICCHAIN_MAP:

-			return Apublicportmustbedefinedasaserviceport((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		case UMLRealTimePackage.RT_PORT___ASA_PUNWIREDUNPUBLISHEDMUSTHAVEPROTECTEDVISIBILITY__DIAGNOSTICCHAIN_MAP:

-			return ASAPunwiredunpublishedmusthaveprotectedvisibility((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		case UMLRealTimePackage.RT_PORT___AN_SP_PUNWIREDANDPUBLISHEDMUSTHAVEPUBLICVISIBILITY__DIAGNOSTICCHAIN_MAP:

-			return AnSPPunwiredandpublishedmusthavepublicvisibility((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTRExcludedElementImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTRExcludedElementImpl.java
index 56a33c5d465..12d3979e709 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTRExcludedElementImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTRExcludedElementImpl.java
@@ -8,32 +8,13 @@
  */

 package org.eclipse.papyrus.umlrt.UMLRealTime.impl;

 

-import java.lang.reflect.InvocationTargetException;

-

-import java.util.Map;

-

 import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.EList;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-

-import org.eclipse.emf.ecore.util.EObjectValidator;

-

 import org.eclipse.papyrus.umlrt.UMLRealTime.RTRExcludedElement;

 import org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage;

-

-import org.eclipse.papyrus.umlrt.UMLRealTime.util.UMLRealTimeValidator;

-

 import org.eclipse.uml2.uml.RedefinableElement;

 

 /**

@@ -54,7 +35,7 @@ public class RTRExcludedElementImpl extends MinimalEObjectImpl.Container impleme
 	 * The cached value of the '{@link #getBase_RedefinableElement() <em>Base Redefinable Element</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_RedefinableElement()

 	 * @generated

 	 * @ordered

@@ -64,7 +45,7 @@ public class RTRExcludedElementImpl extends MinimalEObjectImpl.Container impleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected RTRExcludedElementImpl() {

@@ -74,7 +55,7 @@ public class RTRExcludedElementImpl extends MinimalEObjectImpl.Container impleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -85,7 +66,7 @@ public class RTRExcludedElementImpl extends MinimalEObjectImpl.Container impleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -105,7 +86,7 @@ public class RTRExcludedElementImpl extends MinimalEObjectImpl.Container impleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public RedefinableElement basicGetBase_RedefinableElement() {

@@ -115,7 +96,7 @@ public class RTRExcludedElementImpl extends MinimalEObjectImpl.Container impleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -130,34 +111,7 @@ public class RTRExcludedElementImpl extends MinimalEObjectImpl.Container impleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean ExclusioncanonlybeappliedtosomeUMLRTmodelelements(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeValidator.RTR_EXCLUDED_ELEMENT__EXCLUSIONCANONLYBEAPPLIEDTOSOME_UMLR_TMODELELEMENTS,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "ExclusioncanonlybeappliedtosomeUMLRTmodelelements", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -175,7 +129,7 @@ public class RTRExcludedElementImpl extends MinimalEObjectImpl.Container impleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -191,7 +145,7 @@ public class RTRExcludedElementImpl extends MinimalEObjectImpl.Container impleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -207,7 +161,7 @@ public class RTRExcludedElementImpl extends MinimalEObjectImpl.Container impleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -219,20 +173,4 @@ public class RTRExcludedElementImpl extends MinimalEObjectImpl.Container impleme
 		return super.eIsSet(featureID);

 	}

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	@SuppressWarnings("unchecked")

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-		case UMLRealTimePackage.RTR_EXCLUDED_ELEMENT___EXCLUSIONCANONLYBEAPPLIEDTOSOME_UMLR_TMODELELEMENTS__DIAGNOSTICCHAIN_MAP:

-			return ExclusioncanonlybeappliedtosomeUMLRTmodelelements((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-

 } // RTRExcludedElementImpl

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/UMLRealTimeFactoryImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/UMLRealTimeFactoryImpl.java
index 1ce00ebd568..9252a89b263 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/UMLRealTimeFactoryImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/UMLRealTimeFactoryImpl.java
@@ -12,18 +12,26 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

-

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

-

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

-

-import org.eclipse.papyrus.umlrt.UMLRealTime.*;

+import org.eclipse.papyrus.umlrt.UMLRealTime.Capsule;

+import org.eclipse.papyrus.umlrt.UMLRealTime.CapsulePart;

+import org.eclipse.papyrus.umlrt.UMLRealTime.PortRegistrationType;

+import org.eclipse.papyrus.umlrt.UMLRealTime.Protocol;

+import org.eclipse.papyrus.umlrt.UMLRealTime.ProtocolContainer;

+import org.eclipse.papyrus.umlrt.UMLRealTime.RTConnector;

+import org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageKind;

+import org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageSet;

+import org.eclipse.papyrus.umlrt.UMLRealTime.RTPort;

+import org.eclipse.papyrus.umlrt.UMLRealTime.RTRExcludedElement;

+import org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimeFactory;

+import org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage;

 

 /**

  * <!-- begin-user-doc -->

  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeFactory {

@@ -31,7 +39,7 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static UMLRealTimeFactory init() {

@@ -50,7 +58,7 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public UMLRealTimeFactoryImpl() {

@@ -60,7 +68,7 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -90,7 +98,7 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -108,7 +116,7 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -126,7 +134,7 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -138,7 +146,7 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -150,7 +158,7 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -162,7 +170,7 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -174,7 +182,7 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -186,7 +194,7 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -198,7 +206,7 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -210,7 +218,7 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -222,13 +230,13 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public PortRegistrationType createPortRegistrationTypeFromString(EDataType eDataType, String initialValue) {

 		PortRegistrationType result = PortRegistrationType.get(initialValue);

 		if (result == null)

-		{

+		 {

 			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

 		}

 		return result;

@@ -237,7 +245,7 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public String convertPortRegistrationTypeToString(EDataType eDataType, Object instanceValue) {

@@ -247,13 +255,13 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public RTMessageKind createRTMessageKindFromString(EDataType eDataType, String initialValue) {

 		RTMessageKind result = RTMessageKind.get(initialValue);

 		if (result == null)

-		{

+		 {

 			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

 		}

 		return result;

@@ -262,7 +270,7 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public String convertRTMessageKindToString(EDataType eDataType, Object instanceValue) {

@@ -272,7 +280,7 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -283,7 +291,7 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @deprecated

 	 * @generated

 	 */

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/UMLRealTimePackageImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/UMLRealTimePackageImpl.java
index f02f43184dc..2f454474f38 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/UMLRealTimePackageImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/UMLRealTimePackageImpl.java
@@ -11,14 +11,9 @@ package org.eclipse.papyrus.umlrt.UMLRealTime.impl;
 import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EGenericType;

-import org.eclipse.emf.ecore.EOperation;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EValidator;

-

 import org.eclipse.emf.ecore.impl.EPackageImpl;

-

 import org.eclipse.papyrus.umlrt.UMLRealTime.Capsule;

 import org.eclipse.papyrus.umlrt.UMLRealTime.CapsulePart;

 import org.eclipse.papyrus.umlrt.UMLRealTime.PortRegistrationType;

@@ -31,25 +26,21 @@ import org.eclipse.papyrus.umlrt.UMLRealTime.RTPort;
 import org.eclipse.papyrus.umlrt.UMLRealTime.RTRExcludedElement;

 import org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimeFactory;

 import org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage;

-

-import org.eclipse.papyrus.umlrt.UMLRealTime.util.UMLRealTimeValidator;

-

 import org.eclipse.uml2.types.TypesPackage;

-

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

  * <!-- begin-user-doc -->

  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimePackage {

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass capsuleEClass = null;

@@ -57,7 +48,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass capsulePartEClass = null;

@@ -65,7 +56,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass protocolEClass = null;

@@ -73,7 +64,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass rtPortEClass = null;

@@ -81,7 +72,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass rtConnectorEClass = null;

@@ -89,7 +80,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass protocolContainerEClass = null;

@@ -97,7 +88,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass rtrExcludedElementEClass = null;

@@ -105,7 +96,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass rtMessageSetEClass = null;

@@ -113,7 +104,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EEnum portRegistrationTypeEEnum = null;

@@ -121,7 +112,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EEnum rtMessageKindEEnum = null;

@@ -131,7 +122,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	 * package URI value.

 	 * <p>

 	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage#eNS_URI

 	 * @see #init()

@@ -144,7 +135,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

@@ -154,7 +145,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	 *

 	 * <p>

 	 * This method is used to initialize {@link UMLRealTimePackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

@@ -179,16 +170,6 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 		// Initialize created meta-data

 		theUMLRealTimePackage.initializePackageContents();

 

-		// Register package validator

-		EValidator.Registry.INSTANCE.put

-				(theUMLRealTimePackage,

-						new EValidator.Descriptor() {

-							@Override

-							public EValidator getEValidator() {

-								return UMLRealTimeValidator.INSTANCE;

-							}

-						});

-

 		// Mark meta-data to indicate it can't be changed

 		theUMLRealTimePackage.freeze();

 

@@ -201,7 +182,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -212,7 +193,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -223,106 +204,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getCapsule__Capsulesarealwaysactive__DiagnosticChain_Map() {

-		return capsuleEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getCapsule__AcapsulecannothaveReceptionfeatures__DiagnosticChain_Map() {

-		return capsuleEClass.getEOperations().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getCapsule__Acapsuleclasscanalwaysbesubclassed__DiagnosticChain_Map() {

-		return capsuleEClass.getEOperations().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getCapsule__Acapsulecanhaveatmostonesuperclass__DiagnosticChain_Map() {

-		return capsuleEClass.getEOperations().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getCapsule__Capsuleclassesarealwayssubstitutable__DiagnosticChain_Map() {

-		return capsuleEClass.getEOperations().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getCapsule__Allattributesofacapsuleclasshaveexactlyonetype__DiagnosticChain_Map() {

-		return capsuleEClass.getEOperations().get(5);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getCapsule__Privatevisibilityisnotsupportedoncapsulefeatures__DiagnosticChain_Map() {

-		return capsuleEClass.getEOperations().get(6);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getCapsule__Acapsuleclasscannothavenestedclassifiers__DiagnosticChain_Map() {

-		return capsuleEClass.getEOperations().get(7);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getCapsule__Alloperationsofacapsulearesequential__DiagnosticChain_Map() {

-		return capsuleEClass.getEOperations().get(8);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -333,7 +215,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -344,7 +226,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -355,7 +237,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -366,18 +248,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getProtocol__Protocolscanhaveatmostonegeneralization__DiagnosticChain_Map() {

-		return protocolEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -388,7 +259,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -399,7 +270,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -410,7 +281,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -421,7 +292,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -432,7 +303,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -443,7 +314,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -454,51 +325,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getRTPort__Awiredportcannotpublishitsname__DiagnosticChain_Map() {

-		return rtPortEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getRTPort__Apublicportmustbedefinedasaserviceport__DiagnosticChain_Map() {

-		return rtPortEClass.getEOperations().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getRTPort__ASAPunwiredunpublishedmusthaveprotectedvisibility__DiagnosticChain_Map() {

-		return rtPortEClass.getEOperations().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getRTPort__AnSPPunwiredandpublishedmusthavepublicvisibility__DiagnosticChain_Map() {

-		return rtPortEClass.getEOperations().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -509,7 +336,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -520,18 +347,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getRTConnector__Onlybinaryconnectorsareallowed__DiagnosticChain_Map() {

-		return rtConnectorEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -542,7 +358,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -553,7 +369,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -564,7 +380,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -575,18 +391,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getRTRExcludedElement__ExclusioncanonlybeappliedtosomeUMLRTmodelelements__DiagnosticChain_Map() {

-		return rtrExcludedElementEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -597,7 +402,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -608,7 +413,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -619,7 +424,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -630,7 +435,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -641,7 +446,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -652,7 +457,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

@@ -662,7 +467,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

@@ -674,22 +479,12 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 		// Create classes and their features

 		capsuleEClass = createEClass(CAPSULE);

 		createEReference(capsuleEClass, CAPSULE__BASE_CLASS);

-		createEOperation(capsuleEClass, CAPSULE___CAPSULESAREALWAYSACTIVE__DIAGNOSTICCHAIN_MAP);

-		createEOperation(capsuleEClass, CAPSULE___ACAPSULECANNOTHAVE_RECEPTIONFEATURES__DIAGNOSTICCHAIN_MAP);

-		createEOperation(capsuleEClass, CAPSULE___ACAPSULECLASSCANALWAYSBESUBCLASSED__DIAGNOSTICCHAIN_MAP);

-		createEOperation(capsuleEClass, CAPSULE___ACAPSULECANHAVEATMOSTONESUPERCLASS__DIAGNOSTICCHAIN_MAP);

-		createEOperation(capsuleEClass, CAPSULE___CAPSULECLASSESAREALWAYSSUBSTITUTABLE__DIAGNOSTICCHAIN_MAP);

-		createEOperation(capsuleEClass, CAPSULE___ALLATTRIBUTESOFACAPSULECLASSHAVEEXACTLYONETYPE__DIAGNOSTICCHAIN_MAP);

-		createEOperation(capsuleEClass, CAPSULE___PRIVATEVISIBILITYISNOTSUPPORTEDONCAPSULEFEATURES__DIAGNOSTICCHAIN_MAP);

-		createEOperation(capsuleEClass, CAPSULE___ACAPSULECLASSCANNOTHAVENESTEDCLASSIFIERS__DIAGNOSTICCHAIN_MAP);

-		createEOperation(capsuleEClass, CAPSULE___ALLOPERATIONSOFACAPSULEARESEQUENTIAL__DIAGNOSTICCHAIN_MAP);

 

 		capsulePartEClass = createEClass(CAPSULE_PART);

 		createEReference(capsulePartEClass, CAPSULE_PART__BASE_PROPERTY);

 

 		protocolEClass = createEClass(PROTOCOL);

 		createEReference(protocolEClass, PROTOCOL__BASE_COLLABORATION);

-		createEOperation(protocolEClass, PROTOCOL___PROTOCOLSCANHAVEATMOSTONEGENERALIZATION__DIAGNOSTICCHAIN_MAP);

 

 		rtPortEClass = createEClass(RT_PORT);

 		createEAttribute(rtPortEClass, RT_PORT__IS_NOTIFICATION);

@@ -698,21 +493,15 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 		createEAttribute(rtPortEClass, RT_PORT__REGISTRATION);

 		createEAttribute(rtPortEClass, RT_PORT__REGISTRATION_OVERRIDE);

 		createEReference(rtPortEClass, RT_PORT__BASE_PORT);

-		createEOperation(rtPortEClass, RT_PORT___AWIREDPORTCANNOTPUBLISHITSNAME__DIAGNOSTICCHAIN_MAP);

-		createEOperation(rtPortEClass, RT_PORT___APUBLICPORTMUSTBEDEFINEDASASERVICEPORT__DIAGNOSTICCHAIN_MAP);

-		createEOperation(rtPortEClass, RT_PORT___ASA_PUNWIREDUNPUBLISHEDMUSTHAVEPROTECTEDVISIBILITY__DIAGNOSTICCHAIN_MAP);

-		createEOperation(rtPortEClass, RT_PORT___AN_SP_PUNWIREDANDPUBLISHEDMUSTHAVEPUBLICVISIBILITY__DIAGNOSTICCHAIN_MAP);

 

 		rtConnectorEClass = createEClass(RT_CONNECTOR);

 		createEReference(rtConnectorEClass, RT_CONNECTOR__BASE_CONNECTOR);

-		createEOperation(rtConnectorEClass, RT_CONNECTOR___ONLYBINARYCONNECTORSAREALLOWED__DIAGNOSTICCHAIN_MAP);

 

 		protocolContainerEClass = createEClass(PROTOCOL_CONTAINER);

 		createEReference(protocolContainerEClass, PROTOCOL_CONTAINER__BASE_PACKAGE);

 

 		rtrExcludedElementEClass = createEClass(RTR_EXCLUDED_ELEMENT);

 		createEReference(rtrExcludedElementEClass, RTR_EXCLUDED_ELEMENT__BASE_REDEFINABLE_ELEMENT);

-		createEOperation(rtrExcludedElementEClass, RTR_EXCLUDED_ELEMENT___EXCLUSIONCANONLYBEAPPLIEDTOSOME_UMLR_TMODELELEMENTS__DIAGNOSTICCHAIN_MAP);

 

 		rtMessageSetEClass = createEClass(RT_MESSAGE_SET);

 		createEReference(rtMessageSetEClass, RT_MESSAGE_SET__BASE_INTERFACE);

@@ -726,7 +515,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

@@ -736,7 +525,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

@@ -764,87 +553,6 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 		initEClass(capsuleEClass, Capsule.class, "Capsule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getCapsule_Base_Class(), theUMLPackage.getClass_(), null, "base_Class", null, 1, 1, Capsule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$

 

-		EOperation op = initEOperation(getCapsule__Capsulesarealwaysactive__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "Capsulesarealwaysactive", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		EGenericType g1 = createEGenericType(ecorePackage.getEMap());

-		EGenericType g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getCapsule__AcapsulecannothaveReceptionfeatures__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "AcapsulecannothaveReceptionfeatures", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getCapsule__Acapsuleclasscanalwaysbesubclassed__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "Acapsuleclasscanalwaysbesubclassed", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getCapsule__Acapsulecanhaveatmostonesuperclass__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "Acapsulecanhaveatmostonesuperclass", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getCapsule__Capsuleclassesarealwayssubstitutable__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "Capsuleclassesarealwayssubstitutable", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getCapsule__Allattributesofacapsuleclasshaveexactlyonetype__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "Allattributesofacapsuleclasshaveexactlyonetype", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getCapsule__Privatevisibilityisnotsupportedoncapsulefeatures__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "Privatevisibilityisnotsupportedoncapsulefeatures", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getCapsule__Acapsuleclasscannothavenestedclassifiers__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "Acapsuleclasscannothavenestedclassifiers", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getCapsule__Alloperationsofacapsulearesequential__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "Alloperationsofacapsulearesequential", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

 		initEClass(capsulePartEClass, CapsulePart.class, "CapsulePart", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getCapsulePart_Base_Property(), theUMLPackage.getProperty(), null,

 				"base_Property", null, 1, 1, CapsulePart.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$

@@ -853,15 +561,6 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 		initEReference(getProtocol_Base_Collaboration(), theUMLPackage.getCollaboration(), null,

 				"base_Collaboration", null, 1, 1, Protocol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$

 

-		op = initEOperation(getProtocol__Protocolscanhaveatmostonegeneralization__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "Protocolscanhaveatmostonegeneralization", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

 		initEClass(rtPortEClass, RTPort.class, "RTPort", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getRTPort_IsNotification(), theTypesPackage.getBoolean(), "isNotification", "false", 1, 1, RTPort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

 		initEAttribute(getRTPort_IsPublish(), theTypesPackage.getBoolean(), "isPublish", "false", 1, 1, RTPort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

@@ -870,55 +569,10 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 		initEAttribute(getRTPort_RegistrationOverride(), theTypesPackage.getString(), "registrationOverride", "", 1, 1, RTPort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

 		initEReference(getRTPort_Base_Port(), theUMLPackage.getPort(), null, "base_Port", null, 1, 1, RTPort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$

 

-		op = initEOperation(getRTPort__Awiredportcannotpublishitsname__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "Awiredportcannotpublishitsname", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getRTPort__Apublicportmustbedefinedasaserviceport__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "Apublicportmustbedefinedasaserviceport", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getRTPort__ASAPunwiredunpublishedmusthaveprotectedvisibility__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "ASAPunwiredunpublishedmusthaveprotectedvisibility", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getRTPort__AnSPPunwiredandpublishedmusthavepublicvisibility__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "AnSPPunwiredandpublishedmusthavepublicvisibility", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

 		initEClass(rtConnectorEClass, RTConnector.class, "RTConnector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getRTConnector_Base_Connector(), theUMLPackage.getConnector(), null,

 				"base_Connector", null, 1, 1, RTConnector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$

 

-		op = initEOperation(getRTConnector__Onlybinaryconnectorsareallowed__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "Onlybinaryconnectorsareallowed", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

 		initEClass(protocolContainerEClass, ProtocolContainer.class, "ProtocolContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getProtocolContainer_Base_Package(), theUMLPackage.getPackage(), null,

 				"base_Package", null, 1, 1, ProtocolContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$

@@ -927,19 +581,10 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 		initEReference(getRTRExcludedElement_Base_RedefinableElement(), theUMLPackage.getRedefinableElement(), null,

 				"base_RedefinableElement", null, 1, 1, RTRExcludedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$

 

-		op = initEOperation(getRTRExcludedElement__ExclusioncanonlybeappliedtosomeUMLRTmodelelements__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "ExclusioncanonlybeappliedtosomeUMLRTmodelelements", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

 		initEClass(rtMessageSetEClass, RTMessageSet.class, "RTMessageSet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getRTMessageSet_Base_Interface(), theUMLPackage.getInterface(), null,

 				"base_Interface", null, 1, 1, RTMessageSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getRTMessageSet_RtMsgKind(), this.getRTMessageKind(), "rtMsgKind", "true", 1, 1, RTMessageSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

+		initEAttribute(getRTMessageSet_RtMsgKind(), this.getRTMessageKind(), "rtMsgKind", "in", 1, 1, RTMessageSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

 

 		// Initialize enums and add enum literals

 		initEEnum(portRegistrationTypeEEnum, PortRegistrationType.class, "PortRegistrationType"); //$NON-NLS-1$

@@ -954,85 +599,6 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
 

 		// Create resource

 		createResource(eNS_URI);

-

-		// Create annotations

-		// http://www.eclipse.org/uml2/2.0.0/UML

-		createUMLAnnotations();

-	}

-

-	/**

-	 * Initializes the annotations for <b>http://www.eclipse.org/uml2/2.0.0/UML</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void createUMLAnnotations() {

-		String source = "http://www.eclipse.org/uml2/2.0.0/UML"; //$NON-NLS-1$

-		addAnnotation(getCapsule__Capsulesarealwaysactive__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "Capsules are always active" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getCapsule__AcapsulecannothaveReceptionfeatures__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "A capsule cannot have Reception features" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getCapsule__Acapsuleclasscanalwaysbesubclassed__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "A capsule class can always be subclassed" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getCapsule__Acapsulecanhaveatmostonesuperclass__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "A capsule can have at most one superclass" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getCapsule__Capsuleclassesarealwayssubstitutable__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "Capsule classes are always substitutable" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getCapsule__Allattributesofacapsuleclasshaveexactlyonetype__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "All attributes of a capsule class have exactly one type" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getCapsule__Privatevisibilityisnotsupportedoncapsulefeatures__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "Private visibility is not supported on capsule features" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getCapsule__Acapsuleclasscannothavenestedclassifiers__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "A capsule class cannot have nested classifiers" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getCapsule__Alloperationsofacapsulearesequential__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "All operations of a capsule are sequential" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getProtocol__Protocolscanhaveatmostonegeneralization__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "Protocols can have at most one generalization" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getRTPort__Awiredportcannotpublishitsname__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "A wired port cannot publish its name" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getRTPort__Apublicportmustbedefinedasaserviceport__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "A public port must be defined as a service port" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getRTPort__ASAPunwiredunpublishedmusthaveprotectedvisibility__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "A SAP (unwired & unpublished) must have protected visibility " //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getRTPort__AnSPPunwiredandpublishedmusthavepublicvisibility__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "An SPP (unwired and published) must have public visibility" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getRTConnector__Onlybinaryconnectorsareallowed__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "Only binary connectors are allowed" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getRTRExcludedElement__ExclusioncanonlybeappliedtosomeUMLRTmodelelements__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "Exclusion can only be applied to some UML-RT model elements" //$NON-NLS-1$ //$NON-NLS-2$

-				});

 	}

 

 } // UMLRealTimePackageImpl

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeAdapterFactory.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeAdapterFactory.java
index 7c69ff99d43..132c361028e 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeAdapterFactory.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeAdapterFactory.java
@@ -10,19 +10,24 @@ package org.eclipse.papyrus.umlrt.UMLRealTime.util;
 

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notifier;

-

 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-

 import org.eclipse.emf.ecore.EObject;

-

-import org.eclipse.papyrus.umlrt.UMLRealTime.*;

+import org.eclipse.papyrus.umlrt.UMLRealTime.Capsule;

+import org.eclipse.papyrus.umlrt.UMLRealTime.CapsulePart;

+import org.eclipse.papyrus.umlrt.UMLRealTime.Protocol;

+import org.eclipse.papyrus.umlrt.UMLRealTime.ProtocolContainer;

+import org.eclipse.papyrus.umlrt.UMLRealTime.RTConnector;

+import org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageSet;

+import org.eclipse.papyrus.umlrt.UMLRealTime.RTPort;

+import org.eclipse.papyrus.umlrt.UMLRealTime.RTRExcludedElement;

+import org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage;

 

 /**

  * <!-- begin-user-doc -->

  * The <b>Adapter Factory</b> for the model.

  * It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage

  * @generated

  */

@@ -31,7 +36,7 @@ public class UMLRealTimeAdapterFactory extends AdapterFactoryImpl {
 	 * The cached model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected static UMLRealTimePackage modelPackage;

@@ -40,7 +45,7 @@ public class UMLRealTimeAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public UMLRealTimeAdapterFactory() {

@@ -54,7 +59,7 @@ public class UMLRealTimeAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

@@ -73,7 +78,7 @@ public class UMLRealTimeAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected UMLRealTimeSwitch<Adapter> modelSwitch =

@@ -128,7 +133,7 @@ public class UMLRealTimeAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param target

 	 *            the object to adapt.

 	 * @return the adapter for the <code>target</code>.

@@ -146,7 +151,7 @@ public class UMLRealTimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.Capsule

 	 * @generated

@@ -161,7 +166,7 @@ public class UMLRealTimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.CapsulePart

 	 * @generated

@@ -176,7 +181,7 @@ public class UMLRealTimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.Protocol

 	 * @generated

@@ -191,7 +196,7 @@ public class UMLRealTimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTPort

 	 * @generated

@@ -206,7 +211,7 @@ public class UMLRealTimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTConnector

 	 * @generated

@@ -221,7 +226,7 @@ public class UMLRealTimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.ProtocolContainer

 	 * @generated

@@ -236,7 +241,7 @@ public class UMLRealTimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTRExcludedElement

 	 * @generated

@@ -251,7 +256,7 @@ public class UMLRealTimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageSet

 	 * @generated

@@ -265,7 +270,7 @@ public class UMLRealTimeAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeResourceFactoryImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeResourceFactoryImpl.java
index 5493daa14d6..388de636e67 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeResourceFactoryImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeResourceFactoryImpl.java
@@ -9,18 +9,15 @@
 package org.eclipse.papyrus.umlrt.UMLRealTime.util;

 

 import org.eclipse.emf.common.util.URI;

-

 import org.eclipse.emf.ecore.resource.Resource;

-

 import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

-

 import org.eclipse.emf.ecore.xmi.XMLResource;

 

 /**

  * <!-- begin-user-doc -->

  * The <b>Resource Factory</b> associated with the package.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.umlrt.UMLRealTime.util.UMLRealTimeResourceImpl

  * @generated

  */

@@ -29,7 +26,7 @@ public class UMLRealTimeResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public UMLRealTimeResourceFactoryImpl() {

@@ -40,7 +37,7 @@ public class UMLRealTimeResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeResourceImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeResourceImpl.java
index 049c582631a..86b8c0f891e 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeResourceImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeResourceImpl.java
@@ -9,14 +9,13 @@
 package org.eclipse.papyrus.umlrt.UMLRealTime.util;

 

 import org.eclipse.emf.common.util.URI;

-

 import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

 

 /**

  * <!-- begin-user-doc -->

  * The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.umlrt.UMLRealTime.util.UMLRealTimeResourceFactoryImpl

  * @generated

  */

@@ -25,7 +24,7 @@ public class UMLRealTimeResourceImpl extends XMLResourceImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param uri

 	 *            the URI of the new resource.

 	 * @generated

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeSwitch.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeSwitch.java
index 9571c782dff..45d90a9d40c 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeSwitch.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeSwitch.java
@@ -10,10 +10,16 @@ package org.eclipse.papyrus.umlrt.UMLRealTime.util;
 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

-

 import org.eclipse.emf.ecore.util.Switch;

-

-import org.eclipse.papyrus.umlrt.UMLRealTime.*;

+import org.eclipse.papyrus.umlrt.UMLRealTime.Capsule;

+import org.eclipse.papyrus.umlrt.UMLRealTime.CapsulePart;

+import org.eclipse.papyrus.umlrt.UMLRealTime.Protocol;

+import org.eclipse.papyrus.umlrt.UMLRealTime.ProtocolContainer;

+import org.eclipse.papyrus.umlrt.UMLRealTime.RTConnector;

+import org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageSet;

+import org.eclipse.papyrus.umlrt.UMLRealTime.RTPort;

+import org.eclipse.papyrus.umlrt.UMLRealTime.RTRExcludedElement;

+import org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage;

 

 /**

  * <!-- begin-user-doc -->

@@ -24,7 +30,7 @@ import org.eclipse.papyrus.umlrt.UMLRealTime.*;
  * until a non-null result is returned,

  * which is the result of the switch.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage

  * @generated

  */

@@ -33,7 +39,7 @@ public class UMLRealTimeSwitch<T> extends Switch<T> {
 	 * The cached model package

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected static UMLRealTimePackage modelPackage;

@@ -42,7 +48,7 @@ public class UMLRealTimeSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public UMLRealTimeSwitch() {

@@ -55,7 +61,7 @@ public class UMLRealTimeSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @parameter ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

@@ -69,7 +75,7 @@ public class UMLRealTimeSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

@@ -151,7 +157,7 @@ public class UMLRealTimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

 	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Capsule</em>'.

@@ -168,7 +174,7 @@ public class UMLRealTimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

 	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Capsule Part</em>'.

@@ -185,7 +191,7 @@ public class UMLRealTimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

 	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Protocol</em>'.

@@ -202,7 +208,7 @@ public class UMLRealTimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

 	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>RT Port</em>'.

@@ -219,7 +225,7 @@ public class UMLRealTimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

 	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>RT Connector</em>'.

@@ -236,7 +242,7 @@ public class UMLRealTimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

 	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Protocol Container</em>'.

@@ -253,7 +259,7 @@ public class UMLRealTimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

 	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>RTR Excluded Element</em>'.

@@ -270,7 +276,7 @@ public class UMLRealTimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

 	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>RT Message Set</em>'.

@@ -287,7 +293,7 @@ public class UMLRealTimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch, but this is the last case anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

 	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeValidator.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeValidator.java
deleted file mode 100644
index b63cbb3ec2c..00000000000
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeValidator.java
+++ /dev/null
@@ -1,735 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- */

-package org.eclipse.papyrus.umlrt.UMLRealTime.util;

-

-import java.util.Map;

-

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.ResourceLocator;

-

-import org.eclipse.emf.ecore.EPackage;

-

-import org.eclipse.emf.ecore.util.EObjectValidator;

-

-import org.eclipse.papyrus.umlrt.UMLRealTime.*;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Validator</b> for the model.

- * <!-- end-user-doc -->

- * 

- * @see org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage

- * @generated

- */

-public class UMLRealTimeValidator extends EObjectValidator {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final UMLRealTimeValidator INSTANCE = new UMLRealTimeValidator();

-

-	/**

-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()

-	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()

-	 * @generated

-	 */

-	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.umlrt.UMLRealTime"; //$NON-NLS-1$

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Capsulesarealwaysactive' of 'Capsule'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int CAPSULE__CAPSULESAREALWAYSACTIVE = 1;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Acapsulecannothave Receptionfeatures' of 'Capsule'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int CAPSULE__ACAPSULECANNOTHAVE_RECEPTIONFEATURES = 2;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Acapsuleclasscanalwaysbesubclassed' of 'Capsule'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int CAPSULE__ACAPSULECLASSCANALWAYSBESUBCLASSED = 3;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Acapsulecanhaveatmostonesuperclass' of 'Capsule'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int CAPSULE__ACAPSULECANHAVEATMOSTONESUPERCLASS = 4;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Capsuleclassesarealwayssubstitutable' of 'Capsule'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int CAPSULE__CAPSULECLASSESAREALWAYSSUBSTITUTABLE = 5;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Allattributesofacapsuleclasshaveexactlyonetype' of 'Capsule'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int CAPSULE__ALLATTRIBUTESOFACAPSULECLASSHAVEEXACTLYONETYPE = 6;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Privatevisibilityisnotsupportedoncapsulefeatures' of 'Capsule'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int CAPSULE__PRIVATEVISIBILITYISNOTSUPPORTEDONCAPSULEFEATURES = 7;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Acapsuleclasscannothavenestedclassifiers' of 'Capsule'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int CAPSULE__ACAPSULECLASSCANNOTHAVENESTEDCLASSIFIERS = 8;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Alloperationsofacapsulearesequential' of 'Capsule'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int CAPSULE__ALLOPERATIONSOFACAPSULEARESEQUENTIAL = 9;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Protocolscanhaveatmostonegeneralization' of 'Protocol'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int PROTOCOL__PROTOCOLSCANHAVEATMOSTONEGENERALIZATION = 10;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Awiredportcannotpublishitsname' of 'RT Port'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int RT_PORT__AWIREDPORTCANNOTPUBLISHITSNAME = 11;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Apublicportmustbedefinedasaserviceport' of 'RT Port'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int RT_PORT__APUBLICPORTMUSTBEDEFINEDASASERVICEPORT = 12;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'ASA Punwiredunpublishedmusthaveprotectedvisibility' of 'RT Port'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int RT_PORT__ASA_PUNWIREDUNPUBLISHEDMUSTHAVEPROTECTEDVISIBILITY = 13;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'An SP Punwiredandpublishedmusthavepublicvisibility' of 'RT Port'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int RT_PORT__AN_SP_PUNWIREDANDPUBLISHEDMUSTHAVEPUBLICVISIBILITY = 14;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Onlybinaryconnectorsareallowed' of 'RT Connector'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int RT_CONNECTOR__ONLYBINARYCONNECTORSAREALLOWED = 15;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Exclusioncanonlybeappliedtosome UMLR Tmodelelements' of 'RTR Excluded Element'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int RTR_EXCLUDED_ELEMENT__EXCLUSIONCANONLYBEAPPLIEDTOSOME_UMLR_TMODELELEMENTS = 16;

-

-	/**

-	 * A constant with a fixed name that can be used as the base value for additional hand written constants.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 16;

-

-	/**

-	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public UMLRealTimeValidator() {

-		super();

-	}

-

-	/**

-	 * Returns the package of this validator switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	protected EPackage getEPackage() {

-		return UMLRealTimePackage.eINSTANCE;

-	}

-

-	/**

-	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		switch (classifierID) {

-		case UMLRealTimePackage.CAPSULE:

-			return validateCapsule((Capsule) value, diagnostics, context);

-		case UMLRealTimePackage.CAPSULE_PART:

-			return validateCapsulePart((CapsulePart) value, diagnostics, context);

-		case UMLRealTimePackage.PROTOCOL:

-			return validateProtocol((Protocol) value, diagnostics, context);

-		case UMLRealTimePackage.RT_PORT:

-			return validateRTPort((RTPort) value, diagnostics, context);

-		case UMLRealTimePackage.RT_CONNECTOR:

-			return validateRTConnector((RTConnector) value, diagnostics, context);

-		case UMLRealTimePackage.PROTOCOL_CONTAINER:

-			return validateProtocolContainer((ProtocolContainer) value, diagnostics, context);

-		case UMLRealTimePackage.RTR_EXCLUDED_ELEMENT:

-			return validateRTRExcludedElement((RTRExcludedElement) value, diagnostics, context);

-		case UMLRealTimePackage.RT_MESSAGE_SET:

-			return validateRTMessageSet((RTMessageSet) value, diagnostics, context);

-		case UMLRealTimePackage.PORT_REGISTRATION_TYPE:

-			return validatePortRegistrationType((PortRegistrationType) value, diagnostics, context);

-		case UMLRealTimePackage.RT_MESSAGE_KIND:

-			return validateRTMessageKind((RTMessageKind) value, diagnostics, context);

-		default:

-			return true;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateCapsule(Capsule capsule, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if (!validate_NoCircularContainment(capsule, diagnostics, context)) {

-			return false;

-		}

-		boolean result = validate_EveryMultiplicityConforms(capsule, diagnostics, context);

-		if (result || diagnostics != null) {

-			result &= validate_EveryDataValueConforms(capsule, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryReferenceIsContained(capsule, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryBidirectionalReferenceIsPaired(capsule, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryProxyResolves(capsule, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_UniqueID(capsule, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryKeyUnique(capsule, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryMapEntryUnique(capsule, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateCapsule_Capsulesarealwaysactive(capsule, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateCapsule_AcapsulecannothaveReceptionfeatures(capsule, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateCapsule_Acapsuleclasscanalwaysbesubclassed(capsule, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateCapsule_Acapsulecanhaveatmostonesuperclass(capsule, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateCapsule_Capsuleclassesarealwayssubstitutable(capsule, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateCapsule_Allattributesofacapsuleclasshaveexactlyonetype(capsule, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateCapsule_Privatevisibilityisnotsupportedoncapsulefeatures(capsule, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateCapsule_Acapsuleclasscannothavenestedclassifiers(capsule, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateCapsule_Alloperationsofacapsulearesequential(capsule, diagnostics, context);

-		}

-		return result;

-	}

-

-	/**

-	 * Validates the Capsulesarealwaysactive constraint of '<em>Capsule</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateCapsule_Capsulesarealwaysactive(Capsule capsule, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return capsule.Capsulesarealwaysactive(diagnostics, context);

-	}

-

-	/**

-	 * Validates the AcapsulecannothaveReceptionfeatures constraint of '<em>Capsule</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateCapsule_AcapsulecannothaveReceptionfeatures(Capsule capsule, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return capsule.AcapsulecannothaveReceptionfeatures(diagnostics, context);

-	}

-

-	/**

-	 * Validates the Acapsuleclasscanalwaysbesubclassed constraint of '<em>Capsule</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateCapsule_Acapsuleclasscanalwaysbesubclassed(Capsule capsule, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return capsule.Acapsuleclasscanalwaysbesubclassed(diagnostics, context);

-	}

-

-	/**

-	 * Validates the Acapsulecanhaveatmostonesuperclass constraint of '<em>Capsule</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateCapsule_Acapsulecanhaveatmostonesuperclass(Capsule capsule, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return capsule.Acapsulecanhaveatmostonesuperclass(diagnostics, context);

-	}

-

-	/**

-	 * Validates the Capsuleclassesarealwayssubstitutable constraint of '<em>Capsule</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateCapsule_Capsuleclassesarealwayssubstitutable(Capsule capsule, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return capsule.Capsuleclassesarealwayssubstitutable(diagnostics, context);

-	}

-

-	/**

-	 * Validates the Allattributesofacapsuleclasshaveexactlyonetype constraint of '<em>Capsule</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateCapsule_Allattributesofacapsuleclasshaveexactlyonetype(Capsule capsule, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return capsule.Allattributesofacapsuleclasshaveexactlyonetype(diagnostics, context);

-	}

-

-	/**

-	 * Validates the Privatevisibilityisnotsupportedoncapsulefeatures constraint of '<em>Capsule</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateCapsule_Privatevisibilityisnotsupportedoncapsulefeatures(Capsule capsule, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return capsule.Privatevisibilityisnotsupportedoncapsulefeatures(diagnostics, context);

-	}

-

-	/**

-	 * Validates the Acapsuleclasscannothavenestedclassifiers constraint of '<em>Capsule</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateCapsule_Acapsuleclasscannothavenestedclassifiers(Capsule capsule, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return capsule.Acapsuleclasscannothavenestedclassifiers(diagnostics, context);

-	}

-

-	/**

-	 * Validates the Alloperationsofacapsulearesequential constraint of '<em>Capsule</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateCapsule_Alloperationsofacapsulearesequential(Capsule capsule, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return capsule.Alloperationsofacapsulearesequential(diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateCapsulePart(CapsulePart capsulePart, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(capsulePart, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateProtocol(Protocol protocol, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if (!validate_NoCircularContainment(protocol, diagnostics, context)) {

-			return false;

-		}

-		boolean result = validate_EveryMultiplicityConforms(protocol, diagnostics, context);

-		if (result || diagnostics != null) {

-			result &= validate_EveryDataValueConforms(protocol, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryReferenceIsContained(protocol, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryBidirectionalReferenceIsPaired(protocol, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryProxyResolves(protocol, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_UniqueID(protocol, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryKeyUnique(protocol, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryMapEntryUnique(protocol, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateProtocol_Protocolscanhaveatmostonegeneralization(protocol, diagnostics, context);

-		}

-		return result;

-	}

-

-	/**

-	 * Validates the Protocolscanhaveatmostonegeneralization constraint of '<em>Protocol</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateProtocol_Protocolscanhaveatmostonegeneralization(Protocol protocol, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return protocol.Protocolscanhaveatmostonegeneralization(diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTPort(RTPort rtPort, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if (!validate_NoCircularContainment(rtPort, diagnostics, context)) {

-			return false;

-		}

-		boolean result = validate_EveryMultiplicityConforms(rtPort, diagnostics, context);

-		if (result || diagnostics != null) {

-			result &= validate_EveryDataValueConforms(rtPort, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryReferenceIsContained(rtPort, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryBidirectionalReferenceIsPaired(rtPort, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryProxyResolves(rtPort, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_UniqueID(rtPort, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryKeyUnique(rtPort, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryMapEntryUnique(rtPort, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateRTPort_Awiredportcannotpublishitsname(rtPort, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateRTPort_Apublicportmustbedefinedasaserviceport(rtPort, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateRTPort_ASAPunwiredunpublishedmusthaveprotectedvisibility(rtPort, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateRTPort_AnSPPunwiredandpublishedmusthavepublicvisibility(rtPort, diagnostics, context);

-		}

-		return result;

-	}

-

-	/**

-	 * Validates the Awiredportcannotpublishitsname constraint of '<em>RT Port</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTPort_Awiredportcannotpublishitsname(RTPort rtPort, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return rtPort.Awiredportcannotpublishitsname(diagnostics, context);

-	}

-

-	/**

-	 * Validates the Apublicportmustbedefinedasaserviceport constraint of '<em>RT Port</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTPort_Apublicportmustbedefinedasaserviceport(RTPort rtPort, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return rtPort.Apublicportmustbedefinedasaserviceport(diagnostics, context);

-	}

-

-	/**

-	 * Validates the ASAPunwiredunpublishedmusthaveprotectedvisibility constraint of '<em>RT Port</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTPort_ASAPunwiredunpublishedmusthaveprotectedvisibility(RTPort rtPort, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return rtPort.ASAPunwiredunpublishedmusthaveprotectedvisibility(diagnostics, context);

-	}

-

-	/**

-	 * Validates the AnSPPunwiredandpublishedmusthavepublicvisibility constraint of '<em>RT Port</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTPort_AnSPPunwiredandpublishedmusthavepublicvisibility(RTPort rtPort, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return rtPort.AnSPPunwiredandpublishedmusthavepublicvisibility(diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTConnector(RTConnector rtConnector, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if (!validate_NoCircularContainment(rtConnector, diagnostics, context)) {

-			return false;

-		}

-		boolean result = validate_EveryMultiplicityConforms(rtConnector, diagnostics, context);

-		if (result || diagnostics != null) {

-			result &= validate_EveryDataValueConforms(rtConnector, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryReferenceIsContained(rtConnector, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryBidirectionalReferenceIsPaired(rtConnector, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryProxyResolves(rtConnector, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_UniqueID(rtConnector, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryKeyUnique(rtConnector, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryMapEntryUnique(rtConnector, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateRTConnector_Onlybinaryconnectorsareallowed(rtConnector, diagnostics, context);

-		}

-		return result;

-	}

-

-	/**

-	 * Validates the Onlybinaryconnectorsareallowed constraint of '<em>RT Connector</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTConnector_Onlybinaryconnectorsareallowed(RTConnector rtConnector, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return rtConnector.Onlybinaryconnectorsareallowed(diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateProtocolContainer(ProtocolContainer protocolContainer, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(protocolContainer, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTRExcludedElement(RTRExcludedElement rtrExcludedElement, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if (!validate_NoCircularContainment(rtrExcludedElement, diagnostics, context)) {

-			return false;

-		}

-		boolean result = validate_EveryMultiplicityConforms(rtrExcludedElement, diagnostics, context);

-		if (result || diagnostics != null) {

-			result &= validate_EveryDataValueConforms(rtrExcludedElement, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryReferenceIsContained(rtrExcludedElement, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryBidirectionalReferenceIsPaired(rtrExcludedElement, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryProxyResolves(rtrExcludedElement, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_UniqueID(rtrExcludedElement, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryKeyUnique(rtrExcludedElement, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryMapEntryUnique(rtrExcludedElement, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateRTRExcludedElement_ExclusioncanonlybeappliedtosomeUMLRTmodelelements(rtrExcludedElement, diagnostics, context);

-		}

-		return result;

-	}

-

-	/**

-	 * Validates the ExclusioncanonlybeappliedtosomeUMLRTmodelelements constraint of '<em>RTR Excluded Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTRExcludedElement_ExclusioncanonlybeappliedtosomeUMLRTmodelelements(RTRExcludedElement rtrExcludedElement, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return rtrExcludedElement.ExclusioncanonlybeappliedtosomeUMLRTmodelelements(diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTMessageSet(RTMessageSet rtMessageSet, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(rtMessageSet, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validatePortRegistrationType(PortRegistrationType portRegistrationType, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTMessageKind(RTMessageKind rtMessageKind, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return true;

-	}

-

-	/**

-	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		// TODO

-		// Specialize this to return a resource locator for messages specific to this validator.

-		// Ensure that you remove @generated or mark it @generated NOT

-		return super.getResourceLocator();

-	}

-

-} // UMLRealTimeValidator

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeXMLProcessor.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeXMLProcessor.java
index da76701be11..320da84f171 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeXMLProcessor.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeXMLProcessor.java
@@ -11,18 +11,15 @@ package org.eclipse.papyrus.umlrt.UMLRealTime.util;
 import java.util.Map;

 

 import org.eclipse.emf.ecore.EPackage;

-

 import org.eclipse.emf.ecore.resource.Resource;

-

 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

-

 import org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage;

 

 /**

  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class UMLRealTimeXMLProcessor extends XMLProcessor {

@@ -31,7 +28,7 @@ public class UMLRealTimeXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public UMLRealTimeXMLProcessor() {

@@ -43,7 +40,7 @@ public class UMLRealTimeXMLProcessor extends XMLProcessor {
 	 * Register for "*" and "xml" file extensions the UMLRealTimeResourceFactoryImpl factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTPseudostate.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTPseudostate.java
index 9304fe58919..cd91f52437d 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTPseudostate.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTPseudostate.java
@@ -8,12 +8,7 @@
  */

 package org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach;

 

-import java.util.Map;

-

-import org.eclipse.emf.common.util.DiagnosticChain;

-

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.uml2.uml.Pseudostate;

 

 /**

@@ -21,6 +16,13 @@ import org.eclipse.uml2.uml.Pseudostate;
  * A representation of the model object '<em><b>RT Pseudostate</b></em>'.

  * <!-- end-user-doc -->

  *

+ * <!-- begin-model-doc -->

+ * let knd = base_Pseudostate.kind in

+ * (knd <> UML::PseudostateKind::shallowHistory) and

+ * (knd <> UML::PseudostateKind::fork) and

+ * (knd <> UML::PseudostateKind::join)

+ * <!-- end-model-doc -->

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -40,7 +42,7 @@ public interface RTPseudostate extends EObject {
 	 * If the meaning of the '<em>Base Pseudostate</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Pseudostate</em>' reference.

 	 * @see #setBase_Pseudostate(Pseudostate)

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage#getRTPseudostate_Base_Pseudostate()

@@ -53,7 +55,7 @@ public interface RTPseudostate extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTPseudostate#getBase_Pseudostate <em>Base Pseudostate</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Base Pseudostate</em>' reference.

 	 * @see #getBase_Pseudostate()

@@ -61,23 +63,4 @@ public interface RTPseudostate extends EObject {
 	 */

 	void setBase_Pseudostate(Pseudostate value);

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * let knd = base_Pseudostate.kind in

-	 * (knd <> UML::PseudostateKind::shallowHistory) and

-	 * (knd <> UML::PseudostateKind::fork) and

-	 * (knd <> UML::PseudostateKind::join)

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='RT state machines do not support concurrency or shallow history'"

-	 * @generated

-	 */

-	boolean RTstatemachinesdonotsupportconcurrencyorshallowhistory(DiagnosticChain diagnostics, Map<Object, Object> context);

-

 } // RTPseudostate

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTRegion.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTRegion.java
index 2e6b5702a04..7e27af7abfe 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTRegion.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTRegion.java
@@ -8,12 +8,7 @@
  */

 package org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach;

 

-import java.util.Map;

-

-import org.eclipse.emf.common.util.DiagnosticChain;

-

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.uml2.uml.Region;

 

 /**

@@ -21,6 +16,11 @@ import org.eclipse.uml2.uml.Region;
  * A representation of the model object '<em><b>RT Region</b></em>'.

  * <!-- end-user-doc -->

  *

+ * <!-- begin-model-doc -->

+ * base_Region.subvertex->forAll

+ * (v | not v.oclIsKindOf(FinalState))

+ * <!-- end-model-doc -->

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -40,7 +40,7 @@ public interface RTRegion extends EObject {
 	 * If the meaning of the '<em>Base Region</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Region</em>' reference.

 	 * @see #setBase_Region(Region)

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage#getRTRegion_Base_Region()

@@ -53,7 +53,7 @@ public interface RTRegion extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTRegion#getBase_Region <em>Base Region</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Base Region</em>' reference.

 	 * @see #getBase_Region()

@@ -61,21 +61,4 @@ public interface RTRegion extends EObject {
 	 */

 	void setBase_Region(Region value);

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * base_Region.subvertex->forAll

-	 * (v | not v.oclIsKindOf(FinalState))

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='Regions in RT state machines cannot have a final state'"

-	 * @generated

-	 */

-	boolean RegionsinRTstatemachinescannothaveafinalstate(DiagnosticChain diagnostics, Map<Object, Object> context);

-

 } // RTRegion

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTState.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTState.java
index d8b07d4b490..65246776212 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTState.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTState.java
@@ -8,12 +8,7 @@
  */

 package org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach;

 

-import java.util.Map;

-

-import org.eclipse.emf.common.util.DiagnosticChain;

-

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.uml2.uml.State;

 

 /**

@@ -21,6 +16,14 @@ import org.eclipse.uml2.uml.State;
  * A representation of the model object '<em><b>RT State</b></em>'.

  * <!-- end-user-doc -->

  *

+ * <!-- begin-model-doc -->

+ * base_State.isComposite implies

+ * (base_State.region->size() = 1)

+ * not base_State.isSubmachineState

+ * base_State.doActivity->size() = 0

+ * base_State.deferrableTrigger->size() = 0

+ * <!-- end-model-doc -->

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -40,7 +43,7 @@ public interface RTState extends EObject {
 	 * If the meaning of the '<em>Base State</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base State</em>' reference.

 	 * @see #setBase_State(State)

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage#getRTState_Base_State()

@@ -53,7 +56,7 @@ public interface RTState extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState#getBase_State <em>Base State</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Base State</em>' reference.

 	 * @see #getBase_State()

@@ -61,84 +64,4 @@ public interface RTState extends EObject {
 	 */

 	void setBase_State(State value);

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * base_State.isComposite implies

-	 * (base_State.region->size() = 1)

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='A composte RT state has exactly one region'"

-	 * @generated

-	 */

-	boolean AcomposteRTstatehasexactlyoneregion(DiagnosticChain diagnostics, Map<Object, Object> context);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * not base_State.isSubmachineState

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='RT does not support submachine states'"

-	 * @generated

-	 */

-	boolean RTdoesnotsupportsubmachinestates(DiagnosticChain diagnostics, Map<Object, Object> context);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * base_State.doActivity->size() = 0

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='RT state machines do not support \"do\" activities'"

-	 * @generated

-	 */

-	boolean RTstatemachinesdonotsupportdoactivities(DiagnosticChain diagnostics, Map<Object, Object> context);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * base_State.deferrableTrigger->size() = 0

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='RT state machines cannot have any deferred triggers '"

-	 * @generated

-	 */

-	boolean RTstatemachinescannothaveanydeferredtriggers(DiagnosticChain diagnostics, Map<Object, Object> context);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model

-	 * @generated

-	 */

-	boolean Constraint5(DiagnosticChain diagnostics, Map<Object, Object> context);

-

 } // RTState

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTStateMachine.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTStateMachine.java
index 7139809da09..338e8e4d1d1 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTStateMachine.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTStateMachine.java
@@ -8,12 +8,7 @@
  */

 package org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach;

 

-import java.util.Map;

-

-import org.eclipse.emf.common.util.DiagnosticChain;

-

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.uml2.uml.StateMachine;

 

 /**

@@ -21,6 +16,16 @@ import org.eclipse.uml2.uml.StateMachine;
  * A representation of the model object '<em><b>RT State Machine</b></em>'.

  * <!-- end-user-doc -->

  *

+ * <!-- begin-model-doc -->

+ * base_StateMachine.region->size() = 1

+ * not base_StateMachine.isReentrant

+ * (base_StateMachine.ownedParameter->size()=0) and

+ * (base_StateMachine.ownedParameterSet->size() = 0)

+ * (base_StateMachine.behavioredClassifier->size()=1)

+ * and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))

+ * isPassive = not (base_StateMachine.behavioredClassifier.oclAsType(Class).isActive)

+ * <!-- end-model-doc -->

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -41,7 +46,7 @@ public interface RTStateMachine extends EObject {
 	 * If the meaning of the '<em>Base State Machine</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base State Machine</em>' reference.

 	 * @see #setBase_StateMachine(StateMachine)

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage#getRTStateMachine_Base_StateMachine()

@@ -54,7 +59,7 @@ public interface RTStateMachine extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine#getBase_StateMachine <em>Base State Machine</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Base State Machine</em>' reference.

 	 * @see #getBase_StateMachine()

@@ -70,7 +75,7 @@ public interface RTStateMachine extends EObject {
 	 * If the meaning of the '<em>Is Passive</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Is Passive</em>' attribute.

 	 * @see #setIsPassive(boolean)

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage#getRTStateMachine_IsPassive()

@@ -83,7 +88,7 @@ public interface RTStateMachine extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine#isPassive <em>Is Passive</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Is Passive</em>' attribute.

 	 * @see #isPassive()

@@ -91,86 +96,4 @@ public interface RTStateMachine extends EObject {
 	 */

 	void setIsPassive(boolean value);

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * base_StateMachine.region->size() = 1

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='An RT state machine has exactly one region'"

-	 * @generated

-	 */

-	boolean AnRTstatemachinehasexactlyoneregion(DiagnosticChain diagnostics, Map<Object, Object> context);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * not base_StateMachine.isReentrant

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='An RT state machine is never re-entrant'"

-	 * @generated

-	 */

-	boolean AnRTstatemachineisneverreentrant(DiagnosticChain diagnostics, Map<Object, Object> context);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * (base_StateMachine.ownedParameter->size()=0) and

-	 * (base_StateMachine.ownedParameterSet->size() = 0)

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='RT state machines do not have parameters or parameter sets'"

-	 * @generated

-	 */

-	boolean RTstatemachinesdonothaveparametersorparametersets(DiagnosticChain diagnostics, Map<Object, Object> context);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * (base_StateMachine.behavioredClassifier->size()=1)

-	 * and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='RT state machines must have a context and it must be a Class'"

-	 * @generated

-	 */

-	boolean RTstatemachinesmusthaveacontextanditmustbeaClass(DiagnosticChain diagnostics, Map<Object, Object> context);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * isPassive = not (base_StateMachine.behavioredClassifier.oclAsType(Class).isActive)

-	 * 

-	 * @param diagnostics

-	 *            The chain of diagnostics to which problems are to be appended.

-	 * @param context

-	 *            The cache of context-specific information.

-	 *            <!-- end-model-doc -->

-	 * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='Passive state machine are only allowed on passive data classes'"

-	 * @generated

-	 */

-	boolean Passivestatemachineareonlyallowedonpassivedataclasses(DiagnosticChain diagnostics, Map<Object, Object> context);

-

 } // RTStateMachine

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTTrigger.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTTrigger.java
index b9abb1b645b..ef98fab1cd0 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTTrigger.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTTrigger.java
@@ -9,7 +9,6 @@
 package org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach;

 

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.uml2.uml.Operation;

 

 /**

@@ -36,7 +35,7 @@ public interface RTTrigger extends EObject {
 	 * If the meaning of the '<em>Base Operation</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Base Operation</em>' reference.

 	 * @see #setBase_Operation(Operation)

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage#getRTTrigger_Base_Operation()

@@ -49,7 +48,7 @@ public interface RTTrigger extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTTrigger#getBase_Operation <em>Base Operation</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *            the new value of the '<em>Base Operation</em>' reference.

 	 * @see #getBase_Operation()

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/UMLRealTimeStateMachFactory.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/UMLRealTimeStateMachFactory.java
index 28022db8367..35652628e58 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/UMLRealTimeStateMachFactory.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/UMLRealTimeStateMachFactory.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.

  * It provides a create method for each non-abstract class of the model.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage

  * @generated

  */

@@ -24,7 +24,7 @@ public interface UMLRealTimeStateMachFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	UMLRealTimeStateMachFactory eINSTANCE = org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.UMLRealTimeStateMachFactoryImpl.init();

@@ -33,7 +33,7 @@ public interface UMLRealTimeStateMachFactory extends EFactory {
 	 * Returns a new object of class '<em>RT State Machine</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>RT State Machine</em>'.

 	 * @generated

 	 */

@@ -43,7 +43,7 @@ public interface UMLRealTimeStateMachFactory extends EFactory {
 	 * Returns a new object of class '<em>RT Region</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>RT Region</em>'.

 	 * @generated

 	 */

@@ -53,7 +53,7 @@ public interface UMLRealTimeStateMachFactory extends EFactory {
 	 * Returns a new object of class '<em>RT State</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>RT State</em>'.

 	 * @generated

 	 */

@@ -63,7 +63,7 @@ public interface UMLRealTimeStateMachFactory extends EFactory {
 	 * Returns a new object of class '<em>RT Pseudostate</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>RT Pseudostate</em>'.

 	 * @generated

 	 */

@@ -73,7 +73,7 @@ public interface UMLRealTimeStateMachFactory extends EFactory {
 	 * Returns a new object of class '<em>RT Trigger</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return a new object of class '<em>RT Trigger</em>'.

 	 * @generated

 	 */

@@ -83,7 +83,7 @@ public interface UMLRealTimeStateMachFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/UMLRealTimeStateMachPackage.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/UMLRealTimeStateMachPackage.java
index 54db9882fe2..ebe972c7a51 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/UMLRealTimeStateMachPackage.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/UMLRealTimeStateMachPackage.java
@@ -10,7 +10,6 @@ package org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach;
 

 import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EOperation;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EReference;

 

@@ -26,7 +25,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachFactory

  * @model kind="package"

  * @generated

@@ -36,7 +35,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * The package name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNAME = "UMLRealTimeStateMach"; //$NON-NLS-1$

@@ -45,16 +44,16 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * The package namespace URI.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

-	String eNS_URI = "http:///UMLRealTimeStateMach.ecore"; //$NON-NLS-1$

+	String eNS_URI = "http://www.eclipse.org/papyrus/umlrt/statemachine"; //$NON-NLS-1$

 

 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "UMLRealTimeStateMach"; //$NON-NLS-1$

@@ -63,7 +62,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	UMLRealTimeStateMachPackage eINSTANCE = org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.UMLRealTimeStateMachPackageImpl.init();

@@ -72,7 +71,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTStateMachineImpl <em>RT State Machine</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTStateMachineImpl

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.UMLRealTimeStateMachPackageImpl#getRTStateMachine()

 	 * @generated

@@ -83,7 +82,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * The feature id for the '<em><b>Base State Machine</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -93,7 +92,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Passive</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -103,77 +102,27 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * The number of structural features of the '<em>RT State Machine</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

 	int RT_STATE_MACHINE_FEATURE_COUNT = 2;

 

 	/**

-	 * The operation id for the '<em>An RTstatemachinehasexactlyoneregion</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int RT_STATE_MACHINE___AN_RTSTATEMACHINEHASEXACTLYONEREGION__DIAGNOSTICCHAIN_MAP = 0;

-

-	/**

-	 * The operation id for the '<em>An RTstatemachineisneverreentrant</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int RT_STATE_MACHINE___AN_RTSTATEMACHINEISNEVERREENTRANT__DIAGNOSTICCHAIN_MAP = 1;

-

-	/**

-	 * The operation id for the '<em>RTstatemachinesdonothaveparametersorparametersets</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int RT_STATE_MACHINE___RTSTATEMACHINESDONOTHAVEPARAMETERSORPARAMETERSETS__DIAGNOSTICCHAIN_MAP = 2;

-

-	/**

-	 * The operation id for the '<em>RTstatemachinesmusthaveacontextanditmustbea Class</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int RT_STATE_MACHINE___RTSTATEMACHINESMUSTHAVEACONTEXTANDITMUSTBEA_CLASS__DIAGNOSTICCHAIN_MAP = 3;

-

-	/**

-	 * The operation id for the '<em>Passivestatemachineareonlyallowedonpassivedataclasses</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int RT_STATE_MACHINE___PASSIVESTATEMACHINEAREONLYALLOWEDONPASSIVEDATACLASSES__DIAGNOSTICCHAIN_MAP = 4;

-

-	/**

 	 * The number of operations of the '<em>RT State Machine</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

-	int RT_STATE_MACHINE_OPERATION_COUNT = 5;

+	int RT_STATE_MACHINE_OPERATION_COUNT = 0;

 

 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTRegionImpl <em>RT Region</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTRegionImpl

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.UMLRealTimeStateMachPackageImpl#getRTRegion()

 	 * @generated

@@ -184,7 +133,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Region</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -194,37 +143,27 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * The number of structural features of the '<em>RT Region</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

 	int RT_REGION_FEATURE_COUNT = 1;

 

 	/**

-	 * The operation id for the '<em>Regionsin RTstatemachinescannothaveafinalstate</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int RT_REGION___REGIONSIN_RTSTATEMACHINESCANNOTHAVEAFINALSTATE__DIAGNOSTICCHAIN_MAP = 0;

-

-	/**

 	 * The number of operations of the '<em>RT Region</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

-	int RT_REGION_OPERATION_COUNT = 1;

+	int RT_REGION_OPERATION_COUNT = 0;

 

 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTStateImpl <em>RT State</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTStateImpl

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.UMLRealTimeStateMachPackageImpl#getRTState()

 	 * @generated

@@ -235,7 +174,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * The feature id for the '<em><b>Base State</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -245,77 +184,27 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * The number of structural features of the '<em>RT State</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

 	int RT_STATE_FEATURE_COUNT = 1;

 

 	/**

-	 * The operation id for the '<em>Acomposte RTstatehasexactlyoneregion</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int RT_STATE___ACOMPOSTE_RTSTATEHASEXACTLYONEREGION__DIAGNOSTICCHAIN_MAP = 0;

-

-	/**

-	 * The operation id for the '<em>RTdoesnotsupportsubmachinestates</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int RT_STATE___RTDOESNOTSUPPORTSUBMACHINESTATES__DIAGNOSTICCHAIN_MAP = 1;

-

-	/**

-	 * The operation id for the '<em>RTstatemachinesdonotsupportdoactivities</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int RT_STATE___RTSTATEMACHINESDONOTSUPPORTDOACTIVITIES__DIAGNOSTICCHAIN_MAP = 2;

-

-	/**

-	 * The operation id for the '<em>RTstatemachinescannothaveanydeferredtriggers</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int RT_STATE___RTSTATEMACHINESCANNOTHAVEANYDEFERREDTRIGGERS__DIAGNOSTICCHAIN_MAP = 3;

-

-	/**

-	 * The operation id for the '<em>Constraint5</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int RT_STATE___CONSTRAINT5__DIAGNOSTICCHAIN_MAP = 4;

-

-	/**

 	 * The number of operations of the '<em>RT State</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

-	int RT_STATE_OPERATION_COUNT = 5;

+	int RT_STATE_OPERATION_COUNT = 0;

 

 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTPseudostateImpl <em>RT Pseudostate</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTPseudostateImpl

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.UMLRealTimeStateMachPackageImpl#getRTPseudostate()

 	 * @generated

@@ -326,7 +215,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Pseudostate</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -336,37 +225,27 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * The number of structural features of the '<em>RT Pseudostate</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

 	int RT_PSEUDOSTATE_FEATURE_COUNT = 1;

 

 	/**

-	 * The operation id for the '<em>RTstatemachinesdonotsupportconcurrencyorshallowhistory</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int RT_PSEUDOSTATE___RTSTATEMACHINESDONOTSUPPORTCONCURRENCYORSHALLOWHISTORY__DIAGNOSTICCHAIN_MAP = 0;

-

-	/**

 	 * The number of operations of the '<em>RT Pseudostate</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

-	int RT_PSEUDOSTATE_OPERATION_COUNT = 1;

+	int RT_PSEUDOSTATE_OPERATION_COUNT = 0;

 

 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTTriggerImpl <em>RT Trigger</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTTriggerImpl

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.UMLRealTimeStateMachPackageImpl#getRTTrigger()

 	 * @generated

@@ -377,7 +256,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Operation</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -387,7 +266,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * The number of structural features of the '<em>RT Trigger</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -397,7 +276,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * The number of operations of the '<em>RT Trigger</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -408,7 +287,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine <em>RT State Machine</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>RT State Machine</em>'.

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine

 	 * @generated

@@ -419,7 +298,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine#getBase_StateMachine <em>Base State Machine</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base State Machine</em>'.

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine#getBase_StateMachine()

 	 * @see #getRTStateMachine()

@@ -431,7 +310,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine#isPassive <em>Is Passive</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the attribute '<em>Is Passive</em>'.

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine#isPassive()

 	 * @see #getRTStateMachine()

@@ -440,70 +319,10 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	EAttribute getRTStateMachine_IsPassive();

 

 	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine#AnRTstatemachinehasexactlyoneregion(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * <em>An RTstatemachinehasexactlyoneregion</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>An RTstatemachinehasexactlyoneregion</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine#AnRTstatemachinehasexactlyoneregion(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getRTStateMachine__AnRTstatemachinehasexactlyoneregion__DiagnosticChain_Map();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine#AnRTstatemachineisneverreentrant(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>An RTstatemachineisneverreentrant</em>}'

-	 * operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>An RTstatemachineisneverreentrant</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine#AnRTstatemachineisneverreentrant(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getRTStateMachine__AnRTstatemachineisneverreentrant__DiagnosticChain_Map();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine#RTstatemachinesdonothaveparametersorparametersets(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * <em>RTstatemachinesdonothaveparametersorparametersets</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>RTstatemachinesdonothaveparametersorparametersets</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine#RTstatemachinesdonothaveparametersorparametersets(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getRTStateMachine__RTstatemachinesdonothaveparametersorparametersets__DiagnosticChain_Map();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine#RTstatemachinesmusthaveacontextanditmustbeaClass(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * <em>RTstatemachinesmusthaveacontextanditmustbea Class</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>RTstatemachinesmusthaveacontextanditmustbea Class</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine#RTstatemachinesmusthaveacontextanditmustbeaClass(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getRTStateMachine__RTstatemachinesmusthaveacontextanditmustbeaClass__DiagnosticChain_Map();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine#Passivestatemachineareonlyallowedonpassivedataclasses(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * <em>Passivestatemachineareonlyallowedonpassivedataclasses</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>Passivestatemachineareonlyallowedonpassivedataclasses</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine#Passivestatemachineareonlyallowedonpassivedataclasses(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getRTStateMachine__Passivestatemachineareonlyallowedonpassivedataclasses__DiagnosticChain_Map();

-

-	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTRegion <em>RT Region</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>RT Region</em>'.

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTRegion

 	 * @generated

@@ -514,7 +333,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTRegion#getBase_Region <em>Base Region</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Region</em>'.

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTRegion#getBase_Region()

 	 * @see #getRTRegion()

@@ -523,22 +342,10 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	EReference getRTRegion_Base_Region();

 

 	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTRegion#RegionsinRTstatemachinescannothaveafinalstate(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * <em>Regionsin RTstatemachinescannothaveafinalstate</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>Regionsin RTstatemachinescannothaveafinalstate</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTRegion#RegionsinRTstatemachinescannothaveafinalstate(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getRTRegion__RegionsinRTstatemachinescannothaveafinalstate__DiagnosticChain_Map();

-

-	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState <em>RT State</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>RT State</em>'.

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState

 	 * @generated

@@ -549,7 +356,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState#getBase_State <em>Base State</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base State</em>'.

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState#getBase_State()

 	 * @see #getRTState()

@@ -558,69 +365,10 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	EReference getRTState_Base_State();

 

 	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState#AcomposteRTstatehasexactlyoneregion(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Acomposte RTstatehasexactlyoneregion</em>}'

-	 * operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>Acomposte RTstatehasexactlyoneregion</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState#AcomposteRTstatehasexactlyoneregion(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getRTState__AcomposteRTstatehasexactlyoneregion__DiagnosticChain_Map();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState#RTdoesnotsupportsubmachinestates(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>RTdoesnotsupportsubmachinestates</em>}'

-	 * operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>RTdoesnotsupportsubmachinestates</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState#RTdoesnotsupportsubmachinestates(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getRTState__RTdoesnotsupportsubmachinestates__DiagnosticChain_Map();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState#RTstatemachinesdonotsupportdoactivities(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * <em>RTstatemachinesdonotsupportdoactivities</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>RTstatemachinesdonotsupportdoactivities</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState#RTstatemachinesdonotsupportdoactivities(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getRTState__RTstatemachinesdonotsupportdoactivities__DiagnosticChain_Map();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState#RTstatemachinescannothaveanydeferredtriggers(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * <em>RTstatemachinescannothaveanydeferredtriggers</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>RTstatemachinescannothaveanydeferredtriggers</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState#RTstatemachinescannothaveanydeferredtriggers(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getRTState__RTstatemachinescannothaveanydeferredtriggers__DiagnosticChain_Map();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState#Constraint5(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Constraint5</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>Constraint5</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState#Constraint5(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getRTState__Constraint5__DiagnosticChain_Map();

-

-	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTPseudostate <em>RT Pseudostate</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>RT Pseudostate</em>'.

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTPseudostate

 	 * @generated

@@ -631,7 +379,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTPseudostate#getBase_Pseudostate <em>Base Pseudostate</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Pseudostate</em>'.

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTPseudostate#getBase_Pseudostate()

 	 * @see #getRTPseudostate()

@@ -640,22 +388,10 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	EReference getRTPseudostate_Base_Pseudostate();

 

 	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTPseudostate#RTstatemachinesdonotsupportconcurrencyorshallowhistory(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * <em>RTstatemachinesdonotsupportconcurrencyorshallowhistory</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the '<em>RTstatemachinesdonotsupportconcurrencyorshallowhistory</em>' operation.

-	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTPseudostate#RTstatemachinesdonotsupportconcurrencyorshallowhistory(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 * @generated

-	 */

-	EOperation getRTPseudostate__RTstatemachinesdonotsupportconcurrencyorshallowhistory__DiagnosticChain_Map();

-

-	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTTrigger <em>RT Trigger</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for class '<em>RT Trigger</em>'.

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTTrigger

 	 * @generated

@@ -666,7 +402,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTTrigger#getBase_Operation <em>Base Operation</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the meta object for the reference '<em>Base Operation</em>'.

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTTrigger#getBase_Operation()

 	 * @see #getRTTrigger()

@@ -678,7 +414,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -695,7 +431,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	interface Literals {

@@ -703,7 +439,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTStateMachineImpl <em>RT State Machine</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTStateMachineImpl

 		 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.UMLRealTimeStateMachPackageImpl#getRTStateMachine()

 		 * @generated

@@ -714,7 +450,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base State Machine</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference RT_STATE_MACHINE__BASE_STATE_MACHINE = eINSTANCE.getRTStateMachine_Base_StateMachine();

@@ -723,61 +459,16 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Is Passive</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EAttribute RT_STATE_MACHINE__IS_PASSIVE = eINSTANCE.getRTStateMachine_IsPassive();

 

 		/**

-		 * The meta object literal for the '<em><b>An RTstatemachinehasexactlyoneregion</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation RT_STATE_MACHINE___AN_RTSTATEMACHINEHASEXACTLYONEREGION__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRTStateMachine__AnRTstatemachinehasexactlyoneregion__DiagnosticChain_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>An RTstatemachineisneverreentrant</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation RT_STATE_MACHINE___AN_RTSTATEMACHINEISNEVERREENTRANT__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRTStateMachine__AnRTstatemachineisneverreentrant__DiagnosticChain_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>RTstatemachinesdonothaveparametersorparametersets</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation RT_STATE_MACHINE___RTSTATEMACHINESDONOTHAVEPARAMETERSORPARAMETERSETS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRTStateMachine__RTstatemachinesdonothaveparametersorparametersets__DiagnosticChain_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>RTstatemachinesmusthaveacontextanditmustbea Class</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation RT_STATE_MACHINE___RTSTATEMACHINESMUSTHAVEACONTEXTANDITMUSTBEA_CLASS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRTStateMachine__RTstatemachinesmusthaveacontextanditmustbeaClass__DiagnosticChain_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>Passivestatemachineareonlyallowedonpassivedataclasses</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation RT_STATE_MACHINE___PASSIVESTATEMACHINEAREONLYALLOWEDONPASSIVEDATACLASSES__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRTStateMachine__Passivestatemachineareonlyallowedonpassivedataclasses__DiagnosticChain_Map();

-

-		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTRegionImpl <em>RT Region</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTRegionImpl

 		 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.UMLRealTimeStateMachPackageImpl#getRTRegion()

 		 * @generated

@@ -788,25 +479,16 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Region</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference RT_REGION__BASE_REGION = eINSTANCE.getRTRegion_Base_Region();

 

 		/**

-		 * The meta object literal for the '<em><b>Regionsin RTstatemachinescannothaveafinalstate</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation RT_REGION___REGIONSIN_RTSTATEMACHINESCANNOTHAVEAFINALSTATE__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRTRegion__RegionsinRTstatemachinescannothaveafinalstate__DiagnosticChain_Map();

-

-		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTStateImpl <em>RT State</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTStateImpl

 		 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.UMLRealTimeStateMachPackageImpl#getRTState()

 		 * @generated

@@ -817,61 +499,16 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base State</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference RT_STATE__BASE_STATE = eINSTANCE.getRTState_Base_State();

 

 		/**

-		 * The meta object literal for the '<em><b>Acomposte RTstatehasexactlyoneregion</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation RT_STATE___ACOMPOSTE_RTSTATEHASEXACTLYONEREGION__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRTState__AcomposteRTstatehasexactlyoneregion__DiagnosticChain_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>RTdoesnotsupportsubmachinestates</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation RT_STATE___RTDOESNOTSUPPORTSUBMACHINESTATES__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRTState__RTdoesnotsupportsubmachinestates__DiagnosticChain_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>RTstatemachinesdonotsupportdoactivities</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation RT_STATE___RTSTATEMACHINESDONOTSUPPORTDOACTIVITIES__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRTState__RTstatemachinesdonotsupportdoactivities__DiagnosticChain_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>RTstatemachinescannothaveanydeferredtriggers</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation RT_STATE___RTSTATEMACHINESCANNOTHAVEANYDEFERREDTRIGGERS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRTState__RTstatemachinescannothaveanydeferredtriggers__DiagnosticChain_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>Constraint5</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation RT_STATE___CONSTRAINT5__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRTState__Constraint5__DiagnosticChain_Map();

-

-		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTPseudostateImpl <em>RT Pseudostate</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTPseudostateImpl

 		 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.UMLRealTimeStateMachPackageImpl#getRTPseudostate()

 		 * @generated

@@ -882,25 +519,16 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Pseudostate</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference RT_PSEUDOSTATE__BASE_PSEUDOSTATE = eINSTANCE.getRTPseudostate_Base_Pseudostate();

 

 		/**

-		 * The meta object literal for the '<em><b>RTstatemachinesdonotsupportconcurrencyorshallowhistory</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EOperation RT_PSEUDOSTATE___RTSTATEMACHINESDONOTSUPPORTCONCURRENCYORSHALLOWHISTORY__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRTPseudostate__RTstatemachinesdonotsupportconcurrencyorshallowhistory__DiagnosticChain_Map();

-

-		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTTriggerImpl <em>RT Trigger</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.RTTriggerImpl

 		 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl.UMLRealTimeStateMachPackageImpl#getRTTrigger()

 		 * @generated

@@ -911,7 +539,7 @@ public interface UMLRealTimeStateMachPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Operation</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

+		 *

 		 * @generated

 		 */

 		EReference RT_TRIGGER__BASE_OPERATION = eINSTANCE.getRTTrigger_Base_Operation();

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTPseudostateImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTPseudostateImpl.java
index 125b614ef44..01ebe59bedd 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTPseudostateImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTPseudostateImpl.java
@@ -8,32 +8,13 @@
  */

 package org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl;

 

-import java.lang.reflect.InvocationTargetException;

-

-import java.util.Map;

-

 import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.EList;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-

-import org.eclipse.emf.ecore.util.EObjectValidator;

-

 import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTPseudostate;

 import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage;

-

-import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.util.UMLRealTimeStateMachValidator;

-

 import org.eclipse.uml2.uml.Pseudostate;

 

 /**

@@ -54,7 +35,7 @@ public class RTPseudostateImpl extends MinimalEObjectImpl.Container implements R
 	 * The cached value of the '{@link #getBase_Pseudostate() <em>Base Pseudostate</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Pseudostate()

 	 * @generated

 	 * @ordered

@@ -64,7 +45,7 @@ public class RTPseudostateImpl extends MinimalEObjectImpl.Container implements R
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected RTPseudostateImpl() {

@@ -74,7 +55,7 @@ public class RTPseudostateImpl extends MinimalEObjectImpl.Container implements R
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -85,7 +66,7 @@ public class RTPseudostateImpl extends MinimalEObjectImpl.Container implements R
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -105,7 +86,7 @@ public class RTPseudostateImpl extends MinimalEObjectImpl.Container implements R
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Pseudostate basicGetBase_Pseudostate() {

@@ -115,7 +96,7 @@ public class RTPseudostateImpl extends MinimalEObjectImpl.Container implements R
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -130,34 +111,7 @@ public class RTPseudostateImpl extends MinimalEObjectImpl.Container implements R
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean RTstatemachinesdonotsupportconcurrencyorshallowhistory(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeStateMachValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeStateMachValidator.RT_PSEUDOSTATE__RTSTATEMACHINESDONOTSUPPORTCONCURRENCYORSHALLOWHISTORY,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "RTstatemachinesdonotsupportconcurrencyorshallowhistory", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -175,7 +129,7 @@ public class RTPseudostateImpl extends MinimalEObjectImpl.Container implements R
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -191,7 +145,7 @@ public class RTPseudostateImpl extends MinimalEObjectImpl.Container implements R
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -207,7 +161,7 @@ public class RTPseudostateImpl extends MinimalEObjectImpl.Container implements R
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -219,20 +173,4 @@ public class RTPseudostateImpl extends MinimalEObjectImpl.Container implements R
 		return super.eIsSet(featureID);

 	}

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	@SuppressWarnings("unchecked")

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-		case UMLRealTimeStateMachPackage.RT_PSEUDOSTATE___RTSTATEMACHINESDONOTSUPPORTCONCURRENCYORSHALLOWHISTORY__DIAGNOSTICCHAIN_MAP:

-			return RTstatemachinesdonotsupportconcurrencyorshallowhistory((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-

 } // RTPseudostateImpl

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTRegionImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTRegionImpl.java
index 2e179050aa8..ba9ea309b3b 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTRegionImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTRegionImpl.java
@@ -8,32 +8,13 @@
  */

 package org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl;

 

-import java.lang.reflect.InvocationTargetException;

-

-import java.util.Map;

-

 import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.EList;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-

-import org.eclipse.emf.ecore.util.EObjectValidator;

-

 import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTRegion;

 import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage;

-

-import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.util.UMLRealTimeStateMachValidator;

-

 import org.eclipse.uml2.uml.Region;

 

 /**

@@ -54,7 +35,7 @@ public class RTRegionImpl extends MinimalEObjectImpl.Container implements RTRegi
 	 * The cached value of the '{@link #getBase_Region() <em>Base Region</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Region()

 	 * @generated

 	 * @ordered

@@ -64,7 +45,7 @@ public class RTRegionImpl extends MinimalEObjectImpl.Container implements RTRegi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected RTRegionImpl() {

@@ -74,7 +55,7 @@ public class RTRegionImpl extends MinimalEObjectImpl.Container implements RTRegi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -85,7 +66,7 @@ public class RTRegionImpl extends MinimalEObjectImpl.Container implements RTRegi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -105,7 +86,7 @@ public class RTRegionImpl extends MinimalEObjectImpl.Container implements RTRegi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Region basicGetBase_Region() {

@@ -115,7 +96,7 @@ public class RTRegionImpl extends MinimalEObjectImpl.Container implements RTRegi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -130,34 +111,7 @@ public class RTRegionImpl extends MinimalEObjectImpl.Container implements RTRegi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean RegionsinRTstatemachinescannothaveafinalstate(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeStateMachValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeStateMachValidator.RT_REGION__REGIONSIN_RTSTATEMACHINESCANNOTHAVEAFINALSTATE,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "RegionsinRTstatemachinescannothaveafinalstate", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -175,7 +129,7 @@ public class RTRegionImpl extends MinimalEObjectImpl.Container implements RTRegi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -191,7 +145,7 @@ public class RTRegionImpl extends MinimalEObjectImpl.Container implements RTRegi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -207,7 +161,7 @@ public class RTRegionImpl extends MinimalEObjectImpl.Container implements RTRegi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -219,20 +173,4 @@ public class RTRegionImpl extends MinimalEObjectImpl.Container implements RTRegi
 		return super.eIsSet(featureID);

 	}

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	@SuppressWarnings("unchecked")

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-		case UMLRealTimeStateMachPackage.RT_REGION___REGIONSIN_RTSTATEMACHINESCANNOTHAVEAFINALSTATE__DIAGNOSTICCHAIN_MAP:

-			return RegionsinRTstatemachinescannothaveafinalstate((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-

 } // RTRegionImpl

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTStateImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTStateImpl.java
index c8e2d6e196e..44f1fdf0186 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTStateImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTStateImpl.java
@@ -8,32 +8,13 @@
  */

 package org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl;

 

-import java.lang.reflect.InvocationTargetException;

-

-import java.util.Map;

-

 import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.EList;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-

-import org.eclipse.emf.ecore.util.EObjectValidator;

-

 import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState;

 import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage;

-

-import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.util.UMLRealTimeStateMachValidator;

-

 import org.eclipse.uml2.uml.State;

 

 /**

@@ -54,7 +35,7 @@ public class RTStateImpl extends MinimalEObjectImpl.Container implements RTState
 	 * The cached value of the '{@link #getBase_State() <em>Base State</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_State()

 	 * @generated

 	 * @ordered

@@ -64,7 +45,7 @@ public class RTStateImpl extends MinimalEObjectImpl.Container implements RTState
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected RTStateImpl() {

@@ -74,7 +55,7 @@ public class RTStateImpl extends MinimalEObjectImpl.Container implements RTState
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -85,7 +66,7 @@ public class RTStateImpl extends MinimalEObjectImpl.Container implements RTState
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -105,7 +86,7 @@ public class RTStateImpl extends MinimalEObjectImpl.Container implements RTState
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public State basicGetBase_State() {

@@ -115,7 +96,7 @@ public class RTStateImpl extends MinimalEObjectImpl.Container implements RTState
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -130,142 +111,7 @@ public class RTStateImpl extends MinimalEObjectImpl.Container implements RTState
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean AcomposteRTstatehasexactlyoneregion(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeStateMachValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeStateMachValidator.RT_STATE__ACOMPOSTE_RTSTATEHASEXACTLYONEREGION,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "AcomposteRTstatehasexactlyoneregion", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean RTdoesnotsupportsubmachinestates(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeStateMachValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeStateMachValidator.RT_STATE__RTDOESNOTSUPPORTSUBMACHINESTATES,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "RTdoesnotsupportsubmachinestates", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean RTstatemachinesdonotsupportdoactivities(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeStateMachValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeStateMachValidator.RT_STATE__RTSTATEMACHINESDONOTSUPPORTDOACTIVITIES,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "RTstatemachinesdonotsupportdoactivities", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean RTstatemachinescannothaveanydeferredtriggers(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeStateMachValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeStateMachValidator.RT_STATE__RTSTATEMACHINESCANNOTHAVEANYDEFERREDTRIGGERS,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "RTstatemachinescannothaveanydeferredtriggers", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean Constraint5(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeStateMachValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeStateMachValidator.RT_STATE__CONSTRAINT5,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "Constraint5", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -283,7 +129,7 @@ public class RTStateImpl extends MinimalEObjectImpl.Container implements RTState
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -299,7 +145,7 @@ public class RTStateImpl extends MinimalEObjectImpl.Container implements RTState
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -315,7 +161,7 @@ public class RTStateImpl extends MinimalEObjectImpl.Container implements RTState
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -327,28 +173,4 @@ public class RTStateImpl extends MinimalEObjectImpl.Container implements RTState
 		return super.eIsSet(featureID);

 	}

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	@SuppressWarnings("unchecked")

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-		case UMLRealTimeStateMachPackage.RT_STATE___ACOMPOSTE_RTSTATEHASEXACTLYONEREGION__DIAGNOSTICCHAIN_MAP:

-			return AcomposteRTstatehasexactlyoneregion((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		case UMLRealTimeStateMachPackage.RT_STATE___RTDOESNOTSUPPORTSUBMACHINESTATES__DIAGNOSTICCHAIN_MAP:

-			return RTdoesnotsupportsubmachinestates((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		case UMLRealTimeStateMachPackage.RT_STATE___RTSTATEMACHINESDONOTSUPPORTDOACTIVITIES__DIAGNOSTICCHAIN_MAP:

-			return RTstatemachinesdonotsupportdoactivities((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		case UMLRealTimeStateMachPackage.RT_STATE___RTSTATEMACHINESCANNOTHAVEANYDEFERREDTRIGGERS__DIAGNOSTICCHAIN_MAP:

-			return RTstatemachinescannothaveanydeferredtriggers((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		case UMLRealTimeStateMachPackage.RT_STATE___CONSTRAINT5__DIAGNOSTICCHAIN_MAP:

-			return Constraint5((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-

 } // RTStateImpl

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTStateMachineImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTStateMachineImpl.java
index 61ebdb1c636..c78589a3ece 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTStateMachineImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTStateMachineImpl.java
@@ -8,32 +8,13 @@
  */

 package org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl;

 

-import java.lang.reflect.InvocationTargetException;

-

-import java.util.Map;

-

 import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.EList;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-

-import org.eclipse.emf.ecore.util.EObjectValidator;

-

 import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine;

 import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage;

-

-import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.util.UMLRealTimeStateMachValidator;

-

 import org.eclipse.uml2.uml.StateMachine;

 

 /**

@@ -55,7 +36,7 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
 	 * The cached value of the '{@link #getBase_StateMachine() <em>Base State Machine</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_StateMachine()

 	 * @generated

 	 * @ordered

@@ -66,7 +47,7 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
 	 * The default value of the '{@link #isPassive() <em>Is Passive</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #isPassive()

 	 * @generated

 	 * @ordered

@@ -77,7 +58,7 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
 	 * The cached value of the '{@link #isPassive() <em>Is Passive</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #isPassive()

 	 * @generated

 	 * @ordered

@@ -87,7 +68,7 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected RTStateMachineImpl() {

@@ -97,7 +78,7 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -108,7 +89,7 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -128,7 +109,7 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public StateMachine basicGetBase_StateMachine() {

@@ -138,7 +119,7 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -153,7 +134,7 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -164,7 +145,7 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -179,142 +160,7 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean AnRTstatemachinehasexactlyoneregion(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeStateMachValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeStateMachValidator.RT_STATE_MACHINE__AN_RTSTATEMACHINEHASEXACTLYONEREGION,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "AnRTstatemachinehasexactlyoneregion", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean AnRTstatemachineisneverreentrant(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeStateMachValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeStateMachValidator.RT_STATE_MACHINE__AN_RTSTATEMACHINEISNEVERREENTRANT,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "AnRTstatemachineisneverreentrant", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean RTstatemachinesdonothaveparametersorparametersets(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeStateMachValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeStateMachValidator.RT_STATE_MACHINE__RTSTATEMACHINESDONOTHAVEPARAMETERSORPARAMETERSETS,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "RTstatemachinesdonothaveparametersorparametersets", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean RTstatemachinesmusthaveacontextanditmustbeaClass(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeStateMachValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeStateMachValidator.RT_STATE_MACHINE__RTSTATEMACHINESMUSTHAVEACONTEXTANDITMUSTBEA_CLASS,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "RTstatemachinesmusthaveacontextanditmustbeaClass", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean Passivestatemachineareonlyallowedonpassivedataclasses(DiagnosticChain diagnostics, Map<Object, Object> context) {

-		// TODO: implement this method

-		// -> specify the condition that violates the invariant

-		// -> verify the details of the diagnostic, including severity and message

-		// Ensure that you remove @generated or mark it @generated NOT

-		if (false) {

-			if (diagnostics != null) {

-				diagnostics.add

-						(new BasicDiagnostic

-						(Diagnostic.ERROR,

-								UMLRealTimeStateMachValidator.DIAGNOSTIC_SOURCE,

-								UMLRealTimeStateMachValidator.RT_STATE_MACHINE__PASSIVESTATEMACHINEAREONLYALLOWEDONPASSIVEDATACLASSES,

-								EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "Passivestatemachineareonlyallowedonpassivedataclasses", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$

-								new Object[] { this }));

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -334,7 +180,7 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -353,7 +199,7 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -372,7 +218,7 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -389,31 +235,7 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	@SuppressWarnings("unchecked")

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-		case UMLRealTimeStateMachPackage.RT_STATE_MACHINE___AN_RTSTATEMACHINEHASEXACTLYONEREGION__DIAGNOSTICCHAIN_MAP:

-			return AnRTstatemachinehasexactlyoneregion((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		case UMLRealTimeStateMachPackage.RT_STATE_MACHINE___AN_RTSTATEMACHINEISNEVERREENTRANT__DIAGNOSTICCHAIN_MAP:

-			return AnRTstatemachineisneverreentrant((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		case UMLRealTimeStateMachPackage.RT_STATE_MACHINE___RTSTATEMACHINESDONOTHAVEPARAMETERSORPARAMETERSETS__DIAGNOSTICCHAIN_MAP:

-			return RTstatemachinesdonothaveparametersorparametersets((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		case UMLRealTimeStateMachPackage.RT_STATE_MACHINE___RTSTATEMACHINESMUSTHAVEACONTEXTANDITMUSTBEA_CLASS__DIAGNOSTICCHAIN_MAP:

-			return RTstatemachinesmusthaveacontextanditmustbeaClass((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		case UMLRealTimeStateMachPackage.RT_STATE_MACHINE___PASSIVESTATEMACHINEAREONLYALLOWEDONPASSIVEDATACLASSES__DIAGNOSTICCHAIN_MAP:

-			return Passivestatemachineareonlyallowedonpassivedataclasses((DiagnosticChain) arguments.get(0), (Map<Object, Object>) arguments.get(1));

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTTriggerImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTTriggerImpl.java
index 5334725ef88..4c692641c86 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTTriggerImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTTriggerImpl.java
@@ -9,16 +9,12 @@
 package org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl;

 

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

 import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTTrigger;

 import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage;

-

 import org.eclipse.uml2.uml.Operation;

 

 /**

@@ -39,7 +35,7 @@ public class RTTriggerImpl extends MinimalEObjectImpl.Container implements RTTri
 	 * The cached value of the '{@link #getBase_Operation() <em>Base Operation</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getBase_Operation()

 	 * @generated

 	 * @ordered

@@ -49,7 +45,7 @@ public class RTTriggerImpl extends MinimalEObjectImpl.Container implements RTTri
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected RTTriggerImpl() {

@@ -59,7 +55,7 @@ public class RTTriggerImpl extends MinimalEObjectImpl.Container implements RTTri
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -70,7 +66,7 @@ public class RTTriggerImpl extends MinimalEObjectImpl.Container implements RTTri
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -90,7 +86,7 @@ public class RTTriggerImpl extends MinimalEObjectImpl.Container implements RTTri
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public Operation basicGetBase_Operation() {

@@ -100,7 +96,7 @@ public class RTTriggerImpl extends MinimalEObjectImpl.Container implements RTTri
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -115,7 +111,7 @@ public class RTTriggerImpl extends MinimalEObjectImpl.Container implements RTTri
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -133,7 +129,7 @@ public class RTTriggerImpl extends MinimalEObjectImpl.Container implements RTTri
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -149,7 +145,7 @@ public class RTTriggerImpl extends MinimalEObjectImpl.Container implements RTTri
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -165,7 +161,7 @@ public class RTTriggerImpl extends MinimalEObjectImpl.Container implements RTTri
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/UMLRealTimeStateMachFactoryImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/UMLRealTimeStateMachFactoryImpl.java
index 9b5ada5a42d..bb88d8fe226 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/UMLRealTimeStateMachFactoryImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/UMLRealTimeStateMachFactoryImpl.java
@@ -11,18 +11,21 @@ package org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl;
 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

-

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

-

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

-

-import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.*;

+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTPseudostate;

+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTRegion;

+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState;

+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine;

+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTTrigger;

+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachFactory;

+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage;

 

 /**

  * <!-- begin-user-doc -->

  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class UMLRealTimeStateMachFactoryImpl extends EFactoryImpl implements UMLRealTimeStateMachFactory {

@@ -30,7 +33,7 @@ public class UMLRealTimeStateMachFactoryImpl extends EFactoryImpl implements UML
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public static UMLRealTimeStateMachFactory init() {

@@ -49,7 +52,7 @@ public class UMLRealTimeStateMachFactoryImpl extends EFactoryImpl implements UML
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public UMLRealTimeStateMachFactoryImpl() {

@@ -59,7 +62,7 @@ public class UMLRealTimeStateMachFactoryImpl extends EFactoryImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -83,7 +86,7 @@ public class UMLRealTimeStateMachFactoryImpl extends EFactoryImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -95,7 +98,7 @@ public class UMLRealTimeStateMachFactoryImpl extends EFactoryImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -107,7 +110,7 @@ public class UMLRealTimeStateMachFactoryImpl extends EFactoryImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -119,7 +122,7 @@ public class UMLRealTimeStateMachFactoryImpl extends EFactoryImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -131,7 +134,7 @@ public class UMLRealTimeStateMachFactoryImpl extends EFactoryImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -143,7 +146,7 @@ public class UMLRealTimeStateMachFactoryImpl extends EFactoryImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -154,7 +157,7 @@ public class UMLRealTimeStateMachFactoryImpl extends EFactoryImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @deprecated

 	 * @generated

 	 */

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/UMLRealTimeStateMachPackageImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/UMLRealTimeStateMachPackageImpl.java
index 0ee9c18cf1b..5e95a39d5d0 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/UMLRealTimeStateMachPackageImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/UMLRealTimeStateMachPackageImpl.java
@@ -10,14 +10,9 @@ package org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.impl;
 

 import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EGenericType;

-import org.eclipse.emf.ecore.EOperation;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EValidator;

-

 import org.eclipse.emf.ecore.impl.EPackageImpl;

-

 import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTPseudostate;

 import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTRegion;

 import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState;

@@ -25,25 +20,21 @@ import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachin
 import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTTrigger;

 import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachFactory;

 import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage;

-

-import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.util.UMLRealTimeStateMachValidator;

-

 import org.eclipse.uml2.types.TypesPackage;

-

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

  * <!-- begin-user-doc -->

  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UMLRealTimeStateMachPackage {

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass rtStateMachineEClass = null;

@@ -51,7 +42,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass rtRegionEClass = null;

@@ -59,7 +50,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass rtStateEClass = null;

@@ -67,7 +58,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass rtPseudostateEClass = null;

@@ -75,7 +66,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private EClass rtTriggerEClass = null;

@@ -85,7 +76,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	 * package URI value.

 	 * <p>

 	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage#eNS_URI

 	 * @see #init()

@@ -98,7 +89,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

@@ -109,7 +100,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	 * <p>

 	 * This method is used to initialize {@link UMLRealTimeStateMachPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * 

+	 *

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

@@ -135,16 +126,6 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 		// Initialize created meta-data

 		theUMLRealTimeStateMachPackage.initializePackageContents();

 

-		// Register package validator

-		EValidator.Registry.INSTANCE.put

-				(theUMLRealTimeStateMachPackage,

-						new EValidator.Descriptor() {

-							@Override

-							public EValidator getEValidator() {

-								return UMLRealTimeStateMachValidator.INSTANCE;

-							}

-						});

-

 		// Mark meta-data to indicate it can't be changed

 		theUMLRealTimeStateMachPackage.freeze();

 

@@ -157,7 +138,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -168,7 +149,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -179,7 +160,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -190,62 +171,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getRTStateMachine__AnRTstatemachinehasexactlyoneregion__DiagnosticChain_Map() {

-		return rtStateMachineEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getRTStateMachine__AnRTstatemachineisneverreentrant__DiagnosticChain_Map() {

-		return rtStateMachineEClass.getEOperations().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getRTStateMachine__RTstatemachinesdonothaveparametersorparametersets__DiagnosticChain_Map() {

-		return rtStateMachineEClass.getEOperations().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getRTStateMachine__RTstatemachinesmusthaveacontextanditmustbeaClass__DiagnosticChain_Map() {

-		return rtStateMachineEClass.getEOperations().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getRTStateMachine__Passivestatemachineareonlyallowedonpassivedataclasses__DiagnosticChain_Map() {

-		return rtStateMachineEClass.getEOperations().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -256,7 +182,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -267,18 +193,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getRTRegion__RegionsinRTstatemachinescannothaveafinalstate__DiagnosticChain_Map() {

-		return rtRegionEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -289,7 +204,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -300,62 +215,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getRTState__AcomposteRTstatehasexactlyoneregion__DiagnosticChain_Map() {

-		return rtStateEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getRTState__RTdoesnotsupportsubmachinestates__DiagnosticChain_Map() {

-		return rtStateEClass.getEOperations().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getRTState__RTstatemachinesdonotsupportdoactivities__DiagnosticChain_Map() {

-		return rtStateEClass.getEOperations().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getRTState__RTstatemachinescannothaveanydeferredtriggers__DiagnosticChain_Map() {

-		return rtStateEClass.getEOperations().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getRTState__Constraint5__DiagnosticChain_Map() {

-		return rtStateEClass.getEOperations().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -366,7 +226,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -377,18 +237,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EOperation getRTPseudostate__RTstatemachinesdonotsupportconcurrencyorshallowhistory__DiagnosticChain_Map() {

-		return rtPseudostateEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -399,7 +248,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -410,7 +259,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -421,7 +270,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

@@ -431,7 +280,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

@@ -444,27 +293,15 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 		rtStateMachineEClass = createEClass(RT_STATE_MACHINE);

 		createEReference(rtStateMachineEClass, RT_STATE_MACHINE__BASE_STATE_MACHINE);

 		createEAttribute(rtStateMachineEClass, RT_STATE_MACHINE__IS_PASSIVE);

-		createEOperation(rtStateMachineEClass, RT_STATE_MACHINE___AN_RTSTATEMACHINEHASEXACTLYONEREGION__DIAGNOSTICCHAIN_MAP);

-		createEOperation(rtStateMachineEClass, RT_STATE_MACHINE___AN_RTSTATEMACHINEISNEVERREENTRANT__DIAGNOSTICCHAIN_MAP);

-		createEOperation(rtStateMachineEClass, RT_STATE_MACHINE___RTSTATEMACHINESDONOTHAVEPARAMETERSORPARAMETERSETS__DIAGNOSTICCHAIN_MAP);

-		createEOperation(rtStateMachineEClass, RT_STATE_MACHINE___RTSTATEMACHINESMUSTHAVEACONTEXTANDITMUSTBEA_CLASS__DIAGNOSTICCHAIN_MAP);

-		createEOperation(rtStateMachineEClass, RT_STATE_MACHINE___PASSIVESTATEMACHINEAREONLYALLOWEDONPASSIVEDATACLASSES__DIAGNOSTICCHAIN_MAP);

 

 		rtRegionEClass = createEClass(RT_REGION);

 		createEReference(rtRegionEClass, RT_REGION__BASE_REGION);

-		createEOperation(rtRegionEClass, RT_REGION___REGIONSIN_RTSTATEMACHINESCANNOTHAVEAFINALSTATE__DIAGNOSTICCHAIN_MAP);

 

 		rtStateEClass = createEClass(RT_STATE);

 		createEReference(rtStateEClass, RT_STATE__BASE_STATE);

-		createEOperation(rtStateEClass, RT_STATE___ACOMPOSTE_RTSTATEHASEXACTLYONEREGION__DIAGNOSTICCHAIN_MAP);

-		createEOperation(rtStateEClass, RT_STATE___RTDOESNOTSUPPORTSUBMACHINESTATES__DIAGNOSTICCHAIN_MAP);

-		createEOperation(rtStateEClass, RT_STATE___RTSTATEMACHINESDONOTSUPPORTDOACTIVITIES__DIAGNOSTICCHAIN_MAP);

-		createEOperation(rtStateEClass, RT_STATE___RTSTATEMACHINESCANNOTHAVEANYDEFERREDTRIGGERS__DIAGNOSTICCHAIN_MAP);

-		createEOperation(rtStateEClass, RT_STATE___CONSTRAINT5__DIAGNOSTICCHAIN_MAP);

 

 		rtPseudostateEClass = createEClass(RT_PSEUDOSTATE);

 		createEReference(rtPseudostateEClass, RT_PSEUDOSTATE__BASE_PSEUDOSTATE);

-		createEOperation(rtPseudostateEClass, RT_PSEUDOSTATE___RTSTATEMACHINESDONOTSUPPORTCONCURRENCYORSHALLOWHISTORY__DIAGNOSTICCHAIN_MAP);

 

 		rtTriggerEClass = createEClass(RT_TRIGGER);

 		createEReference(rtTriggerEClass, RT_TRIGGER__BASE_OPERATION);

@@ -473,7 +310,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

@@ -483,7 +320,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

@@ -513,189 +350,22 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
 				"base_StateMachine", null, 1, 1, RTStateMachine.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$

 		initEAttribute(getRTStateMachine_IsPassive(), theTypesPackage.getBoolean(), "isPassive", "false", 1, 1, RTStateMachine.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

 

-		EOperation op = initEOperation(getRTStateMachine__AnRTstatemachinehasexactlyoneregion__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "AnRTstatemachinehasexactlyoneregion", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		EGenericType g1 = createEGenericType(ecorePackage.getEMap());

-		EGenericType g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getRTStateMachine__AnRTstatemachineisneverreentrant__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "AnRTstatemachineisneverreentrant", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getRTStateMachine__RTstatemachinesdonothaveparametersorparametersets__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "RTstatemachinesdonothaveparametersorparametersets", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getRTStateMachine__RTstatemachinesmusthaveacontextanditmustbeaClass__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "RTstatemachinesmusthaveacontextanditmustbeaClass", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getRTStateMachine__Passivestatemachineareonlyallowedonpassivedataclasses__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "Passivestatemachineareonlyallowedonpassivedataclasses", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

 		initEClass(rtRegionEClass, RTRegion.class, "RTRegion", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getRTRegion_Base_Region(), theUMLPackage.getRegion(), null, "base_Region", null, 1, 1, RTRegion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$

 

-		op = initEOperation(getRTRegion__RegionsinRTstatemachinescannothaveafinalstate__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "RegionsinRTstatemachinescannothaveafinalstate", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

 		initEClass(rtStateEClass, RTState.class, "RTState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getRTState_Base_State(), theUMLPackage.getState(), null, "base_State", null, 1, 1, RTState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$

 

-		op = initEOperation(getRTState__AcomposteRTstatehasexactlyoneregion__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "AcomposteRTstatehasexactlyoneregion", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getRTState__RTdoesnotsupportsubmachinestates__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "RTdoesnotsupportsubmachinestates", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getRTState__RTstatemachinesdonotsupportdoactivities__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "RTstatemachinesdonotsupportdoactivities", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getRTState__RTstatemachinescannothaveanydeferredtriggers__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "RTstatemachinescannothaveanydeferredtriggers", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getRTState__Constraint5__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "Constraint5", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

 		initEClass(rtPseudostateEClass, RTPseudostate.class, "RTPseudostate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getRTPseudostate_Base_Pseudostate(), theUMLPackage.getPseudostate(), null,

 				"base_Pseudostate", null, 1, 1, RTPseudostate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$

 

-		op = initEOperation(getRTPseudostate__RTstatemachinesdonotsupportconcurrencyorshallowhistory__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "RTstatemachinesdonotsupportconcurrencyorshallowhistory", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		g1 = createEGenericType(ecorePackage.getEMap());

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		g2 = createEGenericType(ecorePackage.getEJavaObject());

-		g1.getETypeArguments().add(g2);

-		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

 		initEClass(rtTriggerEClass, RTTrigger.class, "RTTrigger", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getRTTrigger_Base_Operation(), theUMLPackage.getOperation(), null,

 				"base_Operation", null, 1, 1, RTTrigger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$

 

 		// Create resource

 		createResource(eNS_URI);

-

-		// Create annotations

-		// http://www.eclipse.org/uml2/2.0.0/UML

-		createUMLAnnotations();

-	}

-

-	/**

-	 * Initializes the annotations for <b>http://www.eclipse.org/uml2/2.0.0/UML</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void createUMLAnnotations() {

-		String source = "http://www.eclipse.org/uml2/2.0.0/UML"; //$NON-NLS-1$

-		addAnnotation(getRTStateMachine__AnRTstatemachinehasexactlyoneregion__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "An RT state machine has exactly one region" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getRTStateMachine__AnRTstatemachineisneverreentrant__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "An RT state machine is never re-entrant" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getRTStateMachine__RTstatemachinesdonothaveparametersorparametersets__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "RT state machines do not have parameters or parameter sets" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getRTStateMachine__RTstatemachinesmusthaveacontextanditmustbeaClass__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "RT state machines must have a context and it must be a Class" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getRTStateMachine__Passivestatemachineareonlyallowedonpassivedataclasses__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "Passive state machine are only allowed on passive data classes" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getRTRegion__RegionsinRTstatemachinescannothaveafinalstate__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "Regions in RT state machines cannot have a final state" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getRTState__AcomposteRTstatehasexactlyoneregion__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "A composte RT state has exactly one region" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getRTState__RTdoesnotsupportsubmachinestates__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "RT does not support submachine states" //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getRTState__RTstatemachinesdonotsupportdoactivities__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "RT state machines do not support \"do\" activities" //$NON-NLS-1$ //$NON-NLS-2$ 

-				});

-		addAnnotation(getRTState__RTstatemachinescannothaveanydeferredtriggers__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "RT state machines cannot have any deferred triggers " //$NON-NLS-1$ //$NON-NLS-2$

-				});

-		addAnnotation(getRTPseudostate__RTstatemachinesdonotsupportconcurrencyorshallowhistory__DiagnosticChain_Map(),

-				source,

-				new String[] { "originalName", "RT state machines do not support concurrency or shallow history" //$NON-NLS-1$ //$NON-NLS-2$

-				});

 	}

 

 } // UMLRealTimeStateMachPackageImpl

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachAdapterFactory.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachAdapterFactory.java
index a4c940e3207..126c42adb9a 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachAdapterFactory.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachAdapterFactory.java
@@ -10,19 +10,21 @@ package org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.util;
 

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notifier;

-

 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-

 import org.eclipse.emf.ecore.EObject;

-

-import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.*;

+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTPseudostate;

+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTRegion;

+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState;

+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine;

+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTTrigger;

+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage;

 

 /**

  * <!-- begin-user-doc -->

  * The <b>Adapter Factory</b> for the model.

  * It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage

  * @generated

  */

@@ -31,7 +33,7 @@ public class UMLRealTimeStateMachAdapterFactory extends AdapterFactoryImpl {
 	 * The cached model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected static UMLRealTimeStateMachPackage modelPackage;

@@ -40,7 +42,7 @@ public class UMLRealTimeStateMachAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public UMLRealTimeStateMachAdapterFactory() {

@@ -54,7 +56,7 @@ public class UMLRealTimeStateMachAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

@@ -73,7 +75,7 @@ public class UMLRealTimeStateMachAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected UMLRealTimeStateMachSwitch<Adapter> modelSwitch =

@@ -113,7 +115,7 @@ public class UMLRealTimeStateMachAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param target

 	 *            the object to adapt.

 	 * @return the adapter for the <code>target</code>.

@@ -131,7 +133,7 @@ public class UMLRealTimeStateMachAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine

 	 * @generated

@@ -146,7 +148,7 @@ public class UMLRealTimeStateMachAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTRegion

 	 * @generated

@@ -161,7 +163,7 @@ public class UMLRealTimeStateMachAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState

 	 * @generated

@@ -176,7 +178,7 @@ public class UMLRealTimeStateMachAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTPseudostate

 	 * @generated

@@ -191,7 +193,7 @@ public class UMLRealTimeStateMachAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTTrigger

 	 * @generated

@@ -205,7 +207,7 @@ public class UMLRealTimeStateMachAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachResourceFactoryImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachResourceFactoryImpl.java
index b7dc7d659b4..eea6c5ba236 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachResourceFactoryImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachResourceFactoryImpl.java
@@ -9,18 +9,15 @@
 package org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.util;

 

 import org.eclipse.emf.common.util.URI;

-

 import org.eclipse.emf.ecore.resource.Resource;

-

 import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

-

 import org.eclipse.emf.ecore.xmi.XMLResource;

 

 /**

  * <!-- begin-user-doc -->

  * The <b>Resource Factory</b> associated with the package.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.util.UMLRealTimeStateMachResourceImpl

  * @generated

  */

@@ -29,7 +26,7 @@ public class UMLRealTimeStateMachResourceFactoryImpl extends ResourceFactoryImpl
 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public UMLRealTimeStateMachResourceFactoryImpl() {

@@ -40,7 +37,7 @@ public class UMLRealTimeStateMachResourceFactoryImpl extends ResourceFactoryImpl
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachResourceImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachResourceImpl.java
index 395abb2c268..619e2f350b6 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachResourceImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachResourceImpl.java
@@ -9,14 +9,13 @@
 package org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.util;

 

 import org.eclipse.emf.common.util.URI;

-

 import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

 

 /**

  * <!-- begin-user-doc -->

  * The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.util.UMLRealTimeStateMachResourceFactoryImpl

  * @generated

  */

@@ -25,7 +24,7 @@ public class UMLRealTimeStateMachResourceImpl extends XMLResourceImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param uri

 	 *            the URI of the new resource.

 	 * @generated

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachSwitch.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachSwitch.java
index 34141b00b3d..e71f78c6a16 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachSwitch.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachSwitch.java
@@ -10,10 +10,13 @@ package org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.util;
 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

-

 import org.eclipse.emf.ecore.util.Switch;

-

-import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.*;

+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTPseudostate;

+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTRegion;

+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTState;

+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTStateMachine;

+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTTrigger;

+import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage;

 

 /**

  * <!-- begin-user-doc -->

@@ -24,7 +27,7 @@ import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.*;
  * until a non-null result is returned,

  * which is the result of the switch.

  * <!-- end-user-doc -->

- * 

+ *

  * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage

  * @generated

  */

@@ -33,7 +36,7 @@ public class UMLRealTimeStateMachSwitch<T> extends Switch<T> {
 	 * The cached model package

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected static UMLRealTimeStateMachPackage modelPackage;

@@ -42,7 +45,7 @@ public class UMLRealTimeStateMachSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public UMLRealTimeStateMachSwitch() {

@@ -55,7 +58,7 @@ public class UMLRealTimeStateMachSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @parameter ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

@@ -69,7 +72,7 @@ public class UMLRealTimeStateMachSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

@@ -127,7 +130,7 @@ public class UMLRealTimeStateMachSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

 	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>RT State Machine</em>'.

@@ -144,7 +147,7 @@ public class UMLRealTimeStateMachSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

 	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>RT Region</em>'.

@@ -161,7 +164,7 @@ public class UMLRealTimeStateMachSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

 	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>RT State</em>'.

@@ -178,7 +181,7 @@ public class UMLRealTimeStateMachSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

 	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>RT Pseudostate</em>'.

@@ -195,7 +198,7 @@ public class UMLRealTimeStateMachSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

 	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>RT Trigger</em>'.

@@ -212,7 +215,7 @@ public class UMLRealTimeStateMachSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch, but this is the last case anyway.

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param object

 	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachValidator.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachValidator.java
deleted file mode 100644
index b2e8b3d3441..00000000000
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachValidator.java
+++ /dev/null
@@ -1,558 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- */

-package org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.util;

-

-import java.util.Map;

-

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.ResourceLocator;

-

-import org.eclipse.emf.ecore.EPackage;

-

-import org.eclipse.emf.ecore.util.EObjectValidator;

-

-import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.*;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Validator</b> for the model.

- * <!-- end-user-doc -->

- * 

- * @see org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage

- * @generated

- */

-public class UMLRealTimeStateMachValidator extends EObjectValidator {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final UMLRealTimeStateMachValidator INSTANCE = new UMLRealTimeStateMachValidator();

-

-	/**

-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()

-	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()

-	 * @generated

-	 */

-	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach"; //$NON-NLS-1$

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'An RTstatemachinehasexactlyoneregion' of 'RT State Machine'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int RT_STATE_MACHINE__AN_RTSTATEMACHINEHASEXACTLYONEREGION = 1;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'An RTstatemachineisneverreentrant' of 'RT State Machine'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int RT_STATE_MACHINE__AN_RTSTATEMACHINEISNEVERREENTRANT = 2;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'RTstatemachinesdonothaveparametersorparametersets' of 'RT State Machine'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int RT_STATE_MACHINE__RTSTATEMACHINESDONOTHAVEPARAMETERSORPARAMETERSETS = 3;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'RTstatemachinesmusthaveacontextanditmustbea Class' of 'RT State Machine'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int RT_STATE_MACHINE__RTSTATEMACHINESMUSTHAVEACONTEXTANDITMUSTBEA_CLASS = 4;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Passivestatemachineareonlyallowedonpassivedataclasses' of 'RT State Machine'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int RT_STATE_MACHINE__PASSIVESTATEMACHINEAREONLYALLOWEDONPASSIVEDATACLASSES = 5;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Regionsin RTstatemachinescannothaveafinalstate' of 'RT Region'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int RT_REGION__REGIONSIN_RTSTATEMACHINESCANNOTHAVEAFINALSTATE = 6;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Acomposte RTstatehasexactlyoneregion' of 'RT State'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int RT_STATE__ACOMPOSTE_RTSTATEHASEXACTLYONEREGION = 7;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'RTdoesnotsupportsubmachinestates' of 'RT State'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int RT_STATE__RTDOESNOTSUPPORTSUBMACHINESTATES = 8;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'RTstatemachinesdonotsupportdoactivities' of 'RT State'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int RT_STATE__RTSTATEMACHINESDONOTSUPPORTDOACTIVITIES = 9;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'RTstatemachinescannothaveanydeferredtriggers' of 'RT State'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int RT_STATE__RTSTATEMACHINESCANNOTHAVEANYDEFERREDTRIGGERS = 10;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Constraint5' of 'RT State'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int RT_STATE__CONSTRAINT5 = 11;

-

-	/**

-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'RTstatemachinesdonotsupportconcurrencyorshallowhistory' of 'RT Pseudostate'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final int RT_PSEUDOSTATE__RTSTATEMACHINESDONOTSUPPORTCONCURRENCYORSHALLOWHISTORY = 12;

-

-	/**

-	 * A constant with a fixed name that can be used as the base value for additional hand written constants.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 12;

-

-	/**

-	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public UMLRealTimeStateMachValidator() {

-		super();

-	}

-

-	/**

-	 * Returns the package of this validator switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	protected EPackage getEPackage() {

-		return UMLRealTimeStateMachPackage.eINSTANCE;

-	}

-

-	/**

-	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		switch (classifierID) {

-		case UMLRealTimeStateMachPackage.RT_STATE_MACHINE:

-			return validateRTStateMachine((RTStateMachine) value, diagnostics, context);

-		case UMLRealTimeStateMachPackage.RT_REGION:

-			return validateRTRegion((RTRegion) value, diagnostics, context);

-		case UMLRealTimeStateMachPackage.RT_STATE:

-			return validateRTState((RTState) value, diagnostics, context);

-		case UMLRealTimeStateMachPackage.RT_PSEUDOSTATE:

-			return validateRTPseudostate((RTPseudostate) value, diagnostics, context);

-		case UMLRealTimeStateMachPackage.RT_TRIGGER:

-			return validateRTTrigger((RTTrigger) value, diagnostics, context);

-		default:

-			return true;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTStateMachine(RTStateMachine rtStateMachine, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if (!validate_NoCircularContainment(rtStateMachine, diagnostics, context)) {

-			return false;

-		}

-		boolean result = validate_EveryMultiplicityConforms(rtStateMachine, diagnostics, context);

-		if (result || diagnostics != null) {

-			result &= validate_EveryDataValueConforms(rtStateMachine, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryReferenceIsContained(rtStateMachine, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryBidirectionalReferenceIsPaired(rtStateMachine, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryProxyResolves(rtStateMachine, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_UniqueID(rtStateMachine, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryKeyUnique(rtStateMachine, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryMapEntryUnique(rtStateMachine, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateRTStateMachine_AnRTstatemachinehasexactlyoneregion(rtStateMachine, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateRTStateMachine_AnRTstatemachineisneverreentrant(rtStateMachine, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateRTStateMachine_RTstatemachinesdonothaveparametersorparametersets(rtStateMachine, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateRTStateMachine_RTstatemachinesmusthaveacontextanditmustbeaClass(rtStateMachine, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateRTStateMachine_Passivestatemachineareonlyallowedonpassivedataclasses(rtStateMachine, diagnostics, context);

-		}

-		return result;

-	}

-

-	/**

-	 * Validates the AnRTstatemachinehasexactlyoneregion constraint of '<em>RT State Machine</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTStateMachine_AnRTstatemachinehasexactlyoneregion(RTStateMachine rtStateMachine, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return rtStateMachine.AnRTstatemachinehasexactlyoneregion(diagnostics, context);

-	}

-

-	/**

-	 * Validates the AnRTstatemachineisneverreentrant constraint of '<em>RT State Machine</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTStateMachine_AnRTstatemachineisneverreentrant(RTStateMachine rtStateMachine, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return rtStateMachine.AnRTstatemachineisneverreentrant(diagnostics, context);

-	}

-

-	/**

-	 * Validates the RTstatemachinesdonothaveparametersorparametersets constraint of '<em>RT State Machine</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTStateMachine_RTstatemachinesdonothaveparametersorparametersets(RTStateMachine rtStateMachine, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return rtStateMachine.RTstatemachinesdonothaveparametersorparametersets(diagnostics, context);

-	}

-

-	/**

-	 * Validates the RTstatemachinesmusthaveacontextanditmustbeaClass constraint of '<em>RT State Machine</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTStateMachine_RTstatemachinesmusthaveacontextanditmustbeaClass(RTStateMachine rtStateMachine, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return rtStateMachine.RTstatemachinesmusthaveacontextanditmustbeaClass(diagnostics, context);

-	}

-

-	/**

-	 * Validates the Passivestatemachineareonlyallowedonpassivedataclasses constraint of '<em>RT State Machine</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTStateMachine_Passivestatemachineareonlyallowedonpassivedataclasses(RTStateMachine rtStateMachine, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return rtStateMachine.Passivestatemachineareonlyallowedonpassivedataclasses(diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTRegion(RTRegion rtRegion, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if (!validate_NoCircularContainment(rtRegion, diagnostics, context)) {

-			return false;

-		}

-		boolean result = validate_EveryMultiplicityConforms(rtRegion, diagnostics, context);

-		if (result || diagnostics != null) {

-			result &= validate_EveryDataValueConforms(rtRegion, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryReferenceIsContained(rtRegion, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryBidirectionalReferenceIsPaired(rtRegion, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryProxyResolves(rtRegion, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_UniqueID(rtRegion, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryKeyUnique(rtRegion, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryMapEntryUnique(rtRegion, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateRTRegion_RegionsinRTstatemachinescannothaveafinalstate(rtRegion, diagnostics, context);

-		}

-		return result;

-	}

-

-	/**

-	 * Validates the RegionsinRTstatemachinescannothaveafinalstate constraint of '<em>RT Region</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTRegion_RegionsinRTstatemachinescannothaveafinalstate(RTRegion rtRegion, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return rtRegion.RegionsinRTstatemachinescannothaveafinalstate(diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTState(RTState rtState, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if (!validate_NoCircularContainment(rtState, diagnostics, context)) {

-			return false;

-		}

-		boolean result = validate_EveryMultiplicityConforms(rtState, diagnostics, context);

-		if (result || diagnostics != null) {

-			result &= validate_EveryDataValueConforms(rtState, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryReferenceIsContained(rtState, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryBidirectionalReferenceIsPaired(rtState, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryProxyResolves(rtState, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_UniqueID(rtState, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryKeyUnique(rtState, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryMapEntryUnique(rtState, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateRTState_AcomposteRTstatehasexactlyoneregion(rtState, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateRTState_RTdoesnotsupportsubmachinestates(rtState, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateRTState_RTstatemachinesdonotsupportdoactivities(rtState, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateRTState_RTstatemachinescannothaveanydeferredtriggers(rtState, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateRTState_Constraint5(rtState, diagnostics, context);

-		}

-		return result;

-	}

-

-	/**

-	 * Validates the AcomposteRTstatehasexactlyoneregion constraint of '<em>RT State</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTState_AcomposteRTstatehasexactlyoneregion(RTState rtState, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return rtState.AcomposteRTstatehasexactlyoneregion(diagnostics, context);

-	}

-

-	/**

-	 * Validates the RTdoesnotsupportsubmachinestates constraint of '<em>RT State</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTState_RTdoesnotsupportsubmachinestates(RTState rtState, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return rtState.RTdoesnotsupportsubmachinestates(diagnostics, context);

-	}

-

-	/**

-	 * Validates the RTstatemachinesdonotsupportdoactivities constraint of '<em>RT State</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTState_RTstatemachinesdonotsupportdoactivities(RTState rtState, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return rtState.RTstatemachinesdonotsupportdoactivities(diagnostics, context);

-	}

-

-	/**

-	 * Validates the RTstatemachinescannothaveanydeferredtriggers constraint of '<em>RT State</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTState_RTstatemachinescannothaveanydeferredtriggers(RTState rtState, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return rtState.RTstatemachinescannothaveanydeferredtriggers(diagnostics, context);

-	}

-

-	/**

-	 * Validates the Constraint5 constraint of '<em>RT State</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTState_Constraint5(RTState rtState, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return rtState.Constraint5(diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTPseudostate(RTPseudostate rtPseudostate, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if (!validate_NoCircularContainment(rtPseudostate, diagnostics, context)) {

-			return false;

-		}

-		boolean result = validate_EveryMultiplicityConforms(rtPseudostate, diagnostics, context);

-		if (result || diagnostics != null) {

-			result &= validate_EveryDataValueConforms(rtPseudostate, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryReferenceIsContained(rtPseudostate, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryBidirectionalReferenceIsPaired(rtPseudostate, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryProxyResolves(rtPseudostate, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_UniqueID(rtPseudostate, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryKeyUnique(rtPseudostate, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validate_EveryMapEntryUnique(rtPseudostate, diagnostics, context);

-		}

-		if (result || diagnostics != null) {

-			result &= validateRTPseudostate_RTstatemachinesdonotsupportconcurrencyorshallowhistory(rtPseudostate, diagnostics, context);

-		}

-		return result;

-	}

-

-	/**

-	 * Validates the RTstatemachinesdonotsupportconcurrencyorshallowhistory constraint of '<em>RT Pseudostate</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTPseudostate_RTstatemachinesdonotsupportconcurrencyorshallowhistory(RTPseudostate rtPseudostate, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return rtPseudostate.RTstatemachinesdonotsupportconcurrencyorshallowhistory(diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public boolean validateRTTrigger(RTTrigger rtTrigger, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(rtTrigger, diagnostics, context);

-	}

-

-	/**

-	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		// TODO

-		// Specialize this to return a resource locator for messages specific to this validator.

-		// Ensure that you remove @generated or mark it @generated NOT

-		return super.getResourceLocator();

-	}

-

-} // UMLRealTimeStateMachValidator

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachXMLProcessor.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachXMLProcessor.java
index 5287e5c54a8..549a989b75a 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachXMLProcessor.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachXMLProcessor.java
@@ -11,18 +11,15 @@ package org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.util;
 import java.util.Map;

 

 import org.eclipse.emf.ecore.EPackage;

-

 import org.eclipse.emf.ecore.resource.Resource;

-

 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

-

 import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.UMLRealTimeStateMachPackage;

 

 /**

  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

+ *

  * @generated

  */

 public class UMLRealTimeStateMachXMLProcessor extends XMLProcessor {

@@ -31,7 +28,7 @@ public class UMLRealTimeStateMachXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public UMLRealTimeStateMachXMLProcessor() {

@@ -43,7 +40,7 @@ public class UMLRealTimeStateMachXMLProcessor extends XMLProcessor {
 	 * Register for "*" and "xml" file extensions the UMLRealTimeStateMachResourceFactoryImpl factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTime.ecore b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTime.ecore
index 4fc6179fd3c..cb3de54e202 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTime.ecore
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTime.ecore
@@ -1,205 +1,10 @@
 <?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="UMLRealTime" nsURI="http:///UMLRealTime.ecore" nsPrefix="UMLRealTime">

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="UMLRealTime" nsURI="http://www.eclipse.org/papyrus/umlrt" nsPrefix="UMLRealTime">

   <eClassifiers xsi:type="ecore:EClass" name="Capsule">

-    <eOperations name="Capsulesarealwaysactive" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="Capsules are always active"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="base_Class.isActive"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

-    <eOperations name="AcapsulecannothaveReceptionfeatures" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="A capsule cannot have Reception features"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="base_Class.ownedReception->isEmpty()"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

-    <eOperations name="Acapsuleclasscanalwaysbesubclassed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="A capsule class can always be subclassed"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="not(base_Class.isFinalSpecialization)"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

-    <eOperations name="Acapsulecanhaveatmostonesuperclass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="A capsule can have at most one superclass"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="(base_Class.generalization->size()) &lt;= 1"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

-    <eOperations name="Capsuleclassesarealwayssubstitutable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="Capsule classes are always substitutable"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

-    <eOperations name="Allattributesofacapsuleclasshaveexactlyonetype" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="All attributes of a capsule class have exactly one type"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

-    <eOperations name="Privatevisibilityisnotsupportedoncapsulefeatures" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="Private visibility is not supported on capsule features"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="base_Class.feature->forAll (f | f.visibility &lt;> UML::VisibilityKind::private)"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

-    <eOperations name="Acapsuleclasscannothavenestedclassifiers" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="A capsule class cannot have nested classifiers"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="base_Class.nestedClassifier->isEmpty()"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

-    <eOperations name="Alloperationsofacapsulearesequential" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="All operations of a capsule are sequential"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = UML::CallConcurrencyKind::sequential))"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="base_Class.isActive&#xD;&#xA;base_Class.ownedReception->isEmpty()&#xD;&#xA;not(base_Class.isFinalSpecialization)&#xD;&#xA;(base_Class.generalization->size()) &lt;= 1&#xD;&#xA;(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))&#xD;&#xA;base_Class.ownedAttribute->forAll(at | at.type->size() = 1)&#xD;&#xA;base_Class.feature->forAll (f | f.visibility &lt;> UML::VisibilityKind::private)&#xD;&#xA;base_Class.nestedClassifier->isEmpty()&#xD;&#xA;base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = UML::CallConcurrencyKind::sequential))"/>

+    </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" ordered="false"

         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Class"/>

   </eClassifiers>

@@ -208,120 +13,16 @@
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Property"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Protocol">

-    <eOperations name="Protocolscanhaveatmostonegeneralization" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="Protocols can have at most one generalization"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="base_Collaboration.generalization->size() &lt;= 1"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="base_Collaboration.generalization->size() &lt;= 1"/>

+    </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Collaboration" ordered="false"

         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Collaboration"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="RTPort">

-    <eOperations name="Awiredportcannotpublishitsname" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="A wired port cannot publish its name"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="isWired implies not isPublish"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

-    <eOperations name="Apublicportmustbedefinedasaserviceport" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="A public port must be defined as a service port"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="(base_Port.visibility = UML::VisibilityKind::public) &#xD;&#xA;    implies base_Port.isService  "/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

-    <eOperations name="ASAPunwiredunpublishedmusthaveprotectedvisibility" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="A SAP (unwired &amp; unpublished) must have protected visibility "/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="(not isWired and not isPublish) &#xD;&#xA;   implies (base_Port.visibility = UML::VisibilityKind::protected)"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

-    <eOperations name="AnSPPunwiredandpublishedmusthavepublicvisibility" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="An SPP (unwired and published) must have public visibility"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="(not isWired and isPublish) implies &#xD;&#xA;   (base_Port.visibility = UML::VisibilityKind::public)"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="isWired implies not isPublish&#xD;&#xA;(base_Port.visibility = UML::VisibilityKind::public) &#xD;&#xA;    implies base_Port.isService  &#xD;&#xA;(not isWired and not isPublish) &#xD;&#xA;   implies (base_Port.visibility = UML::VisibilityKind::protected)&#xD;&#xA;(not isWired and isPublish) implies &#xD;&#xA;   (base_Port.visibility = UML::VisibilityKind::public)"/>

+    </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="isNotification" ordered="false"

         lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"

         defaultValueLiteral="false"/>

@@ -345,28 +46,9 @@
     <eLiterals name="ApplicationLocked" value="2"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="RTConnector">

-    <eOperations name="Onlybinaryconnectorsareallowed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="Only binary connectors are allowed"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="base_Connector.end->size() = 2"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="base_Connector.end->size() = 2"/>

+    </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Connector" ordered="false"

         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Connector"/>

   </eClassifiers>

@@ -375,28 +57,9 @@
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Package"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="RTRExcludedElement">

-    <eOperations name="ExclusioncanonlybeappliedtosomeUMLRTmodelelements" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="Exclusion can only be applied to some UML-RT model elements"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="let el = base_RedefinableElement in&#xD;&#xA;(el.oclIsKindOf(UML::Port) or&#xD;&#xA; el.oclIsKindOf(UML::Property) or&#xD;&#xA; el.oclIsKindOf(UML::Operation) or&#xD;&#xA; el.oclIsKindOf(UML::Behavior) or&#xD;&#xA;el.oclIsKindOf(UML::State) or&#xD;&#xA;el.oclIsKindOf(UML::Transition))"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="let el = base_RedefinableElement in&#xD;&#xA;(el.oclIsKindOf(UML::Port) or&#xD;&#xA; el.oclIsKindOf(UML::Property) or&#xD;&#xA; el.oclIsKindOf(UML::Operation) or&#xD;&#xA; el.oclIsKindOf(UML::Behavior) or&#xD;&#xA;el.oclIsKindOf(UML::State) or&#xD;&#xA;el.oclIsKindOf(UML::Transition))"/>

+    </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EReference" name="base_RedefinableElement"

         ordered="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//RedefinableElement"/>

   </eClassifiers>

@@ -404,7 +67,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Interface" ordered="false"

         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Interface"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="rtMsgKind" ordered="false"

-        lowerBound="1" eType="#//RTMessageKind" defaultValueLiteral="true"/>

+        lowerBound="1" eType="#//RTMessageKind" defaultValueLiteral="in"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EEnum" name="RTMessageKind">

     <eLiterals name="in"/>

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTimeSM-addendum.profile.uml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTimeSM-addendum.profile.uml
index c88cc1c3c4b..086f65e4398 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTimeSM-addendum.profile.uml
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTimeSM-addendum.profile.uml
@@ -1,5010 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:PapyrusDSMLValidationRule="http://www.eclipse.org/papyrus/dsmlvalidation" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">

-  <uml:Profile xmi:id="_KLcn0FDtEeOA4ecmvfqvaw" name="UMLRealTimeStateMach" metaclassReference="_wVhWMFDtEeOA4ecmvfqvaw _CWExkFDuEeOA4ecmvfqvaw _CWExkVDuEeOA4ecmvfqvaw _CWExklDuEeOA4ecmvfqvaw _imhMgGfLEeO447LqwGjc0A" metamodelReference="_KLcn0VDtEeOA4ecmvfqvaw">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqcFD6EeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-      <contents xmi:type="ecore:EPackage" xmi:id="_6Tmz0BMoEeSz2qq_H0HScA" name="UMLRealTimeStateMach" nsURI="http:///schemas/UMLRealTimeStateMach/_6TmMwBMoEeSz2qq_H0HScA/14" nsPrefix="UMLRealTimeStateMach">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tmz0RMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tmz0hMoEeSz2qq_H0HScA" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tp3IBMoEeSz2qq_H0HScA" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tp3IRMoEeSz2qq_H0HScA" key="Version" value="0.1.11"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tp3IhMoEeSz2qq_H0HScA" key="Comment" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tp3IxMoEeSz2qq_H0HScA" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tp3JBMoEeSz2qq_H0HScA" key="Date" value="2014-07-24"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tp3JRMoEeSz2qq_H0HScA" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_6Tmz0xMoEeSz2qq_H0HScA" name="RTStateMachine">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tmz1BMoEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xie4kFDtEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_6Tmz1RMoEeSz2qq_H0HScA" name="AnRTstatemachinehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tmz1hMoEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tmz1xMoEeSz2qq_H0HScA" key="originalName" value="An RT state machine has exactly one region"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tmz2BMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tmz2RMoEeSz2qq_H0HScA" key="body" value="base_StateMachine.region->size() = 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tmz2xMoEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tmz3BMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tmz3RMoEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tmz3xMoEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tmz4BMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tmz4RMoEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_6Tmz4hMoEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tmz4xMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tmz5BMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_6Tmz5RMoEeSz2qq_H0HScA" name="AnRTstatemachineisneverreentrant">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tmz5hMoEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tmz5xMoEeSz2qq_H0HScA" key="originalName" value="An RT state machine is never re-entrant"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tmz6BMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tmz6RMoEeSz2qq_H0HScA" key="body" value="not base_StateMachine.isReentrant"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tmz6xMoEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tmz7BMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tmz7RMoEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tmz7xMoEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tmz8BMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tmz8RMoEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_6Tmz8hMoEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tmz8xMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tmz9BMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_6Tmz9RMoEeSz2qq_H0HScA" name="RTstatemachinesdonothaveparametersorparametersets">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tmz9hMoEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tmz9xMoEeSz2qq_H0HScA" key="originalName" value="RT state machines do not have parameters or parameter sets"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tmz-BMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tmz-RMoEeSz2qq_H0HScA" key="body" value="(base_StateMachine.ownedParameter->size()=0) and &#xD;&#xA;(base_StateMachine.ownedParameterSet->size() = 0)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tmz-xMoEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tmz_BMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tmz_RMoEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tmz_xMoEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0ABMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0ARMoEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_6Tm0AhMoEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0AxMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0BBMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_6Tm0BRMoEeSz2qq_H0HScA" name="RTstatemachinesmusthaveacontextanditmustbeaClass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0BhMoEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0BxMoEeSz2qq_H0HScA" key="originalName" value="RT state machines must have a context and it must be a Class"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0CBMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0CRMoEeSz2qq_H0HScA" key="body" value="(base_StateMachine.behavioredClassifier->size()=1) &#xD;&#xA;and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tm0CxMoEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0DBMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0DRMoEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tm0DxMoEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0EBMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0ERMoEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_6Tm0EhMoEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0ExMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0FBMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_6Tm0FRMoEeSz2qq_H0HScA" name="Passivestatemachineareonlyallowedonpassivedataclasses">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0FhMoEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0FxMoEeSz2qq_H0HScA" key="originalName" value="Passive state machine are only allowed on passive data classes"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0GBMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0GRMoEeSz2qq_H0HScA" key="body" value="isPassive = not (base_StateMachine.behavioredClassifier.oclAsType(Class).isActive) "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tm0GxMoEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0HBMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0HRMoEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tm0HxMoEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0IBMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0IRMoEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_6Tm0IhMoEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0IxMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0JBMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6Tm0JRMoEeSz2qq_H0HScA" name="base_StateMachine" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6Tm0JxMoEeSz2qq_H0HScA" name="isPassive" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <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="_6Tm0KRMoEeSz2qq_H0HScA" name="RTRegion">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0KhMoEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_H1bWMFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_6Tm0KxMoEeSz2qq_H0HScA" name="RegionsinRTstatemachinescannothaveafinalstate">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0LBMoEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0LRMoEeSz2qq_H0HScA" key="originalName" value="Regions in RT state machines cannot have a final state"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0LhMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0LxMoEeSz2qq_H0HScA" key="body" value="base_Region.subvertex->forAll&#xD;&#xA;      (v | not v.oclIsKindOf(FinalState))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tm0MRMoEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0MhMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0MxMoEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tm0NRMoEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0NhMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0NxMoEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_6Tm0OBMoEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0ORMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0OhMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6Tm0OxMoEeSz2qq_H0HScA" name="base_Region" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Region"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_6Tm0PRMoEeSz2qq_H0HScA" name="RTState">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0PhMoEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KKLAAFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_6Tm0PxMoEeSz2qq_H0HScA" name="AcomposteRTstatehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0QBMoEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0QRMoEeSz2qq_H0HScA" key="originalName" value="A composte RT state has exactly one region"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0QhMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0QxMoEeSz2qq_H0HScA" key="body" value="base_State.isComposite implies &#xD;&#xA;           (base_State.region->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tm0RRMoEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0RhMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0RxMoEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tm0SRMoEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0ShMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0SxMoEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_6Tm0TBMoEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0TRMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0ThMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_6Tm0TxMoEeSz2qq_H0HScA" name="RTdoesnotsupportsubmachinestates">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0UBMoEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0URMoEeSz2qq_H0HScA" key="originalName" value="RT does not support submachine states"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0UhMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0UxMoEeSz2qq_H0HScA" key="body" value="not base_State.isSubmachineState"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tm0VRMoEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0VhMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0VxMoEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tm0WRMoEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0WhMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0WxMoEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_6Tm0XBMoEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0XRMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0XhMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_6Tm0XxMoEeSz2qq_H0HScA" name="RTstatemachinesdonotsupportdoactivities">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0YBMoEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0YRMoEeSz2qq_H0HScA" key="originalName" value="RT state machines do not support &quot;do&quot; activities"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0YhMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0YxMoEeSz2qq_H0HScA" key="body" value="base_State.doActivity->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tm0ZRMoEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0ZhMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0ZxMoEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tm0aRMoEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0ahMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0axMoEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_6Tm0bBMoEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0bRMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0bhMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_6Tm0bxMoEeSz2qq_H0HScA" name="RTstatemachinescannothaveanydeferredtriggers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0cBMoEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0cRMoEeSz2qq_H0HScA" key="originalName" value="RT state machines cannot have any deferred triggers "/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0chMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0cxMoEeSz2qq_H0HScA" key="body" value="base_State.deferrableTrigger->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tm0dRMoEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0dhMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0dxMoEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tm0eRMoEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0ehMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0exMoEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_6Tm0fBMoEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0fRMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0fhMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_6Tm0fxMoEeSz2qq_H0HScA" name="Constraint5">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tm0gRMoEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0ghMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0gxMoEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tm0hRMoEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0hhMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0hxMoEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_6Tm0iBMoEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0iRMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0ihMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6Tm0ixMoEeSz2qq_H0HScA" name="base_State" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_6Tm0jRMoEeSz2qq_H0HScA" name="RTPseudostate">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0jhMoEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_NHLjsFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_6Tm0jxMoEeSz2qq_H0HScA" name="RTstatemachinesdonotsupportconcurrencyorshallowhistory">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0kBMoEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0kRMoEeSz2qq_H0HScA" key="originalName" value="RT state machines do not support concurrency or shallow history"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0khMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0kxMoEeSz2qq_H0HScA" key="body" value="let knd = base_Pseudostate.kind in &#xD;&#xA;   (knd &lt;> UML::PseudostateKind::shallowHistory) and&#xD;&#xA;   (knd &lt;> UML::PseudostateKind::fork) and&#xD;&#xA;   (knd &lt;> UML::PseudostateKind::join)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tm0lRMoEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0lhMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0lxMoEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_6Tm0mRMoEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0mhMoEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6Tm0mxMoEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_6Tm0nBMoEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0nRMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_6Tm0nhMoEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6Tm0nxMoEeSz2qq_H0HScA" name="base_Pseudostate" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Pseudostate"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_6Tm0oRMoEeSz2qq_H0HScA" name="RTTrigger">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6Tm0ohMoEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_j4X18GfLEeO447LqwGjc0A"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6Tm0oxMoEeSz2qq_H0HScA" name="base_Operation" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_Yz8z4Ab4EeSFB8mUNT_s_w" name="UMLRealTimeStateMach" nsURI="http:///schemas/UMLRealTimeStateMach/_Yz8M0Ab4EeSFB8mUNT_s_w/13" nsPrefix="UMLRealTimeStateMach">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz8z4Qb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz8z4gb4EeSFB8mUNT_s_w" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y0BFUAb4EeSFB8mUNT_s_w" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y0BFUQb4EeSFB8mUNT_s_w" key="Version" value="0.1.10"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y0BFUgb4EeSFB8mUNT_s_w" key="Comment" value="Minor UI adjustments"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y0BFUwb4EeSFB8mUNT_s_w" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y0BFVAb4EeSFB8mUNT_s_w" key="Date" value="2014-07-08"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y0BFVQb4EeSFB8mUNT_s_w" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Yz8z4wb4EeSFB8mUNT_s_w" name="RTStateMachine">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz8z5Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xie4kFDtEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yz8z5Qb4EeSFB8mUNT_s_w" name="AnRTstatemachinehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz8z5gb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz8z5wb4EeSFB8mUNT_s_w" key="originalName" value="An RT state machine has exactly one region"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz8z6Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz8z6Qb4EeSFB8mUNT_s_w" key="body" value="base_StateMachine.region->size() = 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz8z6wb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz8z7Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz8z7Qb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz8z7wb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz8z8Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz8z8Qb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yz8z8gb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz8z8wb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz8z9Ab4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yz8z9Qb4EeSFB8mUNT_s_w" name="AnRTstatemachineisneverreentrant">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz8z9gb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz8z9wb4EeSFB8mUNT_s_w" key="originalName" value="An RT state machine is never re-entrant"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz8z-Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz8z-Qb4EeSFB8mUNT_s_w" key="body" value="not base_StateMachine.isReentrant"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz8z-wb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz8z_Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz8z_Qb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz8z_wb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80AAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80AQb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yz80Agb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80Awb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80BAb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yz80BQb4EeSFB8mUNT_s_w" name="RTstatemachinesdonothaveparametersorparametersets">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80Bgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80Bwb4EeSFB8mUNT_s_w" key="originalName" value="RT state machines do not have parameters or parameter sets"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80CAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80CQb4EeSFB8mUNT_s_w" key="body" value="(base_StateMachine.ownedParameter->size()=0) and &#xD;&#xA;(base_StateMachine.ownedParameterSet->size() = 0)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80Cwb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80DAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80DQb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80Dwb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80EAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80EQb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yz80Egb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80Ewb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80FAb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yz80FQb4EeSFB8mUNT_s_w" name="RTstatemachinesmusthaveacontextanditmustbeaClass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80Fgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80Fwb4EeSFB8mUNT_s_w" key="originalName" value="RT state machines must have a context and it must be a Class"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80GAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80GQb4EeSFB8mUNT_s_w" key="body" value="(base_StateMachine.behavioredClassifier->size()=1) &#xD;&#xA;and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80Gwb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80HAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80HQb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80Hwb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80IAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80IQb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yz80Igb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80Iwb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80JAb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yz80JQb4EeSFB8mUNT_s_w" name="Passivestatemachineareonlyallowedonpassivedataclasses">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80Jgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80Jwb4EeSFB8mUNT_s_w" key="originalName" value="Passive state machine are only allowed on passive data classes"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80KAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80KQb4EeSFB8mUNT_s_w" key="body" value="isPassive = not (base_StateMachine.behavioredClassifier.oclAsType(Class).isActive) "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80Kwb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80LAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80LQb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80Lwb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80MAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80MQb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yz80Mgb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80Mwb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80NAb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Yz80NQb4EeSFB8mUNT_s_w" name="base_StateMachine" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Yz80Nwb4EeSFB8mUNT_s_w" name="isPassive" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <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="_Yz80OQb4EeSFB8mUNT_s_w" name="RTRegion">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80Ogb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_H1bWMFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yz80Owb4EeSFB8mUNT_s_w" name="RegionsinRTstatemachinescannothaveafinalstate">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80PAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80PQb4EeSFB8mUNT_s_w" key="originalName" value="Regions in RT state machines cannot have a final state"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80Pgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80Pwb4EeSFB8mUNT_s_w" key="body" value="base_Region.subvertex->forAll&#xD;&#xA;      (v | not v.oclIsKindOf(FinalState))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80QQb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80Qgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80Qwb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80RQb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80Rgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80Rwb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yz80SAb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80SQb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80Sgb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Yz80Swb4EeSFB8mUNT_s_w" name="base_Region" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Region"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Yz80TQb4EeSFB8mUNT_s_w" name="RTState">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80Tgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KKLAAFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yz80Twb4EeSFB8mUNT_s_w" name="AcomposteRTstatehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80UAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80UQb4EeSFB8mUNT_s_w" key="originalName" value="A composte RT state has exactly one region"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80Ugb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80Uwb4EeSFB8mUNT_s_w" key="body" value="base_State.isComposite implies &#xD;&#xA;           (base_State.region->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80VQb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80Vgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80Vwb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80WQb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80Wgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80Wwb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yz80XAb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80XQb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80Xgb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yz80Xwb4EeSFB8mUNT_s_w" name="RTdoesnotsupportsubmachinestates">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80YAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80YQb4EeSFB8mUNT_s_w" key="originalName" value="RT does not support submachine states"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80Ygb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80Ywb4EeSFB8mUNT_s_w" key="body" value="not base_State.isSubmachineState"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80ZQb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80Zgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80Zwb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80aQb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80agb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80awb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yz80bAb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80bQb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80bgb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yz80bwb4EeSFB8mUNT_s_w" name="RTstatemachinesdonotsupportdoactivities">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80cAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80cQb4EeSFB8mUNT_s_w" key="originalName" value="RT state machines do not support &quot;do&quot; activities"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80cgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80cwb4EeSFB8mUNT_s_w" key="body" value="base_State.doActivity->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80dQb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80dgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80dwb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80eQb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80egb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80ewb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yz80fAb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80fQb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80fgb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yz80fwb4EeSFB8mUNT_s_w" name="RTstatemachinescannothaveanydeferredtriggers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80gAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80gQb4EeSFB8mUNT_s_w" key="originalName" value="RT state machines cannot have any deferred triggers "/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80ggb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80gwb4EeSFB8mUNT_s_w" key="body" value="base_State.deferrableTrigger->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80hQb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80hgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80hwb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80iQb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80igb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80iwb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yz80jAb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80jQb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80jgb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yz80jwb4EeSFB8mUNT_s_w" name="Constraint5">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80kQb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80kgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80kwb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80lQb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80lgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80lwb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yz80mAb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80mQb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80mgb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Yz80mwb4EeSFB8mUNT_s_w" name="base_State" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Yz80nQb4EeSFB8mUNT_s_w" name="RTPseudostate">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80ngb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_NHLjsFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yz80nwb4EeSFB8mUNT_s_w" name="RTstatemachinesdonotsupportconcurrencyorshallowhistory">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80oAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80oQb4EeSFB8mUNT_s_w" key="originalName" value="RT state machines do not support concurrency or shallow history"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80ogb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80owb4EeSFB8mUNT_s_w" key="body" value="let knd = base_Pseudostate.kind in &#xD;&#xA;   (knd &lt;> UML::PseudostateKind::shallowHistory) and&#xD;&#xA;   (knd &lt;> UML::PseudostateKind::fork) and&#xD;&#xA;   (knd &lt;> UML::PseudostateKind::join)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80pQb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80pgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80pwb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yz80qQb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80qgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yz80qwb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yz80rAb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80rQb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yz80rgb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Yz80rwb4EeSFB8mUNT_s_w" name="base_Pseudostate" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Pseudostate"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Yz80sQb4EeSFB8mUNT_s_w" name="RTTrigger">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yz80sgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_j4X18GfLEeO447LqwGjc0A"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Yz80swb4EeSFB8mUNT_s_w" name="base_Operation" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_Y8UNAQVIEeSWbqHR60aX_g" name="UMLRealTimeStateMach" nsURI="http:///schemas/UMLRealTimeStateMach/_Y8UNAAVIEeSWbqHR60aX_g/12" nsPrefix="UMLRealTimeStateMach">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8UNAgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8UNAwVIEeSWbqHR60aX_g" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8YecAVIEeSWbqHR60aX_g" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8YecQVIEeSWbqHR60aX_g" key="Version" value="0.1.9"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8YecgVIEeSWbqHR60aX_g" key="Comment" value="Updated with proper graphics options settings -- no semantic changes"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8YecwVIEeSWbqHR60aX_g" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8YedAVIEeSWbqHR60aX_g" key="Date" value="2014-07-06"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8YedQVIEeSWbqHR60aX_g" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Y8UNBAVIEeSWbqHR60aX_g" name="RTStateMachine">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8UNBQVIEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xie4kFDtEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Y8UNBgVIEeSWbqHR60aX_g" name="AnRTstatemachinehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8UNBwVIEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8UNCAVIEeSWbqHR60aX_g" key="originalName" value="An RT state machine has exactly one region"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8UNCQVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8UNCgVIEeSWbqHR60aX_g" key="body" value="base_StateMachine.region->size() = 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8UNDAVIEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8UNDQVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8UNDgVIEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8UNEAVIEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8UNEQVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8UNEgVIEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Y8UNEwVIEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8UNFAVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8UNFQVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Y8UNFgVIEeSWbqHR60aX_g" name="AnRTstatemachineisneverreentrant">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8UNFwVIEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8UNGAVIEeSWbqHR60aX_g" key="originalName" value="An RT state machine is never re-entrant"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8UNGQVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8UNGgVIEeSWbqHR60aX_g" key="body" value="not base_StateMachine.isReentrant"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8UNHAVIEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0EAVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0EQVIEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0EwVIEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0FAVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0FQVIEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Y8U0FgVIEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0FwVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0GAVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Y8U0GQVIEeSWbqHR60aX_g" name="RTstatemachinesdonothaveparametersorparametersets">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0GgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0GwVIEeSWbqHR60aX_g" key="originalName" value="RT state machines do not have parameters or parameter sets"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0HAVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0HQVIEeSWbqHR60aX_g" key="body" value="(base_StateMachine.ownedParameter->size()=0) and &#xD;&#xA;(base_StateMachine.ownedParameterSet->size() = 0)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0HwVIEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0IAVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0IQVIEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0IwVIEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0JAVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0JQVIEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Y8U0JgVIEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0JwVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0KAVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Y8U0KQVIEeSWbqHR60aX_g" name="RTstatemachinesmusthaveacontextanditmustbeaClass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0KgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0KwVIEeSWbqHR60aX_g" key="originalName" value="RT state machines must have a context and it must be a Class"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0LAVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0LQVIEeSWbqHR60aX_g" key="body" value="(base_StateMachine.behavioredClassifier->size()=1) &#xD;&#xA;and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0LwVIEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0MAVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0MQVIEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0MwVIEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0NAVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0NQVIEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Y8U0NgVIEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0NwVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0OAVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Y8U0OQVIEeSWbqHR60aX_g" name="Passivestatemachineareonlyallowedonpassivedataclasses">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0OgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0OwVIEeSWbqHR60aX_g" key="originalName" value="Passive state machine are only allowed on passive data classes"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0PAVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0PQVIEeSWbqHR60aX_g" key="body" value="isPassive = not (base_StateMachine.behavioredClassifier.oclAsType(Class).isActive) "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0PwVIEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0QAVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0QQVIEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0QwVIEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0RAVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0RQVIEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Y8U0RgVIEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0RwVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0SAVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Y8U0SQVIEeSWbqHR60aX_g" name="base_StateMachine" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Y8U0SwVIEeSWbqHR60aX_g" name="isPassive" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <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="_Y8U0TQVIEeSWbqHR60aX_g" name="RTRegion">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0TgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_H1bWMFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Y8U0TwVIEeSWbqHR60aX_g" name="RegionsinRTstatemachinescannothaveafinalstate">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0UAVIEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0UQVIEeSWbqHR60aX_g" key="originalName" value="Regions in RT state machines cannot have a final state"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0UgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0UwVIEeSWbqHR60aX_g" key="body" value="base_Region.subvertex->forAll&#xD;&#xA;      (v | not v.oclIsKindOf(FinalState))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0VQVIEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0VgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0VwVIEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0WQVIEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0WgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0WwVIEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Y8U0XAVIEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0XQVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0XgVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Y8U0XwVIEeSWbqHR60aX_g" name="base_Region" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Region"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Y8U0YQVIEeSWbqHR60aX_g" name="RTState">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0YgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KKLAAFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Y8U0YwVIEeSWbqHR60aX_g" name="AcomposteRTstatehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0ZAVIEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0ZQVIEeSWbqHR60aX_g" key="originalName" value="A composte RT state has exactly one region"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0ZgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0ZwVIEeSWbqHR60aX_g" key="body" value="base_State.isComposite implies &#xD;&#xA;           (base_State.region->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0aQVIEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0agVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0awVIEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0bQVIEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0bgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0bwVIEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Y8U0cAVIEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0cQVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0cgVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Y8U0cwVIEeSWbqHR60aX_g" name="RTdoesnotsupportsubmachinestates">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0dAVIEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0dQVIEeSWbqHR60aX_g" key="originalName" value="RT does not support submachine states"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0dgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0dwVIEeSWbqHR60aX_g" key="body" value="not base_State.isSubmachineState"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0eQVIEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0egVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0ewVIEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0fQVIEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0fgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0fwVIEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Y8U0gAVIEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0gQVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0ggVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Y8U0gwVIEeSWbqHR60aX_g" name="RTstatemachinesdonotsupportdoactivities">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0hAVIEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0hQVIEeSWbqHR60aX_g" key="originalName" value="RT state machines do not support &quot;do&quot; activities"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0hgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0hwVIEeSWbqHR60aX_g" key="body" value="base_State.doActivity->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0iQVIEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0igVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0iwVIEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0jQVIEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0jgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0jwVIEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Y8U0kAVIEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0kQVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0kgVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Y8U0kwVIEeSWbqHR60aX_g" name="RTstatemachinescannothaveanydeferredtriggers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0lAVIEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0lQVIEeSWbqHR60aX_g" key="originalName" value="RT state machines cannot have any deferred triggers "/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0lgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0lwVIEeSWbqHR60aX_g" key="body" value="base_State.deferrableTrigger->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0mQVIEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0mgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0mwVIEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0nQVIEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0ngVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0nwVIEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Y8U0oAVIEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0oQVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0ogVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Y8U0owVIEeSWbqHR60aX_g" name="Constraint5">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0pQVIEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0pgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0pwVIEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0qQVIEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0qgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0qwVIEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Y8U0rAVIEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0rQVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0rgVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Y8U0rwVIEeSWbqHR60aX_g" name="base_State" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Y8U0sQVIEeSWbqHR60aX_g" name="RTPseudostate">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0sgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_NHLjsFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Y8U0swVIEeSWbqHR60aX_g" name="RTstatemachinesdonotsupportconcurrencyorshallowhistory">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0tAVIEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0tQVIEeSWbqHR60aX_g" key="originalName" value="RT state machines do not support concurrency or shallow history"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0tgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0twVIEeSWbqHR60aX_g" key="body" value="let knd = base_Pseudostate.kind in &#xD;&#xA;   (knd &lt;> UML::PseudostateKind::shallowHistory) and&#xD;&#xA;   (knd &lt;> UML::PseudostateKind::fork) and&#xD;&#xA;   (knd &lt;> UML::PseudostateKind::join)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0uQVIEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0ugVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0uwVIEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Y8U0vQVIEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0vgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y8U0vwVIEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Y8U0wAVIEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0wQVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Y8U0wgVIEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Y8U0wwVIEeSWbqHR60aX_g" name="base_Pseudostate" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Pseudostate"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Y8U0xQVIEeSWbqHR60aX_g" name="RTTrigger">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y8U0xgVIEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_j4X18GfLEeO447LqwGjc0A"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Y8U0xwVIEeSWbqHR60aX_g" name="base_Operation" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_GTcfUAVGEeSWbqHR60aX_g" name="UMLRealTimeStateMach" nsURI="http:///schemas/UMLRealTimeStateMach/_GTYN4AVGEeSWbqHR60aX_g/11" nsPrefix="UMLRealTimeStateMach">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfUQVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfUgVGEeSWbqHR60aX_g" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTj0EAVGEeSWbqHR60aX_g" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTj0EQVGEeSWbqHR60aX_g" key="Version" value="0.1.8"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTj0EgVGEeSWbqHR60aX_g" key="Comment" value="Version completed at CEA in March 2014"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTj0EwVGEeSWbqHR60aX_g" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTj0FAVGEeSWbqHR60aX_g" key="Date" value="2014-07-06"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTj0FQVGEeSWbqHR60aX_g" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_GTcfUwVGEeSWbqHR60aX_g" name="RTStateMachine">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfVAVGEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xie4kFDtEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GTcfVQVGEeSWbqHR60aX_g" name="AnRTstatemachinehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfVgVGEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfVwVGEeSWbqHR60aX_g" key="originalName" value="An RT state machine has exactly one region"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfWAVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfWQVGEeSWbqHR60aX_g" key="body" value="base_StateMachine.region->size() = 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcfWwVGEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfXAVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfXQVGEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcfXwVGEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfYAVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfYQVGEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GTcfYgVGEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcfYwVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcfZAVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GTcfZQVGEeSWbqHR60aX_g" name="AnRTstatemachineisneverreentrant">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfZgVGEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfZwVGEeSWbqHR60aX_g" key="originalName" value="An RT state machine is never re-entrant"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfaAVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfaQVGEeSWbqHR60aX_g" key="body" value="not base_StateMachine.isReentrant"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcfawVGEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfbAVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfbQVGEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcfbwVGEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfcAVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfcQVGEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GTcfcgVGEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcfcwVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcfdAVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GTcfdQVGEeSWbqHR60aX_g" name="RTstatemachinesdonothaveparametersorparametersets">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfdgVGEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfdwVGEeSWbqHR60aX_g" key="originalName" value="RT state machines do not have parameters or parameter sets"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfeAVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfeQVGEeSWbqHR60aX_g" key="body" value="(base_StateMachine.ownedParameter->size()=0) and &#xD;&#xA;(base_StateMachine.ownedParameterSet->size() = 0)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcfewVGEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcffAVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcffQVGEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcffwVGEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfgAVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfgQVGEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GTcfggVGEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcfgwVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcfhAVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GTcfhQVGEeSWbqHR60aX_g" name="RTstatemachinesmusthaveacontextanditmustbeaClass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfhgVGEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfhwVGEeSWbqHR60aX_g" key="originalName" value="RT state machines must have a context and it must be a Class"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfiAVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfiQVGEeSWbqHR60aX_g" key="body" value="(base_StateMachine.behavioredClassifier->size()=1) &#xD;&#xA;and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcfiwVGEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfjAVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfjQVGEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcfjwVGEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfkAVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfkQVGEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GTcfkgVGEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcfkwVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcflAVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GTcflQVGEeSWbqHR60aX_g" name="Passivestatemachineareonlyallowedonpassivedataclasses">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcflgVGEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcflwVGEeSWbqHR60aX_g" key="originalName" value="Passive state machine are only allowed on passive data classes"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfmAVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfmQVGEeSWbqHR60aX_g" key="body" value="isPassive = not (base_StateMachine.behavioredClassifier.oclAsType(Class).isActive) "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcfmwVGEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfnAVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfnQVGEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcfnwVGEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfoAVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfoQVGEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GTcfogVGEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcfowVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcfpAVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_GTcfpQVGEeSWbqHR60aX_g" name="base_StateMachine" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_GTcfpwVGEeSWbqHR60aX_g" name="isPassive" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <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="_GTcfqQVGEeSWbqHR60aX_g" name="RTRegion">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfqgVGEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_H1bWMFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GTcfqwVGEeSWbqHR60aX_g" name="RegionsinRTstatemachinescannothaveafinalstate">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfrAVGEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfrQVGEeSWbqHR60aX_g" key="originalName" value="Regions in RT state machines cannot have a final state"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfrgVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfrwVGEeSWbqHR60aX_g" key="body" value="base_Region.subvertex->forAll&#xD;&#xA;      (v | not v.oclIsKindOf(FinalState))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcfsQVGEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfsgVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfswVGEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcftQVGEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcftgVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcftwVGEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GTcfuAVGEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcfuQVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcfugVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_GTcfuwVGEeSWbqHR60aX_g" name="base_Region" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Region"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_GTcfvQVGEeSWbqHR60aX_g" name="RTState">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfvgVGEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KKLAAFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GTcfvwVGEeSWbqHR60aX_g" name="AcomposteRTstatehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfwAVGEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfwQVGEeSWbqHR60aX_g" key="originalName" value="A composte RT state has exactly one region"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfwgVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfwwVGEeSWbqHR60aX_g" key="body" value="base_State.isComposite implies &#xD;&#xA;           (base_State.region->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcfxQVGEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfxgVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfxwVGEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcfyQVGEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcfygVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcfywVGEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GTcfzAVGEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcfzQVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcfzgVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GTcfzwVGEeSWbqHR60aX_g" name="RTdoesnotsupportsubmachinestates">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcf0AVGEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcf0QVGEeSWbqHR60aX_g" key="originalName" value="RT does not support submachine states"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcf0gVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcf0wVGEeSWbqHR60aX_g" key="body" value="not base_State.isSubmachineState"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcf1QVGEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcf1gVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcf1wVGEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcf2QVGEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcf2gVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcf2wVGEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GTcf3AVGEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcf3QVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcf3gVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GTcf3wVGEeSWbqHR60aX_g" name="RTstatemachinesdonotsupportdoactivities">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcf4AVGEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcf4QVGEeSWbqHR60aX_g" key="originalName" value="RT state machines do not support &quot;do&quot; activities"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcf4gVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcf4wVGEeSWbqHR60aX_g" key="body" value="base_State.doActivity->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcf5QVGEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcf5gVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcf5wVGEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcf6QVGEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcf6gVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcf6wVGEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GTcf7AVGEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcf7QVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcf7gVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GTcf7wVGEeSWbqHR60aX_g" name="RTstatemachinescannothaveanydeferredtriggers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcf8AVGEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcf8QVGEeSWbqHR60aX_g" key="originalName" value="RT state machines cannot have any deferred triggers "/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcf8gVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcf8wVGEeSWbqHR60aX_g" key="body" value="base_State.deferrableTrigger->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcf9QVGEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcf9gVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcf9wVGEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcf-QVGEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcf-gVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcf-wVGEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GTcf_AVGEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcf_QVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcf_gVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GTcf_wVGEeSWbqHR60aX_g" name="Constraint5">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcgAQVGEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcgAgVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcgAwVGEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcgBQVGEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcgBgVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcgBwVGEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GTcgCAVGEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcgCQVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcgCgVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_GTcgCwVGEeSWbqHR60aX_g" name="base_State" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_GTcgDQVGEeSWbqHR60aX_g" name="RTPseudostate">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcgDgVGEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_NHLjsFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GTcgDwVGEeSWbqHR60aX_g" name="RTstatemachinesdonotsupportconcurrencyorshallowhistory">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcgEAVGEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcgEQVGEeSWbqHR60aX_g" key="originalName" value="RT state machines do not support concurrency or shallow history"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcgEgVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcgEwVGEeSWbqHR60aX_g" key="body" value="let knd = base_Pseudostate.kind in &#xD;&#xA;   (knd &lt;> UML::PseudostateKind::shallowHistory) and&#xD;&#xA;   (knd &lt;> UML::PseudostateKind::fork) and&#xD;&#xA;   (knd &lt;> UML::PseudostateKind::join)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcgFQVGEeSWbqHR60aX_g" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcgFgVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcgFwVGEeSWbqHR60aX_g" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GTcgGQVGEeSWbqHR60aX_g" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcgGgVGEeSWbqHR60aX_g" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTcgGwVGEeSWbqHR60aX_g" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GTcgHAVGEeSWbqHR60aX_g">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcgHQVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GTcgHgVGEeSWbqHR60aX_g">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_GTcgHwVGEeSWbqHR60aX_g" name="base_Pseudostate" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Pseudostate"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_GTcgIQVGEeSWbqHR60aX_g" name="RTTrigger">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GTcgIgVGEeSWbqHR60aX_g" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_j4X18GfLEeO447LqwGjc0A"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_GTcgIwVGEeSWbqHR60aX_g" name="base_Operation" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_jc_csKUwEeOL4NFhbyFnfQ" name="UMLRealTimeStateMach" nsURI="http:///schemas/UMLRealTimeStateMach/_jc59IKUwEeOL4NFhbyFnfQ/10" nsPrefix="UMLRealTimeStateMach">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jc_csaUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jc_csqUwEeOL4NFhbyFnfQ" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdHYgKUwEeOL4NFhbyFnfQ" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdHYgaUwEeOL4NFhbyFnfQ" key="Version" value="0.1.7"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdHYgqUwEeOL4NFhbyFnfQ" key="Comment" value="Just to make sure that I defined it correctly the last time"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdHYg6UwEeOL4NFhbyFnfQ" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdHYhKUwEeOL4NFhbyFnfQ" key="Date" value="2014-03-06"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdHYhaUwEeOL4NFhbyFnfQ" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_jc_cs6UwEeOL4NFhbyFnfQ" name="RTStateMachine">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jc_ctKUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xie4kFDtEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_jc_ctaUwEeOL4NFhbyFnfQ" name="AnRTstatemachinehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jc_ctqUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jc_ct6UwEeOL4NFhbyFnfQ" key="body" value="base_StateMachine.region->size() = 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jc_cuaUwEeOL4NFhbyFnfQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jc_cuqUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jc_cu6UwEeOL4NFhbyFnfQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jc_cvaUwEeOL4NFhbyFnfQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jc_cvqUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jc_cv6UwEeOL4NFhbyFnfQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_jc_cwKUwEeOL4NFhbyFnfQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jc_cwaUwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jc_cwqUwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_jc_cw6UwEeOL4NFhbyFnfQ" name="AnRTstatemachineisneverreentrant">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jc_cxKUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jc_cxaUwEeOL4NFhbyFnfQ" key="body" value="not base_StateMachine.isReentrant"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jc_cx6UwEeOL4NFhbyFnfQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jc_cyKUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jc_cyaUwEeOL4NFhbyFnfQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jc_cy6UwEeOL4NFhbyFnfQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jc_czKUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jc_czaUwEeOL4NFhbyFnfQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_jc_czqUwEeOL4NFhbyFnfQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jc_cz6UwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jc_c0KUwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_jc_c0aUwEeOL4NFhbyFnfQ" name="RTstatemachinesdonothaveparametersorparametersets">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jc_c0qUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jc_c06UwEeOL4NFhbyFnfQ" key="body" value="(base_StateMachine.ownedParameter->size()=0) and &#xD;&#xA;(base_StateMachine.ownedParameterSet->size() = 0)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jc_c1aUwEeOL4NFhbyFnfQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jc_c1qUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jc_c16UwEeOL4NFhbyFnfQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jc_c2aUwEeOL4NFhbyFnfQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jc_c2qUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jc_c26UwEeOL4NFhbyFnfQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_jc_c3KUwEeOL4NFhbyFnfQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jc_c3aUwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jc_c3qUwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_jc_c36UwEeOL4NFhbyFnfQ" name="RTstatemachinesmusthaveacontextanditmustbeaClass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jc_c4KUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jc_c4aUwEeOL4NFhbyFnfQ" key="body" value="(base_StateMachine.behavioredClassifier->size()=1) &#xD;&#xA;and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jc_c46UwEeOL4NFhbyFnfQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jc_c5KUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jc_c5aUwEeOL4NFhbyFnfQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jc_c56UwEeOL4NFhbyFnfQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jc_c6KUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jc_c6aUwEeOL4NFhbyFnfQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_jc_c6qUwEeOL4NFhbyFnfQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jc_c66UwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jc_c7KUwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_jc_c7aUwEeOL4NFhbyFnfQ" name="Passivestatemachineareonlyallowedonpassivedataclasses">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jc_c7qUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jc_c76UwEeOL4NFhbyFnfQ" key="body" value="isPassive = not (base_StateMachine.behavioredClassifier.oclAsType(Class).isActive) "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jdADwaUwEeOL4NFhbyFnfQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdADwqUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdADw6UwEeOL4NFhbyFnfQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jdADxaUwEeOL4NFhbyFnfQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdADxqUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdADx6UwEeOL4NFhbyFnfQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_jdADyKUwEeOL4NFhbyFnfQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jdADyaUwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jdADyqUwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_jdADy6UwEeOL4NFhbyFnfQ" name="base_StateMachine" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jdADzaUwEeOL4NFhbyFnfQ" name="isPassive" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <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="_jdADz6UwEeOL4NFhbyFnfQ" name="RTRegion">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAD0KUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_H1bWMFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_jdAD0aUwEeOL4NFhbyFnfQ" name="RegionsinRTstatemachinescannothaveafinalstate">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAD0qUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAD06UwEeOL4NFhbyFnfQ" key="body" value="base_Region.subvertex->forAll&#xD;&#xA;      (v | not v.oclIsKindOf(FinalState))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jdAD1aUwEeOL4NFhbyFnfQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAD1qUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAD16UwEeOL4NFhbyFnfQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jdAD2aUwEeOL4NFhbyFnfQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAD2qUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAD26UwEeOL4NFhbyFnfQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_jdAD3KUwEeOL4NFhbyFnfQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jdAD3aUwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jdAD3qUwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_jdAD36UwEeOL4NFhbyFnfQ" name="base_Region" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Region"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_jdAD4aUwEeOL4NFhbyFnfQ" name="RTState">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAD4qUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KKLAAFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_jdAD46UwEeOL4NFhbyFnfQ" name="AcomposteRTstatehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAD5KUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAD5aUwEeOL4NFhbyFnfQ" key="body" value="base_State.isComposite implies &#xD;&#xA;           (base_State.region->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jdAD56UwEeOL4NFhbyFnfQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAD6KUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAD6aUwEeOL4NFhbyFnfQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jdAD66UwEeOL4NFhbyFnfQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAD7KUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAD7aUwEeOL4NFhbyFnfQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_jdAD7qUwEeOL4NFhbyFnfQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jdAD76UwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jdAD8KUwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_jdAD8aUwEeOL4NFhbyFnfQ" name="RTdoesnotsupportsubmachinestates">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAD8qUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAD86UwEeOL4NFhbyFnfQ" key="body" value="not base_State.isSubmachineState"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jdAD9aUwEeOL4NFhbyFnfQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAD9qUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAD96UwEeOL4NFhbyFnfQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jdAD-aUwEeOL4NFhbyFnfQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAD-qUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAD-6UwEeOL4NFhbyFnfQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_jdAD_KUwEeOL4NFhbyFnfQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jdAD_aUwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jdAD_qUwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_jdAD_6UwEeOL4NFhbyFnfQ" name="RTstatemachinesdonotsupportdoactivities">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAEAKUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAEAaUwEeOL4NFhbyFnfQ" key="body" value="base_State.doActivity->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jdAEA6UwEeOL4NFhbyFnfQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAEBKUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAEBaUwEeOL4NFhbyFnfQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jdAEB6UwEeOL4NFhbyFnfQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAECKUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAECaUwEeOL4NFhbyFnfQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_jdAECqUwEeOL4NFhbyFnfQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jdAEC6UwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jdAEDKUwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_jdAEDaUwEeOL4NFhbyFnfQ" name="RTstatemachinescannothaveanydeferredtriggers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAEDqUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAED6UwEeOL4NFhbyFnfQ" key="body" value="base_State.deferrableTrigger->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jdAEEaUwEeOL4NFhbyFnfQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAEEqUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAEE6UwEeOL4NFhbyFnfQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jdAEFaUwEeOL4NFhbyFnfQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAEFqUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAEF6UwEeOL4NFhbyFnfQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_jdAEGKUwEeOL4NFhbyFnfQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jdAEGaUwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jdAEGqUwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_jdAEG6UwEeOL4NFhbyFnfQ" name="Constraint5">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jdAEHaUwEeOL4NFhbyFnfQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAEHqUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAEH6UwEeOL4NFhbyFnfQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jdAEIaUwEeOL4NFhbyFnfQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAEIqUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAEI6UwEeOL4NFhbyFnfQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_jdAEJKUwEeOL4NFhbyFnfQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jdAEJaUwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jdAEJqUwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_jdAEJ6UwEeOL4NFhbyFnfQ" name="base_State" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_jdAEKaUwEeOL4NFhbyFnfQ" name="RTPseudostate">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAEKqUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_NHLjsFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_jdAEK6UwEeOL4NFhbyFnfQ" name="RTstatemachinesdonotsupportconcurrencyorshallowhistory">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAELKUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAELaUwEeOL4NFhbyFnfQ" key="body" value="let knd = base_Pseudostate.kind in &#xD;&#xA;   (knd &lt;> UML::PseudostateKind::shallowHistory) and&#xD;&#xA;   (knd &lt;> UML::PseudostateKind::fork) and&#xD;&#xA;   (knd &lt;> UML::PseudostateKind::join)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jdAEL6UwEeOL4NFhbyFnfQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAEMKUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAEMaUwEeOL4NFhbyFnfQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_jdAEM6UwEeOL4NFhbyFnfQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAENKUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdAENaUwEeOL4NFhbyFnfQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_jdAENqUwEeOL4NFhbyFnfQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jdAEN6UwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_jdAEOKUwEeOL4NFhbyFnfQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_jdAEOaUwEeOL4NFhbyFnfQ" name="base_Pseudostate" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Pseudostate"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_jdAEO6UwEeOL4NFhbyFnfQ" name="RTTrigger">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdAEPKUwEeOL4NFhbyFnfQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_j4X18GfLEeO447LqwGjc0A"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_jdAEPaUwEeOL4NFhbyFnfQ" name="base_Operation" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_9rNfEaUaEeOMJMavfflX6A" name="UMLRealTimeStateMach" nsURI="http:///schemas/UMLRealTimeStateMach/_9rNfEKUaEeOMJMavfflX6A/9" nsPrefix="UMLRealTimeStateMach">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rNfEqUaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rNfE6UaEeOMJMavfflX6A" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rP7VaUaEeOMJMavfflX6A" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rP7VqUaEeOMJMavfflX6A" key="Version" value="0.1.6"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rP7V6UaEeOMJMavfflX6A" key="Comment" value="Changed references to &quot;uml&quot; to &quot;UML&quot;"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rP7WKUaEeOMJMavfflX6A" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rP7WaUaEeOMJMavfflX6A" key="Date" value="2014-03-06"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rP7WqUaEeOMJMavfflX6A" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_9rNfFKUaEeOMJMavfflX6A" name="RTStateMachine">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rNfFaUaEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xie4kFDtEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_9rNfFqUaEeOMJMavfflX6A" name="AnRTstatemachinehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rNfF6UaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rNfGKUaEeOMJMavfflX6A" key="body" value="base_StateMachine.region->size() = 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rNfGqUaEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rNfG6UaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rNfHKUaEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rNfHqUaEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rNfH6UaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rNfIKUaEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_9rNfIaUaEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rNfIqUaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rNfI6UaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_9rNfJKUaEeOMJMavfflX6A" name="AnRTstatemachineisneverreentrant">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rNfJaUaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rNfJqUaEeOMJMavfflX6A" key="body" value="not base_StateMachine.isReentrant"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rNfKKUaEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rNfKaUaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rNfKqUaEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rNfLKUaEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rNfLaUaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rNfLqUaEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_9rNfL6UaEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rNfMKUaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rNfMaUaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_9rNfMqUaEeOMJMavfflX6A" name="RTstatemachinesdonothaveparametersorparametersets">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rNfM6UaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rNfNKUaEeOMJMavfflX6A" key="body" value="(base_StateMachine.ownedParameter->size()=0) and &#xD;&#xA;(base_StateMachine.ownedParameterSet->size() = 0)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rNfNqUaEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rNfN6UaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rNfOKUaEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rNfOqUaEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rNfO6UaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rNfPKUaEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_9rNfPaUaEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rNfPqUaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rNfP6UaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_9rNfQKUaEeOMJMavfflX6A" name="RTstatemachinesmusthaveacontextanditmustbeaClass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rNfQaUaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rNfQqUaEeOMJMavfflX6A" key="body" value="(base_StateMachine.behavioredClassifier->size()=1) &#xD;&#xA;and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rNfRKUaEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rNfRaUaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rNfRqUaEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rNfSKUaEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rNfSaUaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rNfSqUaEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_9rNfS6UaEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rNfTKUaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rNfTaUaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_9rNfTqUaEeOMJMavfflX6A" name="Passivestatemachineareonlyallowedonpassivedataclasses">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rNfT6UaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rNfUKUaEeOMJMavfflX6A" key="body" value="isPassive = not (base_StateMachine.behavioredClassifier.oclAsType(Class).isActive) "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rNfUqUaEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rNfU6UaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rNfVKUaEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rNfVqUaEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rNfV6UaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rNfWKUaEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_9rNfWaUaEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rNfWqUaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rNfW6UaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9rNfXKUaEeOMJMavfflX6A" name="base_StateMachine" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_9rOGIKUaEeOMJMavfflX6A" name="isPassive" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <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="_9rOGIqUaEeOMJMavfflX6A" name="RTRegion">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGI6UaEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_H1bWMFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_9rOGJKUaEeOMJMavfflX6A" name="RegionsinRTstatemachinescannothaveafinalstate">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGJaUaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGJqUaEeOMJMavfflX6A" key="body" value="base_Region.subvertex->forAll&#xD;&#xA;      (v | not v.oclIsKindOf(FinalState))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rOGKKUaEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGKaUaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGKqUaEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rOGLKUaEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGLaUaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGLqUaEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_9rOGL6UaEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rOGMKUaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rOGMaUaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9rOGMqUaEeOMJMavfflX6A" name="base_Region" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Region"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_9rOGNKUaEeOMJMavfflX6A" name="RTState">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGNaUaEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KKLAAFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_9rOGNqUaEeOMJMavfflX6A" name="AcomposteRTstatehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGN6UaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGOKUaEeOMJMavfflX6A" key="body" value="base_State.isComposite implies &#xD;&#xA;           (base_State.region->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rOGOqUaEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGO6UaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGPKUaEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rOGPqUaEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGP6UaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGQKUaEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_9rOGQaUaEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rOGQqUaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rOGQ6UaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_9rOGRKUaEeOMJMavfflX6A" name="RTdoesnotsupportsubmachinestates">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGRaUaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGRqUaEeOMJMavfflX6A" key="body" value="not base_State.isSubmachineState"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rOGSKUaEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGSaUaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGSqUaEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rOGTKUaEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGTaUaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGTqUaEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_9rOGT6UaEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rOGUKUaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rOGUaUaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_9rOGUqUaEeOMJMavfflX6A" name="RTstatemachinesdonotsupportdoactivities">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGU6UaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGVKUaEeOMJMavfflX6A" key="body" value="base_State.doActivity->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rOGVqUaEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGV6UaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGWKUaEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rOGWqUaEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGW6UaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGXKUaEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_9rOGXaUaEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rOGXqUaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rOGX6UaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_9rOGYKUaEeOMJMavfflX6A" name="RTstatemachinescannothaveanydeferredtriggers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGYaUaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGYqUaEeOMJMavfflX6A" key="body" value="base_State.deferrableTrigger->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rOGZKUaEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGZaUaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGZqUaEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rOGaKUaEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGaaUaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGaqUaEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_9rOGa6UaEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rOGbKUaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rOGbaUaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_9rOGbqUaEeOMJMavfflX6A" name="Constraint5">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rOGcKUaEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGcaUaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGcqUaEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rOGdKUaEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGdaUaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGdqUaEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_9rOGd6UaEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rOGeKUaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rOGeaUaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9rOGeqUaEeOMJMavfflX6A" name="base_State" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_9rOGfKUaEeOMJMavfflX6A" name="RTPseudostate">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGfaUaEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_NHLjsFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_9rOGfqUaEeOMJMavfflX6A" name="RTstatemachinesdonotsupportconcurrencyorshallowhistory">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGf6UaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGgKUaEeOMJMavfflX6A" key="body" value="let knd = base_Pseudostate.kind in &#xD;&#xA;   (knd &lt;> UML::PseudostateKind::shallowHistory) and&#xD;&#xA;   (knd &lt;> UML::PseudostateKind::fork) and&#xD;&#xA;   (knd &lt;> UML::PseudostateKind::join)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rOGgqUaEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGg6UaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGhKUaEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_9rOGhqUaEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGh6UaEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9rOGiKUaEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_9rOGiaUaEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rOGiqUaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_9rOGi6UaEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9rOGjKUaEeOMJMavfflX6A" name="base_Pseudostate" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Pseudostate"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_9rOGjqUaEeOMJMavfflX6A" name="RTTrigger">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9rOGj6UaEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_j4X18GfLEeO447LqwGjc0A"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9rOGkKUaEeOMJMavfflX6A" name="base_Operation" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_4n4F4aULEeOMJMavfflX6A" name="UMLRealTimeStateMach" nsURI="http:///schemas/UMLRealTimeStateMach/_4n4F4KULEeOMJMavfflX6A/8" nsPrefix="UMLRealTimeStateMach">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4F4qULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4F46ULEeOMJMavfflX6A" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n7JMaULEeOMJMavfflX6A" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n7JMqULEeOMJMavfflX6A" key="Version" value="0.1.5"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n7JM6ULEeOMJMavfflX6A" key="Comment" value="defined"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n7JNKULEeOMJMavfflX6A" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n7JNaULEeOMJMavfflX6A" key="Date" value="2014-03-06"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n7JNqULEeOMJMavfflX6A" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_4n4F5KULEeOMJMavfflX6A" name="RTStateMachine">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4F5aULEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xie4kFDtEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_4n4F5qULEeOMJMavfflX6A" name="AnRTstatemachinehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4F56ULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4F6KULEeOMJMavfflX6A" key="body" value="base_StateMachine.region->size() = 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4F6qULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4F66ULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4F7KULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4F7qULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4F76ULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4F8KULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_4n4F8aULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4F8qULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4F86ULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_4n4F9KULEeOMJMavfflX6A" name="AnRTstatemachineisneverreentrant">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4F9aULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4F9qULEeOMJMavfflX6A" key="body" value="not base_StateMachine.isReentrant"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4F-KULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4F-aULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4F-qULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4F_KULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4F_aULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4F_qULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_4n4F_6ULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4GAKULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4GAaULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_4n4GAqULEeOMJMavfflX6A" name="RTstatemachinesdonothaveparametersorparametersets">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4GA6ULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4GBKULEeOMJMavfflX6A" key="body" value="(base_StateMachine.ownedParameter->size()=0) and &#xD;&#xA;(base_StateMachine.ownedParameterSet->size() = 0)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4GBqULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4GB6ULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4GCKULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4GCqULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4GC6ULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4GDKULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_4n4GDaULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4GDqULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4GD6ULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_4n4GEKULEeOMJMavfflX6A" name="RTstatemachinesmusthaveacontextanditmustbeaClass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4GEaULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4GEqULEeOMJMavfflX6A" key="body" value="(base_StateMachine.behavioredClassifier->size()=1) &#xD;&#xA;and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4GFKULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4GFaULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4GFqULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4GGKULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4GGaULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4GGqULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_4n4GG6ULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4GHKULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4GHaULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_4n4GHqULEeOMJMavfflX6A" name="Passivestatemachineareonlyallowedonpassivedataclasses">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4GH6ULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4GIKULEeOMJMavfflX6A" key="body" value="isPassive = not (base_StateMachine.behavioredClassifier.oclAsType(Class).isActive) "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4GIqULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4GI6ULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4GJKULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4s8aULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4s8qULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4s86ULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_4n4s9KULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4s9aULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4s9qULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4n4s96ULEeOMJMavfflX6A" name="base_StateMachine" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4n4s-aULEeOMJMavfflX6A" name="isPassive" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <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="_4n4s-6ULEeOMJMavfflX6A" name="RTRegion">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4s_KULEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_H1bWMFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_4n4s_aULEeOMJMavfflX6A" name="RegionsinRTstatemachinescannothaveafinalstate">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4s_qULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4s_6ULEeOMJMavfflX6A" key="body" value="base_Region.subvertex->forAll&#xD;&#xA;      (v | not v.oclIsKindOf(FinalState))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4tAaULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tAqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4tA6ULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4tBaULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tBqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4tB6ULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_4n4tCKULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4tCaULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4tCqULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4n4tC6ULEeOMJMavfflX6A" name="base_Region" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Region"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_4n4tDaULEeOMJMavfflX6A" name="RTState">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tDqULEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KKLAAFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_4n4tD6ULEeOMJMavfflX6A" name="AcomposteRTstatehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tEKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4tEaULEeOMJMavfflX6A" key="body" value="base_State.isComposite implies &#xD;&#xA;           (base_State.region->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4tE6ULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tFKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4tFaULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4tF6ULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tGKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4tGaULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_4n4tGqULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4tG6ULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4tHKULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_4n4tHaULEeOMJMavfflX6A" name="RTdoesnotsupportsubmachinestates">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tHqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4tH6ULEeOMJMavfflX6A" key="body" value="not base_State.isSubmachineState"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4tIaULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tIqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4tI6ULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4tJaULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tJqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4tJ6ULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_4n4tKKULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4tKaULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4tKqULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_4n4tK6ULEeOMJMavfflX6A" name="RTstatemachinesdonotsupportdoactivities">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tLKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4tLaULEeOMJMavfflX6A" key="body" value="base_State.doActivity->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4tL6ULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tMKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4tMaULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4tM6ULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tNKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4tNaULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_4n4tNqULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4tN6ULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4tOKULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_4n4tOaULEeOMJMavfflX6A" name="RTstatemachinescannothaveanydeferredtriggers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tOqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4tO6ULEeOMJMavfflX6A" key="body" value="base_State.deferrableTrigger->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4tPaULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tPqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4tP6ULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4tQaULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tQqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4tQ6ULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_4n4tRKULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4tRaULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4tRqULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_4n4tR6ULEeOMJMavfflX6A" name="Constraint5">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4tSaULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tSqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4tS6ULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4tTaULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tTqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4tT6ULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_4n4tUKULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4tUaULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4tUqULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4n4tU6ULEeOMJMavfflX6A" name="base_State" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_4n4tVaULEeOMJMavfflX6A" name="RTPseudostate">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tVqULEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_NHLjsFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_4n4tV6ULEeOMJMavfflX6A" name="RTstatemachinesdonotsupportconcurrencyorshallowhistory">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tWKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4tWaULEeOMJMavfflX6A" key="body" value="let knd = base_Pseudostate.kind in &#xD;&#xA;   (knd &lt;> uml::PseudostateKind::shallowHistory) and&#xD;&#xA;   (knd &lt;> uml::PseudostateKind::fork) and&#xD;&#xA;   (knd &lt;> uml::PseudostateKind::join)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4tW6ULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tXKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4tXaULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_4n4tX6ULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4tYKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4n4tYaULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_4n4tYqULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4tY6ULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_4n4tZKULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4n4tZaULEeOMJMavfflX6A" name="base_Pseudostate" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Pseudostate"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_4n4tZ6ULEeOMJMavfflX6A" name="RTTrigger">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4n4taKULEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_j4X18GfLEeO447LqwGjc0A"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4n4taaULEeOMJMavfflX6A" name="base_Operation" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_8igsYKN_EeOMJMavfflX6A" name="UMLRealTimeStateMach" nsURI="http:///schemas/UMLRealTimeStateMach/_8igFUKN_EeOMJMavfflX6A/7" nsPrefix="UMLRealTimeStateMach">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igsYaN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igsYqN_EeOMJMavfflX6A" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8iihlaN_EeOMJMavfflX6A" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8iihlqN_EeOMJMavfflX6A" key="Version" value="0.1.4"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8iihl6N_EeOMJMavfflX6A" key="Comment" value="minor touch ups to graphics"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8iihmKN_EeOMJMavfflX6A" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8iihmaN_EeOMJMavfflX6A" key="Date" value="2014-03-04"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8iihmqN_EeOMJMavfflX6A" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_8igsY6N_EeOMJMavfflX6A" name="RTStateMachine">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igsZKN_EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xie4kFDtEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_8igsZaN_EeOMJMavfflX6A" name="AnRTstatemachinehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igsZqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igsZ6N_EeOMJMavfflX6A" key="body" value="base_StateMachine.region->size() = 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igsaaN_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igsaqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igsa6N_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igsbaN_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igsbqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igsb6N_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_8igscKN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igscaN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igscqN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_8igsc6N_EeOMJMavfflX6A" name="AnRTstatemachineisneverreentrant">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igsdKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igsdaN_EeOMJMavfflX6A" key="body" value="not base_StateMachine.isReentrant"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igsd6N_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igseKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igseaN_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igse6N_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igsfKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igsfaN_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_8igsfqN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igsf6N_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igsgKN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_8igsgaN_EeOMJMavfflX6A" name="RTstatemachinesdonothaveparametersorparametersets">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igsgqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igsg6N_EeOMJMavfflX6A" key="body" value="(base_StateMachine.ownedParameter->size()=0) and &#xD;&#xA;(base_StateMachine.ownedParameterSet->size() = 0)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igshaN_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igshqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igsh6N_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igsiaN_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igsiqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igsi6N_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_8igsjKN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igsjaN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igsjqN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_8igsj6N_EeOMJMavfflX6A" name="RTstatemachinesmusthaveacontextanditmustbeaClass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igskKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igskaN_EeOMJMavfflX6A" key="body" value="(base_StateMachine.behavioredClassifier->size()=1) &#xD;&#xA;and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igsk6N_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igslKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igslaN_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igsl6N_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igsmKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igsmaN_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_8igsmqN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igsm6N_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igsnKN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_8igsnaN_EeOMJMavfflX6A" name="Passivestatemachineareonlyallowedonpassivedataclasses">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igsnqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igsn6N_EeOMJMavfflX6A" key="body" value="isPassive = not (base_StateMachine.behavioredClassifier.oclAsType(Class).isActive) "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igsoaN_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igsoqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igso6N_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igspaN_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igspqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igsp6N_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_8igsqKN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igsqaN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igsqqN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_8igsq6N_EeOMJMavfflX6A" name="base_StateMachine" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_8igsraN_EeOMJMavfflX6A" name="isPassive" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <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="_8igsr6N_EeOMJMavfflX6A" name="RTRegion">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igssKN_EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_H1bWMFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_8igssaN_EeOMJMavfflX6A" name="RegionsinRTstatemachinescannothaveafinalstate">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igssqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igss6N_EeOMJMavfflX6A" key="body" value="base_Region.subvertex->forAll&#xD;&#xA;      (v | not v.oclIsKindOf(FinalState))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igstaN_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igstqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igst6N_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igsuaN_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igsuqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igsu6N_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_8igsvKN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igsvaN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igsvqN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_8igsv6N_EeOMJMavfflX6A" name="base_Region" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Region"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_8igswaN_EeOMJMavfflX6A" name="RTState">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igswqN_EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KKLAAFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_8igsw6N_EeOMJMavfflX6A" name="AcomposteRTstatehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igsxKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igsxaN_EeOMJMavfflX6A" key="body" value="base_State.isComposite implies &#xD;&#xA;           (base_State.region->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igsx6N_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igsyKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igsyaN_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igsy6N_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igszKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igszaN_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_8igszqN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igsz6N_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igs0KN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_8igs0aN_EeOMJMavfflX6A" name="RTdoesnotsupportsubmachinestates">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igs0qN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igs06N_EeOMJMavfflX6A" key="body" value="not base_State.isSubmachineState"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igs1aN_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igs1qN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igs16N_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igs2aN_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igs2qN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igs26N_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_8igs3KN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igs3aN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igs3qN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_8igs36N_EeOMJMavfflX6A" name="RTstatemachinesdonotsupportdoactivities">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igs4KN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igs4aN_EeOMJMavfflX6A" key="body" value="base_State.doActivity->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igs46N_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igs5KN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igs5aN_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igs56N_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igs6KN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igs6aN_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_8igs6qN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igs66N_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igs7KN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_8igs7aN_EeOMJMavfflX6A" name="RTstatemachinescannothaveanydeferredtriggers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igs7qN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igs76N_EeOMJMavfflX6A" key="body" value="base_State.deferrableTrigger->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igs8aN_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igs8qN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igs86N_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igs9aN_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igs9qN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igs96N_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_8igs-KN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igs-aN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igs-qN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_8igs-6N_EeOMJMavfflX6A" name="Constraint5">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igs_aN_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igs_qN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igs_6N_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igtAaN_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igtAqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igtA6N_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_8igtBKN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igtBaN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igtBqN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_8igtB6N_EeOMJMavfflX6A" name="base_State" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_8igtCaN_EeOMJMavfflX6A" name="RTPseudostate">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igtCqN_EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_NHLjsFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_8igtC6N_EeOMJMavfflX6A" name="RTstatemachinesdonotsupportconcurrencyorshallowhistory">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igtDKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igtDaN_EeOMJMavfflX6A" key="body" value="let knd = base_Pseudostate.kind in &#xD;&#xA;   (knd &lt;> uml::PseudostateKind::shallowHistory) and&#xD;&#xA;   (knd &lt;> uml::PseudostateKind::fork) and&#xD;&#xA;   (knd &lt;> uml::PseudostateKind::join)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igtD6N_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igtEKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igtEaN_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_8igtE6N_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igtFKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8igtFaN_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_8igtFqN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igtF6N_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_8igtGKN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_8igtGaN_EeOMJMavfflX6A" name="base_Pseudostate" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Pseudostate"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_8igtG6N_EeOMJMavfflX6A" name="RTTrigger">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8igtHKN_EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_j4X18GfLEeO447LqwGjc0A"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_8igtHaN_EeOMJMavfflX6A" name="base_Operation" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_YntR8KN_EeOMJMavfflX6A" name="UMLRealTimeStateMach" nsURI="http:///schemas/UMLRealTimeStateMach/_Ynsq4KN_EeOMJMavfflX6A/6" nsPrefix="UMLRealTimeStateMach">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntR8aN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntR8qN_EeOMJMavfflX6A" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YnvHJaN_EeOMJMavfflX6A" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YnvHJqN_EeOMJMavfflX6A" key="Version" value="0.1.3"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YnvHJ6N_EeOMJMavfflX6A" key="Comment" value="Graphics changes only"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YnvHKKN_EeOMJMavfflX6A" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YnvHKaN_EeOMJMavfflX6A" key="Date" value="2014-03-04"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YnvHKqN_EeOMJMavfflX6A" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_YntR86N_EeOMJMavfflX6A" name="RTStateMachine">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntR9KN_EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xie4kFDtEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YntR9aN_EeOMJMavfflX6A" name="AnRTstatemachinehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntR9qN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntR96N_EeOMJMavfflX6A" key="body" value="base_StateMachine.region->size() = 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntR-aN_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntR-qN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntR-6N_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntR_aN_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntR_qN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntR_6N_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_YntSAKN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSAaN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSAqN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YntSA6N_EeOMJMavfflX6A" name="AnRTstatemachineisneverreentrant">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSBKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSBaN_EeOMJMavfflX6A" key="body" value="not base_StateMachine.isReentrant"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSB6N_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSCKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSCaN_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSC6N_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSDKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSDaN_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_YntSDqN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSD6N_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSEKN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YntSEaN_EeOMJMavfflX6A" name="RTstatemachinesdonothaveparametersorparametersets">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSEqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSE6N_EeOMJMavfflX6A" key="body" value="(base_StateMachine.ownedParameter->size()=0) and &#xD;&#xA;(base_StateMachine.ownedParameterSet->size() = 0)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSFaN_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSFqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSF6N_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSGaN_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSGqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSG6N_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_YntSHKN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSHaN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSHqN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YntSH6N_EeOMJMavfflX6A" name="RTstatemachinesmusthaveacontextanditmustbeaClass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSIKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSIaN_EeOMJMavfflX6A" key="body" value="(base_StateMachine.behavioredClassifier->size()=1) &#xD;&#xA;and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSI6N_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSJKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSJaN_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSJ6N_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSKKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSKaN_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_YntSKqN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSK6N_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSLKN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YntSLaN_EeOMJMavfflX6A" name="Passivestatemachineareonlyallowedonpassivedataclasses">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSLqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSL6N_EeOMJMavfflX6A" key="body" value="isPassive = not (base_StateMachine.behavioredClassifier.oclAsType(Class).isActive) "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSMaN_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSMqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSM6N_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSNaN_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSNqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSN6N_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_YntSOKN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSOaN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSOqN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_YntSO6N_EeOMJMavfflX6A" name="base_StateMachine" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_YntSPaN_EeOMJMavfflX6A" name="isPassive" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <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="_YntSP6N_EeOMJMavfflX6A" name="RTRegion">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSQKN_EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_H1bWMFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YntSQaN_EeOMJMavfflX6A" name="RegionsinRTstatemachinescannothaveafinalstate">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSQqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSQ6N_EeOMJMavfflX6A" key="body" value="base_Region.subvertex->forAll&#xD;&#xA;      (v | not v.oclIsKindOf(FinalState))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSRaN_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSRqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSR6N_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSSaN_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSSqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSS6N_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_YntSTKN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSTaN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSTqN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_YntST6N_EeOMJMavfflX6A" name="base_Region" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Region"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_YntSUaN_EeOMJMavfflX6A" name="RTState">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSUqN_EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KKLAAFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YntSU6N_EeOMJMavfflX6A" name="AcomposteRTstatehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSVKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSVaN_EeOMJMavfflX6A" key="body" value="base_State.isComposite implies &#xD;&#xA;           (base_State.region->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSV6N_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSWKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSWaN_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSW6N_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSXKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSXaN_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_YntSXqN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSX6N_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSYKN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YntSYaN_EeOMJMavfflX6A" name="RTdoesnotsupportsubmachinestates">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSYqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSY6N_EeOMJMavfflX6A" key="body" value="not base_State.isSubmachineState"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSZaN_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSZqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSZ6N_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSaaN_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSaqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSa6N_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_YntSbKN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSbaN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSbqN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YntSb6N_EeOMJMavfflX6A" name="RTstatemachinesdonotsupportdoactivities">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntScKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntScaN_EeOMJMavfflX6A" key="body" value="base_State.doActivity->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSc6N_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSdKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSdaN_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSd6N_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSeKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSeaN_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_YntSeqN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSe6N_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSfKN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YntSfaN_EeOMJMavfflX6A" name="RTstatemachinescannothaveanydeferredtriggers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSfqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSf6N_EeOMJMavfflX6A" key="body" value="base_State.deferrableTrigger->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSgaN_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSgqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSg6N_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntShaN_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntShqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSh6N_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_YntSiKN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSiaN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSiqN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YntSi6N_EeOMJMavfflX6A" name="Constraint5">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSjaN_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSjqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSj6N_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSkaN_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSkqN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSk6N_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_YntSlKN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSlaN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSlqN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_YntSl6N_EeOMJMavfflX6A" name="base_State" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_YntSmaN_EeOMJMavfflX6A" name="RTPseudostate">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSmqN_EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_NHLjsFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YntSm6N_EeOMJMavfflX6A" name="RTstatemachinesdonotsupportconcurrencyorshallowhistory">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSnKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSnaN_EeOMJMavfflX6A" key="body" value="let knd = base_Pseudostate.kind in &#xD;&#xA;   (knd &lt;> uml::PseudostateKind::shallowHistory) and&#xD;&#xA;   (knd &lt;> uml::PseudostateKind::fork) and&#xD;&#xA;   (knd &lt;> uml::PseudostateKind::join)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSn6N_EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSoKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSoaN_EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YntSo6N_EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSpKN_EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YntSpaN_EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_YntSpqN_EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSp6N_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YntSqKN_EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_YntSqaN_EeOMJMavfflX6A" name="base_Pseudostate" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Pseudostate"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_YntSq6N_EeOMJMavfflX6A" name="RTTrigger">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YntSrKN_EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_j4X18GfLEeO447LqwGjc0A"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_YntSraN_EeOMJMavfflX6A" name="base_Operation" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_rVHiEGfQEeO447LqwGjc0A" name="UMLRealTimeStateMach" nsURI="http:///schemas/UMLRealTimeStateMach/_rVG7AGfQEeO447LqwGjc0A/5" nsPrefix="UMLRealTimeStateMach">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiEWfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHiEmfQEeO447LqwGjc0A" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVJ-U2fQEeO447LqwGjc0A" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVJ-VGfQEeO447LqwGjc0A" key="Version" value="0.1.2"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVJ-VWfQEeO447LqwGjc0A" key="Comment" value="Moved RTTrigger to state machine sub-profile"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVJ-VmfQEeO447LqwGjc0A" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVJ-V2fQEeO447LqwGjc0A" key="Date" value="2013-12-18"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVJ-WGfQEeO447LqwGjc0A" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_rVHiE2fQEeO447LqwGjc0A" name="RTStateMachine">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiFGfQEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xie4kFDtEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_rVHiFWfQEeO447LqwGjc0A" name="AnRTstatemachinehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiFmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHiF2fQEeO447LqwGjc0A" key="body" value="base_StateMachine.region->size() = 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHiGWfQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiGmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHiG2fQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHiHWfQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiHmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHiH2fQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_rVHiIGfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHiIWfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHiImfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_rVHiI2fQEeO447LqwGjc0A" name="AnRTstatemachineisneverreentrant">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiJGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHiJWfQEeO447LqwGjc0A" key="body" value="not base_StateMachine.isReentrant"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHiJ2fQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiKGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHiKWfQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHiK2fQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiLGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHiLWfQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_rVHiLmfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHiL2fQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHiMGfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_rVHiMWfQEeO447LqwGjc0A" name="RTstatemachinesdonothaveparametersorparametersets">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiMmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHiM2fQEeO447LqwGjc0A" key="body" value="(base_StateMachine.ownedParameter->size()=0) and &#xD;&#xA;(base_StateMachine.ownedParameterSet->size() = 0)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHiNWfQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiNmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHiN2fQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHiOWfQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiOmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHiO2fQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_rVHiPGfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHiPWfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHiPmfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_rVHiP2fQEeO447LqwGjc0A" name="RTstatemachinesmusthaveacontextanditmustbeaClass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiQGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHiQWfQEeO447LqwGjc0A" key="body" value="(base_StateMachine.behavioredClassifier->size()=1) &#xD;&#xA;and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHiQ2fQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiRGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHiRWfQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHiR2fQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiSGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHiSWfQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_rVHiSmfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHiS2fQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHiTGfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_rVHiTWfQEeO447LqwGjc0A" name="Passivestatemachineareonlyallowedonpassivedataclasses">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiTmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHiT2fQEeO447LqwGjc0A" key="body" value="isPassive = not (base_StateMachine.behavioredClassifier.oclAsType(Class).isActive) "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHiUWfQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiUmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHiU2fQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHiVWfQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiVmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHiV2fQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_rVHiWGfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHiWWfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHiWmfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_rVHiW2fQEeO447LqwGjc0A" name="base_StateMachine" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_rVHiXWfQEeO447LqwGjc0A" name="isPassive" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <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="_rVHiX2fQEeO447LqwGjc0A" name="RTRegion">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiYGfQEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_H1bWMFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_rVHiYWfQEeO447LqwGjc0A" name="RegionsinRTstatemachinescannothaveafinalstate">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiYmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHiY2fQEeO447LqwGjc0A" key="body" value="base_Region.subvertex->forAll&#xD;&#xA;      (v | not v.oclIsKindOf(FinalState))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHiZWfQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiZmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHiZ2fQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHiaWfQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiamfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHia2fQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_rVHibGfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHibWfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHibmfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_rVHib2fQEeO447LqwGjc0A" name="base_Region" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Region"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_rVHicWfQEeO447LqwGjc0A" name="RTState">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHicmfQEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KKLAAFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_rVHic2fQEeO447LqwGjc0A" name="AcomposteRTstatehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHidGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHidWfQEeO447LqwGjc0A" key="body" value="base_State.isComposite implies &#xD;&#xA;           (base_State.region->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHid2fQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHieGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHieWfQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHie2fQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHifGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHifWfQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_rVHifmfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHif2fQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHigGfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_rVHigWfQEeO447LqwGjc0A" name="RTdoesnotsupportsubmachinestates">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHigmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHig2fQEeO447LqwGjc0A" key="body" value="not base_State.isSubmachineState"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHihWfQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHihmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHih2fQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHiiWfQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiimfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHii2fQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_rVHijGfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHijWfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHijmfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_rVHij2fQEeO447LqwGjc0A" name="RTstatemachinesdonotsupportdoactivities">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHikGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHikWfQEeO447LqwGjc0A" key="body" value="base_State.doActivity->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHik2fQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHilGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHilWfQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHil2fQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHimGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHimWfQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_rVHimmfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHim2fQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHinGfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_rVHinWfQEeO447LqwGjc0A" name="RTstatemachinescannothaveanydeferredtriggers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHinmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHin2fQEeO447LqwGjc0A" key="body" value="base_State.deferrableTrigger->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHioWfQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiomfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHio2fQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHipWfQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHipmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHip2fQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_rVHiqGfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHiqWfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHiqmfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_rVHiq2fQEeO447LqwGjc0A" name="Constraint5">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHirWfQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHirmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHir2fQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHisWfQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHismfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHis2fQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_rVHitGfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHitWfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHitmfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_rVHit2fQEeO447LqwGjc0A" name="base_State" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_rVHiuWfQEeO447LqwGjc0A" name="RTPseudostate">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiumfQEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_NHLjsFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_rVHiu2fQEeO447LqwGjc0A" name="RTstatemachinesdonotsupportconcurrencyorshallowhistory">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHivGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHivWfQEeO447LqwGjc0A" key="body" value="let knd = base_Pseudostate.kind in &#xD;&#xA;   (knd &lt;> uml::PseudostateKind::shallowHistory) and&#xD;&#xA;   (knd &lt;> uml::PseudostateKind::fork) and&#xD;&#xA;   (knd &lt;> uml::PseudostateKind::join)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHiv2fQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHiwGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHiwWfQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_rVHiw2fQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHixGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rVHixWfQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_rVHixmfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHix2fQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_rVHiyGfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_rVHiyWfQEeO447LqwGjc0A" name="base_Pseudostate" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Pseudostate"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_rVHiy2fQEeO447LqwGjc0A" name="RTTrigger">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rVHizGfQEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_j4X18GfLEeO447LqwGjc0A"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_rVHizWfQEeO447LqwGjc0A" name="base_Operation" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="__4MToGfHEeO447LqwGjc0A" name="UMLRealTimeStateMach" nsURI="http:///schemas/UMLRealTimeStateMach/__4LskGfHEeO447LqwGjc0A/4" nsPrefix="UMLRealTimeStateMach">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MToWfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MTomfHEeO447LqwGjc0A" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4P-AmfHEeO447LqwGjc0A" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4P-A2fHEeO447LqwGjc0A" key="Version" value="0.1.1"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4P-BGfHEeO447LqwGjc0A" key="Comment" value="Modified RTStateMachine to add isPassive; changed some constraints and added new ones"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4P-BWfHEeO447LqwGjc0A" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4P-BmfHEeO447LqwGjc0A" key="Date" value="2013-12-18"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4P-B2fHEeO447LqwGjc0A" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="__4MTo2fHEeO447LqwGjc0A" name="RTStateMachine">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MTpGfHEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xie4kFDtEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="__4MTpWfHEeO447LqwGjc0A" name="AnRTstatemachinehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MTpmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MTp2fHEeO447LqwGjc0A" key="body" value="base_StateMachine.region->size() = 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MTqWfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MTqmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MTq2fHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MTrWfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MTrmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MTr2fHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="__4MTsGfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MTsWfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MTsmfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="__4MTs2fHEeO447LqwGjc0A" name="AnRTstatemachineisneverreentrant">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MTtGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MTtWfHEeO447LqwGjc0A" key="body" value="not base_StateMachine.isReentrant"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MTt2fHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MTuGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MTuWfHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MTu2fHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MTvGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MTvWfHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="__4MTvmfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MTv2fHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MTwGfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="__4MTwWfHEeO447LqwGjc0A" name="RTstatemachinesdonothaveparametersorparametersets">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MTwmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MTw2fHEeO447LqwGjc0A" key="body" value="(base_StateMachine.ownedParameter->size()=0) and &#xD;&#xA;(base_StateMachine.ownedParameterSet->size() = 0)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MTxWfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MTxmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MTx2fHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MTyWfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MTymfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MTy2fHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="__4MTzGfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MTzWfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MTzmfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="__4MTz2fHEeO447LqwGjc0A" name="RTstatemachinesmusthaveacontextanditmustbeaClass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MT0GfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MT0WfHEeO447LqwGjc0A" key="body" value="(base_StateMachine.behavioredClassifier->size()=1) &#xD;&#xA;and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MT02fHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MT1GfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MT1WfHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MT12fHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MT2GfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MT2WfHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="__4MT2mfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MT22fHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MT3GfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="__4MT3WfHEeO447LqwGjc0A" name="Passivestatemachineareonlyallowedonpassivedataclasses">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MT3mfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MT32fHEeO447LqwGjc0A" key="body" value="isPassive = not (base_StateMachine.behavioredClassifier.oclAsType(Class).isActive) "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MT4WfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MT4mfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MT42fHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MT5WfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MT5mfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MT52fHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="__4MT6GfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MT6WfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MT6mfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="__4MT62fHEeO447LqwGjc0A" name="base_StateMachine" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="__4MT7WfHEeO447LqwGjc0A" name="isPassive" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <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="__4MT72fHEeO447LqwGjc0A" name="RTRegion">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MT8GfHEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_H1bWMFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="__4MT8WfHEeO447LqwGjc0A" name="RegionsinRTstatemachinescannothaveafinalstate">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MT8mfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MT82fHEeO447LqwGjc0A" key="body" value="base_Region.subvertex->forAll&#xD;&#xA;      (v | not v.oclIsKindOf(FinalState))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MT9WfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MT9mfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MT92fHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MT-WfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MT-mfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MT-2fHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="__4MT_GfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MT_WfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MT_mfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="__4MT_2fHEeO447LqwGjc0A" name="base_Region" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Region"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="__4MUAWfHEeO447LqwGjc0A" name="RTState">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MUAmfHEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KKLAAFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="__4MUA2fHEeO447LqwGjc0A" name="AcomposteRTstatehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MUBGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MUBWfHEeO447LqwGjc0A" key="body" value="base_State.isComposite implies &#xD;&#xA;           (base_State.region->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MUB2fHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MUCGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MUCWfHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MUC2fHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MUDGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MUDWfHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="__4MUDmfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MUD2fHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MUEGfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="__4MUEWfHEeO447LqwGjc0A" name="RTdoesnotsupportsubmachinestates">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MUEmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MUE2fHEeO447LqwGjc0A" key="body" value="not base_State.isSubmachineState"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MUFWfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MUFmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MUF2fHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MUGWfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MUGmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MUG2fHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="__4MUHGfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MUHWfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MUHmfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="__4MUH2fHEeO447LqwGjc0A" name="RTstatemachinesdonotsupportdoactivities">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MUIGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MUIWfHEeO447LqwGjc0A" key="body" value="base_State.doActivity->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MUI2fHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MUJGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MUJWfHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MUJ2fHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MUKGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MUKWfHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="__4MUKmfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MUK2fHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MULGfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="__4MULWfHEeO447LqwGjc0A" name="RTstatemachinescannothaveanydeferredtriggers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MULmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MUL2fHEeO447LqwGjc0A" key="body" value="base_State.deferrableTrigger->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MUMWfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MUMmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MUM2fHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MUNWfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MUNmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MUN2fHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="__4MUOGfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MUOWfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MUOmfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="__4MUO2fHEeO447LqwGjc0A" name="Constraint5">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MUPWfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MUPmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MUP2fHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MUQWfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MUQmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MUQ2fHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="__4MURGfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MURWfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MURmfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="__4MUR2fHEeO447LqwGjc0A" name="base_State" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="__4MUSWfHEeO447LqwGjc0A" name="RTPseudostate">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MUSmfHEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_NHLjsFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="__4MUS2fHEeO447LqwGjc0A" name="RTstatemachinesdonotsupportconcurrencyorshallowhistory">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MUTGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MUTWfHEeO447LqwGjc0A" key="body" value="let knd = base_Pseudostate.kind in &#xD;&#xA;   (knd &lt;> uml::PseudostateKind::shallowHistory) and&#xD;&#xA;   (knd &lt;> uml::PseudostateKind::fork) and&#xD;&#xA;   (knd &lt;> uml::PseudostateKind::join)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MUT2fHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MUUGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MUUWfHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="__4MUU2fHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__4MUVGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__4MUVWfHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="__4MUVmfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MUV2fHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="__4MUWGfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="__4MUWWfHEeO447LqwGjc0A" name="base_Pseudostate" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Pseudostate"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_aA3AwGGVEeOesvHnEWH_sQ" name="UMLRealTimeStateMach" nsURI="http:///schemas/UMLRealTimeStateMach/_aA2ZsGGVEeOesvHnEWH_sQ/3" nsPrefix="UMLRealTimeStateMach">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3AwWGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3AwmGVEeOesvHnEWH_sQ" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA4O5GGVEeOesvHnEWH_sQ" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA418GGVEeOesvHnEWH_sQ" key="Version" value="0.1.0"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA418WGVEeOesvHnEWH_sQ" key="Comment" value="First release of UML-RT State machine profile"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA418mGVEeOesvHnEWH_sQ" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA4182GVEeOesvHnEWH_sQ" key="Date" value="2013-12-10"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA419GGVEeOesvHnEWH_sQ" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_aA3Aw2GVEeOesvHnEWH_sQ" name="RTStateMachine">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3AxGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xie4kFDtEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_aA3AxWGVEeOesvHnEWH_sQ" name="AnRTstatemachinehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3AxmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3Ax2GVEeOesvHnEWH_sQ" key="body" value="base_StateMachine.region->size() = 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3AyWGVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3AymGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3Ay2GVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3AzWGVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3AzmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3Az2GVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_aA3A0GGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3A0WGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3A0mGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_aA3A02GVEeOesvHnEWH_sQ" name="AnRTstatemachineisneverreentrant">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3A1GGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3A1WGVEeOesvHnEWH_sQ" key="body" value="not base_StateMachine.isReentrant"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3A12GVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3A2GGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3A2WGVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3A22GVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3A3GGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3A3WGVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_aA3A3mGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3A32GVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3A4GGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_aA3A4WGVEeOesvHnEWH_sQ" name="RTstatemachinesdonothaveparametersorparametersets">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3A4mGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3A42GVEeOesvHnEWH_sQ" key="body" value="(base_StateMachine.ownedParameter->size()=0) and &#xD;&#xA;(base_StateMachine.ownedParameterSet->size() = 0)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3A5WGVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3A5mGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3A52GVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3A6WGVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3A6mGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3A62GVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_aA3A7GGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3A7WGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3A7mGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_aA3A72GVEeOesvHnEWH_sQ" name="base_StateMachine" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_aA3A8WGVEeOesvHnEWH_sQ" name="RTRegion">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3A8mGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_H1bWMFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_aA3A82GVEeOesvHnEWH_sQ" name="RegionsinRTstatemachinescannothaveafinalstate">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3A9GGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3A9WGVEeOesvHnEWH_sQ" key="body" value="base_Region.subvertex->forAll&#xD;&#xA;      (v | not v.oclIsKindOf(FinalState))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3A92GVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3A-GGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3A-WGVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3A-2GVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3A_GGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3A_WGVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_aA3A_mGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3A_2GVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3BAGGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_aA3BAWGVEeOesvHnEWH_sQ" name="base_Region" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Region"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_aA3BA2GVEeOesvHnEWH_sQ" name="RTState">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3BBGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KKLAAFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_aA3BBWGVEeOesvHnEWH_sQ" name="AcomposteRTstatecanhasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3BBmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3BB2GVEeOesvHnEWH_sQ" key="body" value="base_State.isComposite implies &#xD;&#xA;           (base_State.region->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3BCWGVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3BCmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3BC2GVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3BDWGVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3BDmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3BD2GVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_aA3BEGGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3BEWGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3BEmGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_aA3BE2GVEeOesvHnEWH_sQ" name="RTdoesnotsupportsubmachinestates">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3BFGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3BFWGVEeOesvHnEWH_sQ" key="body" value="not base_State.isSubmachineState"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3BF2GVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3BGGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3BGWGVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3BG2GVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3BHGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3BHWGVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_aA3BHmGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3BH2GVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3BIGGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_aA3BIWGVEeOesvHnEWH_sQ" name="RTstatemachinesdonotsupportdoactivities">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3BImGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3BI2GVEeOesvHnEWH_sQ" key="body" value="base_State.doActivity->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3BJWGVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3BJmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3BJ2GVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3BKWGVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3BKmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3BK2GVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_aA3BLGGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3BLWGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3BLmGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_aA3BL2GVEeOesvHnEWH_sQ" name="RTstatemachinescannothaveanydeferredtriggers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3BMGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3BMWGVEeOesvHnEWH_sQ" key="body" value="base_State.deferrableTrigger->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3BM2GVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3BNGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3BNWGVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3BN2GVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3BOGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3BOWGVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_aA3BOmGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3BO2GVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3BPGGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_aA3BPWGVEeOesvHnEWH_sQ" name="Constraint5">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3BP2GVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3BQGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3BQWGVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3BQ2GVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3BRGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3BRWGVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_aA3BRmGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3BR2GVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3BSGGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_aA3BSWGVEeOesvHnEWH_sQ" name="base_State" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_aA3BS2GVEeOesvHnEWH_sQ" name="RTPseudostate">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3BTGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_NHLjsFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_aA3BTWGVEeOesvHnEWH_sQ" name="RTstatemachinesdonotsupportconcurrencyorshallowhistory">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3BTmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3BT2GVEeOesvHnEWH_sQ" key="body" value="let knd = base_Pseudostate.kind in &#xD;&#xA;   (knd &lt;> uml::PseudostateKind::shallowHistory) and&#xD;&#xA;   (knd &lt;> uml::PseudostateKind::fork) and&#xD;&#xA;   (knd &lt;> uml::PseudostateKind::join)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3BUWGVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3BUmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3BU2GVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_aA3BVWGVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aA3BVmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aA3BV2GVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_aA3BWGGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3BWWGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_aA3BWmGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_aA3BW2GVEeOesvHnEWH_sQ" name="base_Pseudostate" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Pseudostate"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_s7BVgVD-EeOMYqaaVdNqwA" name="UMLRealTimeStateMach" nsURI="http:///schemas/UMLRealTimeStateMach/_s7BVgFD-EeOMYqaaVdNqwA/2" nsPrefix="UMLRealTimeStateMach">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BVglD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BVg1D-EeOMYqaaVdNqwA" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BWIlD-EeOMYqaaVdNqwA" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BWI1D-EeOMYqaaVdNqwA" key="Version" value="0.0.3"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BWJFD-EeOMYqaaVdNqwA" key="Comment" value="Corrected previous update"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BWJVD-EeOMYqaaVdNqwA" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BWJlD-EeOMYqaaVdNqwA" key="Date" value="2013-11-19"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BWJ1D-EeOMYqaaVdNqwA" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_s7BVhFD-EeOMYqaaVdNqwA" name="RTStateMachine">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BVhVD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xie4kFDtEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_s7BVhlD-EeOMYqaaVdNqwA" name="AnRTstatemachinehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BVh1D-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BViFD-EeOMYqaaVdNqwA" key="body" value="base_StateMachine.region->size() = 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BVilD-EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BVi1D-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BVjFD-EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BVjlD-EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BVj1D-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BVkFD-EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_s7BVkVD-EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BVklD-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BVk1D-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_s7BVlFD-EeOMYqaaVdNqwA" name="AnRTstatemachineisneverreentrant">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BVlVD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BVllD-EeOMYqaaVdNqwA" key="body" value="not base_StateMachine.isReentrant"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BVmFD-EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BVmVD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BVmlD-EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BVnFD-EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BVnVD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BVnlD-EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_s7BVn1D-EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BVoFD-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BVoVD-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_s7BVolD-EeOMYqaaVdNqwA" name="RTstatemachinesdonothaveparametersorparametersets">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BVo1D-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BVpFD-EeOMYqaaVdNqwA" key="body" value="(base_StateMachine.ownedParameter->size()=0) and &#xD;&#xA;(base_StateMachine.ownedParameterSet->size() = 0)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BVplD-EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BVp1D-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BVqFD-EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BVqlD-EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BVq1D-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BVrFD-EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_s7BVrVD-EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BVrlD-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BVr1D-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_s7BVsFD-EeOMYqaaVdNqwA" name="base_StateMachine" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_s7BVslD-EeOMYqaaVdNqwA" name="RTRegion">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BVs1D-EeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_H1bWMFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_s7BVtFD-EeOMYqaaVdNqwA" name="RegionsinRTstatemachinescannothaveafinalstate">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BVtVD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BVtlD-EeOMYqaaVdNqwA" key="body" value="base_Region.subvertex->forAll&#xD;&#xA;      (v | not v.oclIsKindOf(FinalState))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BVuFD-EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BVuVD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BVulD-EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BVvFD-EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BVvVD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BVvlD-EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_s7BVv1D-EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BVwFD-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BVwVD-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_s7BVwlD-EeOMYqaaVdNqwA" name="base_Region" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Region"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_s7BVxFD-EeOMYqaaVdNqwA" name="RTState">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BVxVD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KKLAAFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_s7BVxlD-EeOMYqaaVdNqwA" name="AcomposteRTstatecanhasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BVx1D-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BVyFD-EeOMYqaaVdNqwA" key="body" value="base_State.isComposite implies &#xD;&#xA;           (base_State.region->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BVylD-EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BVy1D-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BVzFD-EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BVzlD-EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BVz1D-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BV0FD-EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_s7BV0VD-EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BV0lD-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BV01D-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_s7BV1FD-EeOMYqaaVdNqwA" name="RTdoesnotsupportsubmachinestates">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BV1VD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BV1lD-EeOMYqaaVdNqwA" key="body" value="not base_State.isSubmachineState"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BV2FD-EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BV2VD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BV2lD-EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BV3FD-EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BV3VD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BV3lD-EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_s7BV31D-EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BV4FD-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BV4VD-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_s7BV4lD-EeOMYqaaVdNqwA" name="RTstatemachinesdonotsupportdoactivities">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BV41D-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BV5FD-EeOMYqaaVdNqwA" key="body" value="base_State.doActivity->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BV5lD-EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BV51D-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BV6FD-EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BV6lD-EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BV61D-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BV7FD-EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_s7BV7VD-EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BV7lD-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BV71D-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_s7BV8FD-EeOMYqaaVdNqwA" name="RTstatemachinescannothaveanydeferredtriggers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BV8VD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BV8lD-EeOMYqaaVdNqwA" key="body" value="base_State.deferrableTrigger->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BV9FD-EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BV9VD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BV9lD-EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BV-FD-EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BV-VD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BV-lD-EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_s7BV-1D-EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BV_FD-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BV_VD-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_s7BV_lD-EeOMYqaaVdNqwA" name="Constraint5">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BWAFD-EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BWAVD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BWAlD-EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BWBFD-EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BWBVD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BWBlD-EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_s7BWB1D-EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BWCFD-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BWCVD-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_s7BWClD-EeOMYqaaVdNqwA" name="base_State" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_s7BWDFD-EeOMYqaaVdNqwA" name="RTPseudostate">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BWDVD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_NHLjsFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_s7BWDlD-EeOMYqaaVdNqwA" name="RTstatemachinesdonotsupportconcurrencyorshallowhistory">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BWD1D-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BWEFD-EeOMYqaaVdNqwA" key="body" value="let knd = base_Pseudostate.kind in &#xD;&#xA;   (knd &lt;> uml::PseudostateKind::shallowHistory) and&#xD;&#xA;   (knd &lt;> uml::PseudostateKind::fork) and&#xD;&#xA;   (knd &lt;> uml::PseudostateKind::join)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BWElD-EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BWE1D-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BWFFD-EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_s7BWFlD-EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7BWF1D-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7BWGFD-EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_s7BWGVD-EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BWGlD-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_s7BWG1D-EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_s7BWHFD-EeOMYqaaVdNqwA" name="base_Pseudostate" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Pseudostate"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_ixh9AVD-EeOMYqaaVdNqwA" name="UMLRealTimeStateMach" nsURI="http:///schemas/UMLRealTimeStateMach/_ixh9AFD-EeOMYqaaVdNqwA/1" nsPrefix="UMLRealTimeStateMach">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ixh9HlD-EeOMYqaaVdNqwA" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ixh9H1D-EeOMYqaaVdNqwA" key="Version" value="0.0.2"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ixh9IFD-EeOMYqaaVdNqwA" key="Comment" value="changed constraint on state to allow no regions"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ixh9IVD-EeOMYqaaVdNqwA" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ixh9IlD-EeOMYqaaVdNqwA" key="Date" value="2013-11-19"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ixh9I1D-EeOMYqaaVdNqwA" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_ixh9AlD-EeOMYqaaVdNqwA" name="RTStateMachine">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ixh9A1D-EeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xie4kFDtEeOA4ecmvfqvaw"/>

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ixh9BFD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ixh9BVD-EeOMYqaaVdNqwA" key="documentation" value="base_StateMachine.region->size() = 1&#xD;&#xA;not base_StateMachine.isReentrant&#xD;&#xA;(base_StateMachine.ownedParameter->size()=0) and &#xD;&#xA;(base_StateMachine.ownedParameterSet->size() = 0)"/>

-          </eAnnotations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ixh9BlD-EeOMYqaaVdNqwA" name="base_StateMachine" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_ixh9CFD-EeOMYqaaVdNqwA" name="RTRegion">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ixh9CVD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_H1bWMFDuEeOA4ecmvfqvaw"/>

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ixh9ClD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ixh9C1D-EeOMYqaaVdNqwA" key="documentation" value="base_Region.subvertex->forAll&#xD;&#xA;      (v | not v.oclIsKindOf(FinalState))"/>

-          </eAnnotations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ixh9DFD-EeOMYqaaVdNqwA" name="base_Region" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Region"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_ixh9DlD-EeOMYqaaVdNqwA" name="RTState">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ixh9D1D-EeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KKLAAFDuEeOA4ecmvfqvaw"/>

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ixh9EFD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ixh9EVD-EeOMYqaaVdNqwA" key="documentation" value="base_State.isComposite implies &#xD;&#xA;           (base_State.region->size() &lt;= 1)&#xD;&#xA;not base_State.isSubmachineState&#xD;&#xA;base_State.doActivity->size() = 0&#xD;&#xA;base_State.deferrableTrigger->size() = 0"/>

-          </eAnnotations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ixh9ElD-EeOMYqaaVdNqwA" name="base_State" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_ixh9FFD-EeOMYqaaVdNqwA" name="RTPseudostate">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ixh9FVD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_NHLjsFDuEeOA4ecmvfqvaw"/>

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ixh9FlD-EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ixh9F1D-EeOMYqaaVdNqwA" key="documentation" value="let knd = base_Pseudostate.kind in &#xD;&#xA;   (knd &lt;> uml::PseudostateKind::shallowHistory) and&#xD;&#xA;   (knd &lt;> uml::PseudostateKind::fork) and&#xD;&#xA;   (knd &lt;> uml::PseudostateKind::join)"/>

-          </eAnnotations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ixh9GFD-EeOMYqaaVdNqwA" name="base_Pseudostate" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Pseudostate"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_izJqcVD6EeOMYqaaVdNqwA" name="UMLRealTimeStateMach" nsURI="http:///schemas/UMLRealTimeStateMach/_izDj0FD6EeOMYqaaVdNqwA/0" nsPrefix="UMLRealTimeStateMach">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqclD6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJqc1D6EeOMYqaaVdNqwA" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJrElD6EeOMYqaaVdNqwA" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izPxEFD6EeOMYqaaVdNqwA" key="Version" value="0.0.1"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izPxEVD6EeOMYqaaVdNqwA" key="Comment" value="First version of putative UML-RT state machine profile"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izPxElD6EeOMYqaaVdNqwA" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izPxE1D6EeOMYqaaVdNqwA" key="Date" value="2013-11-19"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izPxFFD6EeOMYqaaVdNqwA" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_izJqdFD6EeOMYqaaVdNqwA" name="RTStateMachine">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqdVD6EeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xie4kFDtEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_izJqdlD6EeOMYqaaVdNqwA" name="AnRTstatemachinehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqd1D6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJqeFD6EeOMYqaaVdNqwA" key="body" value="base_StateMachine.region->size() = 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJqelD6EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqe1D6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJqfFD6EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJqflD6EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqf1D6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJqgFD6EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_izJqgVD6EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJqglD6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJqg1D6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_izJqhFD6EeOMYqaaVdNqwA" name="AnRTstatemachineisneverreentrant">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqhVD6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJqhlD6EeOMYqaaVdNqwA" key="body" value="not base_StateMachine.isReentrant"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJqiFD6EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqiVD6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJqilD6EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJqjFD6EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqjVD6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJqjlD6EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_izJqj1D6EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJqkFD6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJqkVD6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_izJqklD6EeOMYqaaVdNqwA" name="RTstatemachinesdonothaveparametersorparametersets">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqk1D6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJqlFD6EeOMYqaaVdNqwA" key="body" value="(base_StateMachine.ownedParameter->size()=0) and &#xD;&#xA;(base_StateMachine.ownedParameterSet->size() = 0)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJqllD6EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJql1D6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJqmFD6EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJqmlD6EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqm1D6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJqnFD6EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_izJqnVD6EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJqnlD6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJqn1D6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_izJqoFD6EeOMYqaaVdNqwA" name="base_StateMachine" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_izJqolD6EeOMYqaaVdNqwA" name="RTRegion">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqo1D6EeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_H1bWMFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_izJqpFD6EeOMYqaaVdNqwA" name="RegionsinRTstatemachinescannothaveafinalstate">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqpVD6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJqplD6EeOMYqaaVdNqwA" key="body" value="base_Region.subvertex->forAll&#xD;&#xA;      (v | not v.oclIsKindOf(FinalState))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJqqFD6EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqqVD6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJqqlD6EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJqrFD6EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqrVD6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJqrlD6EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_izJqr1D6EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJqsFD6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJqsVD6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_izJqslD6EeOMYqaaVdNqwA" name="base_Region" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Region"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_izJqtFD6EeOMYqaaVdNqwA" name="RTState">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqtVD6EeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KKLAAFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_izJqtlD6EeOMYqaaVdNqwA" name="AcomposteRTstatehasexactlyoneregion">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqt1D6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJquFD6EeOMYqaaVdNqwA" key="body" value="base_State.isComposite implies &#xD;&#xA;           (base_State.region->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJqulD6EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqu1D6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJqvFD6EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJqvlD6EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqv1D6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJqwFD6EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_izJqwVD6EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJqwlD6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJqw1D6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_izJqxFD6EeOMYqaaVdNqwA" name="RTdoesnotsupportsubmachinestates">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqxVD6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJqxlD6EeOMYqaaVdNqwA" key="body" value="not base_State.isSubmachineState"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJqyFD6EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqyVD6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJqylD6EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJqzFD6EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJqzVD6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJqzlD6EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_izJqz1D6EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJq0FD6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJq0VD6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_izJq0lD6EeOMYqaaVdNqwA" name="RTstatemachinesdonotsupportdoactivities">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJq01D6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJq1FD6EeOMYqaaVdNqwA" key="body" value="base_State.doActivity->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJq1lD6EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJq11D6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJq2FD6EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJq2lD6EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJq21D6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJq3FD6EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_izJq3VD6EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJq3lD6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJq31D6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_izJq4FD6EeOMYqaaVdNqwA" name="RTstatemachinescannothaveanydeferredtriggers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJq4VD6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJq4lD6EeOMYqaaVdNqwA" key="body" value="base_State.deferrableTrigger->size() = 0"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJq5FD6EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJq5VD6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJq5lD6EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJq6FD6EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJq6VD6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJq6lD6EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_izJq61D6EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJq7FD6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJq7VD6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_izJq7lD6EeOMYqaaVdNqwA" name="Constraint5">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJq8FD6EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJq8VD6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJq8lD6EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJq9FD6EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJq9VD6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJq9lD6EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_izJq91D6EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJq-FD6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJq-VD6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_izJq-lD6EeOMYqaaVdNqwA" name="base_State" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_izJq_FD6EeOMYqaaVdNqwA" name="RTPseudostate">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJq_VD6EeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_NHLjsFDuEeOA4ecmvfqvaw"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_izJq_lD6EeOMYqaaVdNqwA" name="RTstatemachinesdonotsupportconcurrencyorshallowhistory">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJq_1D6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJrAFD6EeOMYqaaVdNqwA" key="body" value="let knd = base_Pseudostate.kind in &#xD;&#xA;   (knd &lt;> uml::PseudostateKind::shallowHistory) and&#xD;&#xA;   (knd &lt;> uml::PseudostateKind::fork) and&#xD;&#xA;   (knd &lt;> uml::PseudostateKind::join)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJrAlD6EeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJrA1D6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJrBFD6EeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_izJrBlD6EeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_izJrB1D6EeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_izJrCFD6EeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_izJrCVD6EeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJrClD6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_izJrC1D6EeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_izJrDFD6EeOMYqaaVdNqwA" name="base_Pseudostate" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Pseudostate"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-    </eAnnotations>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_wVhWMFDtEeOA4ecmvfqvaw" alias="StateMachine">

+  <uml:Profile xmi:id="_KLcn0FDtEeOA4ecmvfqvaw" name="UMLRealTimeStateMach" URI="http://www.eclipse.org/papyrus/umlrt/statemachine" metaclassReference="_wVhWMFDtEeOA4ecmvfqvaw _CWExkFDuEeOA4ecmvfqvaw _CWExkVDuEeOA4ecmvfqvaw _CWExklDuEeOA4ecmvfqvaw _imhMgGfLEeO447LqwGjc0A" metamodelReference="_KLcn0VDtEeOA4ecmvfqvaw">

+    <elementImport xmi:id="_wVhWMFDtEeOA4ecmvfqvaw" alias="StateMachine">

       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#StateMachine"/>

     </elementImport>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_CWExkFDuEeOA4ecmvfqvaw" alias="Pseudostate">

+    <elementImport xmi:id="_CWExkFDuEeOA4ecmvfqvaw" alias="Pseudostate">

       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Pseudostate"/>

     </elementImport>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_CWExkVDuEeOA4ecmvfqvaw" alias="Region">

+    <elementImport xmi:id="_CWExkVDuEeOA4ecmvfqvaw" alias="Region">

       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Region"/>

     </elementImport>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_CWExklDuEeOA4ecmvfqvaw" alias="State">

+    <elementImport xmi:id="_CWExklDuEeOA4ecmvfqvaw" alias="State">

       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#State"/>

     </elementImport>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_imhMgGfLEeO447LqwGjc0A" alias="Operation">

+    <elementImport xmi:id="_imhMgGfLEeO447LqwGjc0A" alias="Operation">

       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>

     </elementImport>

-    <packageImport xmi:type="uml:PackageImport" xmi:id="_KLcn0VDtEeOA4ecmvfqvaw">

+    <packageImport xmi:id="_KLcn0VDtEeOA4ecmvfqvaw">

       <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>

     </packageImport>

-    <packageImport xmi:type="uml:PackageImport" xmi:id="_KLcn0lDtEeOA4ecmvfqvaw">

+    <packageImport xmi:id="_KLcn0lDtEeOA4ecmvfqvaw">

       <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

     </packageImport>

     <packagedElement xmi:type="uml:Stereotype" xmi:id="_xie4kFDtEeOA4ecmvfqvaw" name="RTStateMachine">

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_7YHrgFDuEeOA4ecmvfqvaw" name="An RT state machine has exactly one region" constrainedElement="_xie4kFDtEeOA4ecmvfqvaw">

+      <ownedRule xmi:id="_7YHrgFDuEeOA4ecmvfqvaw" name="An RT state machine has exactly one region" constrainedElement="_xie4kFDtEeOA4ecmvfqvaw">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_PzHwEFDvEeOA4ecmvfqvaw">

           <language>OCL</language>

           <body>base_StateMachine.region->size() = 1</body>

         </specification>

       </ownedRule>

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_T5csQFDvEeOA4ecmvfqvaw" name="An RT state machine is never re-entrant" constrainedElement="_xie4kFDtEeOA4ecmvfqvaw">

+      <ownedRule xmi:id="_T5csQFDvEeOA4ecmvfqvaw" name="An RT state machine is never re-entrant" constrainedElement="_xie4kFDtEeOA4ecmvfqvaw">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_gzObEFDvEeOA4ecmvfqvaw">

           <language>OCL</language>

           <body>not base_StateMachine.isReentrant</body>

         </specification>

       </ownedRule>

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_6wToIFDvEeOA4ecmvfqvaw" name="RT state machines do not have parameters or parameter sets" constrainedElement="_xie4kFDtEeOA4ecmvfqvaw">

+      <ownedRule xmi:id="_6wToIFDvEeOA4ecmvfqvaw" name="RT state machines do not have parameters or parameter sets" constrainedElement="_xie4kFDtEeOA4ecmvfqvaw">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_aJvJIFDwEeOA4ecmvfqvaw">

           <language>OCL</language>

           <body>(base_StateMachine.ownedParameter->size()=0) and &#xD;

 (base_StateMachine.ownedParameterSet->size() = 0)</body>

         </specification>

       </ownedRule>

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_IKB9EGe_EeO447LqwGjc0A" name="RT state machines must have a context and it must be a Class" constrainedElement="_xie4kFDtEeOA4ecmvfqvaw">

+      <ownedRule xmi:id="_IKB9EGe_EeO447LqwGjc0A" name="RT state machines must have a context and it must be a Class" constrainedElement="_xie4kFDtEeOA4ecmvfqvaw">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_Xs7DMGe_EeO447LqwGjc0A">

           <language>OCL</language>

           <body>(base_StateMachine.behavioredClassifier->size()=1) &#xD;

 and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))</body>

         </specification>

       </ownedRule>

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_ZzQdkGe_EeO447LqwGjc0A" name="Passive state machine are only allowed on passive data classes" constrainedElement="_xie4kFDtEeOA4ecmvfqvaw">

+      <ownedRule xmi:id="_ZzQdkGe_EeO447LqwGjc0A" name="Passive state machine are only allowed on passive data classes" constrainedElement="_xie4kFDtEeOA4ecmvfqvaw">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_v7hfwGfAEeO447LqwGjc0A">

           <language>OCL</language>

           <body>isPassive = not (base_StateMachine.behavioredClassifier.oclAsType(Class).isActive) </body>

         </specification>

       </ownedRule>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_0bVVAFDtEeOA4ecmvfqvaw" name="base_StateMachine" association="_0bVVAVDtEeOA4ecmvfqvaw">

+      <ownedAttribute xmi:id="_0bVVAFDtEeOA4ecmvfqvaw" name="base_StateMachine" association="_0bVVAVDtEeOA4ecmvfqvaw">

         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#StateMachine"/>

       </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="__J-uUGe9EeO447LqwGjc0A" name="isPassive" visibility="public">

+      <ownedAttribute xmi:id="__J-uUGe9EeO447LqwGjc0A" name="isPassive" visibility="public">

         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AuCiEGe-EeO447LqwGjc0A" value="1"/>

         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AuDwMGe-EeO447LqwGjc0A" value="1"/>

@@ -5015,52 +69,52 @@ and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))</body>
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_0bVVAlDtEeOA4ecmvfqvaw" name="extension_RTStateMachine" type="_xie4kFDtEeOA4ecmvfqvaw" aggregation="composite" association="_0bVVAVDtEeOA4ecmvfqvaw"/>

     </packagedElement>

     <packagedElement xmi:type="uml:Stereotype" xmi:id="_H1bWMFDuEeOA4ecmvfqvaw" name="RTRegion">

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_WgCpIFDxEeOA4ecmvfqvaw" name="Regions in RT state machines cannot have a final state" constrainedElement="_H1bWMFDuEeOA4ecmvfqvaw">

+      <ownedRule xmi:id="_WgCpIFDxEeOA4ecmvfqvaw" name="Regions in RT state machines cannot have a final state" constrainedElement="_H1bWMFDuEeOA4ecmvfqvaw">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_-AyPgFDxEeOA4ecmvfqvaw">

           <language>OCL</language>

           <body>base_Region.subvertex->forAll&#xD;

       (v | not v.oclIsKindOf(FinalState))</body>

         </specification>

       </ownedRule>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_P_3BAFDuEeOA4ecmvfqvaw" name="base_Region" association="_P_3BAVDuEeOA4ecmvfqvaw">

+      <ownedAttribute xmi:id="_P_3BAFDuEeOA4ecmvfqvaw" name="base_Region" association="_P_3BAVDuEeOA4ecmvfqvaw">

         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Region"/>

       </ownedAttribute>

     </packagedElement>

     <packagedElement xmi:type="uml:Stereotype" xmi:id="_KKLAAFDuEeOA4ecmvfqvaw" name="RTState">

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_a-6ywFDyEeOA4ecmvfqvaw" name="A composte RT state has exactly one region" constrainedElement="_KKLAAFDuEeOA4ecmvfqvaw">

+      <ownedRule xmi:id="_a-6ywFDyEeOA4ecmvfqvaw" name="A composte RT state has exactly one region" constrainedElement="_KKLAAFDuEeOA4ecmvfqvaw">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_-FbpgFDyEeOA4ecmvfqvaw">

           <language>OCL</language>

           <body>base_State.isComposite implies &#xD;

            (base_State.region->size() = 1)</body>

         </specification>

       </ownedRule>

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_b79CwFDyEeOA4ecmvfqvaw" name="RT does not support submachine states" constrainedElement="_KKLAAFDuEeOA4ecmvfqvaw">

+      <ownedRule xmi:id="_b79CwFDyEeOA4ecmvfqvaw" name="RT does not support submachine states" constrainedElement="_KKLAAFDuEeOA4ecmvfqvaw">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_PFqQUFDzEeOA4ecmvfqvaw">

           <language>OCL</language>

           <body>not base_State.isSubmachineState</body>

         </specification>

       </ownedRule>

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_dXOG4FDyEeOA4ecmvfqvaw" name="RT state machines do not support &quot;do&quot; activities" constrainedElement="_KKLAAFDuEeOA4ecmvfqvaw">

+      <ownedRule xmi:id="_dXOG4FDyEeOA4ecmvfqvaw" name="RT state machines do not support &quot;do&quot; activities" constrainedElement="_KKLAAFDuEeOA4ecmvfqvaw">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_gXHxEFDzEeOA4ecmvfqvaw">

           <language>OCL</language>

           <body>base_State.doActivity->size() = 0</body>

         </specification>

       </ownedRule>

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_eTI8kFDyEeOA4ecmvfqvaw" name="RT state machines cannot have any deferred triggers " constrainedElement="_KKLAAFDuEeOA4ecmvfqvaw">

+      <ownedRule xmi:id="_eTI8kFDyEeOA4ecmvfqvaw" name="RT state machines cannot have any deferred triggers " constrainedElement="_KKLAAFDuEeOA4ecmvfqvaw">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_1bPEEFDzEeOA4ecmvfqvaw">

           <language>OCL</language>

           <body>base_State.deferrableTrigger->size() = 0</body>

         </specification>

       </ownedRule>

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_fRL5MFDyEeOA4ecmvfqvaw" name="Constraint5" constrainedElement="_KKLAAFDuEeOA4ecmvfqvaw">

+      <ownedRule xmi:id="_fRL5MFDyEeOA4ecmvfqvaw" name="Constraint5" constrainedElement="_KKLAAFDuEeOA4ecmvfqvaw">

         <specification xmi:type="uml:LiteralString" xmi:id="_fRL5MVDyEeOA4ecmvfqvaw" name="constraintSpec"/>

       </ownedRule>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_UsH70FDuEeOA4ecmvfqvaw" name="base_State" association="_UsH70VDuEeOA4ecmvfqvaw">

+      <ownedAttribute xmi:id="_UsH70FDuEeOA4ecmvfqvaw" name="base_State" association="_UsH70VDuEeOA4ecmvfqvaw">

         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#State"/>

       </ownedAttribute>

     </packagedElement>

     <packagedElement xmi:type="uml:Stereotype" xmi:id="_NHLjsFDuEeOA4ecmvfqvaw" name="RTPseudostate">

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_C1PjYFD6EeOMYqaaVdNqwA" name="RT state machines do not support concurrency or shallow history" constrainedElement="_NHLjsFDuEeOA4ecmvfqvaw">

+      <ownedRule xmi:id="_C1PjYFD6EeOMYqaaVdNqwA" name="RT state machines do not support concurrency or shallow history" constrainedElement="_NHLjsFDuEeOA4ecmvfqvaw">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_bx6cUFD6EeOMYqaaVdNqwA">

           <language>OCL</language>

           <body>let knd = base_Pseudostate.kind in &#xD;

@@ -5069,7 +123,7 @@ and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))</body>
    (knd &lt;> UML::PseudostateKind::join)</body>

         </specification>

       </ownedRule>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_WoF5QFDuEeOA4ecmvfqvaw" name="base_Pseudostate" association="_WoF5QVDuEeOA4ecmvfqvaw">

+      <ownedAttribute xmi:id="_WoF5QFDuEeOA4ecmvfqvaw" name="base_Pseudostate" association="_WoF5QVDuEeOA4ecmvfqvaw">

         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Pseudostate"/>

       </ownedAttribute>

     </packagedElement>

@@ -5083,18 +137,18 @@ and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))</body>
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_WoF5QlDuEeOA4ecmvfqvaw" name="extension_RTPseudostate" type="_NHLjsFDuEeOA4ecmvfqvaw" aggregation="composite" association="_WoF5QVDuEeOA4ecmvfqvaw"/>

     </packagedElement>

     <packagedElement xmi:type="uml:Stereotype" xmi:id="_j4X18GfLEeO447LqwGjc0A" name="RTTrigger">

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_lXb08GfLEeO447LqwGjc0A" name="base_Operation" association="_lXccAGfLEeO447LqwGjc0A">

+      <ownedAttribute xmi:id="_lXb08GfLEeO447LqwGjc0A" name="base_Operation" association="_lXccAGfLEeO447LqwGjc0A">

         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>

       </ownedAttribute>

     </packagedElement>

     <packagedElement xmi:type="uml:Extension" xmi:id="_lXccAGfLEeO447LqwGjc0A" name="E_RTTrigger_Operation1" memberEnd="_lXccAWfLEeO447LqwGjc0A _lXb08GfLEeO447LqwGjc0A">

       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_lXccAWfLEeO447LqwGjc0A" name="extension_RTTrigger" type="_j4X18GfLEeO447LqwGjc0A" aggregation="composite" association="_lXccAGfLEeO447LqwGjc0A"/>

     </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_rFVIQBMnEeSz2qq_H0HScA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rGtoUBMnEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

+    <profileApplication xmi:id="_rFVIQBMnEeSz2qq_H0HScA">

+      <eAnnotations xmi:id="_rGtoUBMnEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

         <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/dsmlvalidation#/"/>

       </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://DSMLValidation_PROFILES/PapyrusValidationRuleDSML.uml#__sUW0OhNEeCjcc2EgK3Uwg"/>

+      <appliedProfile href="pathmap://DSMLValidation_PROFILES/PapyrusValidationRuleDSML.uml#__sUW0OhNEeCjcc2EgK3Uwg"/>

     </profileApplication>

   </uml:Profile>

   <PapyrusDSMLValidationRule:ValidationRule xmi:id="_sBhqwBMnEeSz2qq_H0HScA" base_Constraint="_7YHrgFDuEeOA4ecmvfqvaw" message="An RT state machine has exactly one region" id="hasExactlyOneRegion"/>

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTimeSM.genmodel b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTimeSM.genmodel
index 260d43fc700..41f4a3a0f7e 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTimeSM.genmodel
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTimeSM.genmodel
@@ -14,91 +14,43 @@
     <details key="UNTYPED_PROPERTIES" value="REPORT"/>

     <details key="DUPLICATE_FEATURES" value="DISCARD"/>

     <details key="SUBSETTING_PROPERTIES" value="REPORT"/>

-    <details key="VALIDATION_DELEGATES" value="PROCESS"/>

+    <details key="VALIDATION_DELEGATES" value="IGNORE"/>

     <details key="OPPOSITE_ROLE_NAMES" value="IGNORE"/>

     <details key="COMMENTS" value="PROCESS"/>

     <details key="DUPLICATE_FEATURE_INHERITANCE" value="DISCARD"/>

     <details key="DUPLICATE_OPERATIONS" value="DISCARD"/>

     <details key="PROPERTY_DEFAULT_EXPRESSIONS" value="IGNORE"/>

-    <details key="INVARIANT_CONSTRAINTS" value="PROCESS"/>

+    <details key="INVARIANT_CONSTRAINTS" value="IGNORE"/>

     <details key="REDEFINING_PROPERTIES" value="REPORT"/>

     <details key="ANNOTATION_DETAILS" value="PROCESS"/>

     <details key="NON_API_INVARIANTS" value="PROCESS"/>

     <details key="DUPLICATE_OPERATION_INHERITANCE" value="DISCARD"/>

     <details key="REDEFINING_OPERATIONS" value="REPORT"/>

-    <details key="INVOCATION_DELEGATES" value="PROCESS"/>

+    <details key="INVOCATION_DELEGATES" value="IGNORE"/>

     <details key="DERIVED_FEATURES" value="PROCESS"/>

-    <details key="OPERATION_BODIES" value="PROCESS"/>

+    <details key="OPERATION_BODIES" value="IGNORE"/>

     <details key="CAMEL_CASE_NAMES" value="IGNORE"/>

     <details key="SUPER_CLASS_ORDER" value="PROCESS"/>

   </genAnnotations>

   <foreignModel>UMLRealTimeSM-addendum.profile.uml</foreignModel>

   <genPackages xsi:type="genmodel:GenPackage" prefix="UMLRealTimeStateMach" basePackage="org.eclipse.papyrus.umlrt.statemachine"

-      resource="XML" disposableProviderFactory="true" ecorePackage="UMLRealTimeStateMach.ecore#/">

+      disposableProviderFactory="true" ecorePackage="UMLRealTimeStateMach.ecore#/">

     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLRealTimeStateMach.ecore#//RTStateMachine">

       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

           propertySortChoices="true" ecoreFeature="ecore:EReference UMLRealTimeStateMach.ecore#//RTStateMachine/base_StateMachine"/>

       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UMLRealTimeStateMach.ecore#//RTStateMachine/isPassive"/>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTimeStateMach.ecore#//RTStateMachine/AnRTstatemachinehasexactlyoneregion">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTStateMachine/AnRTstatemachinehasexactlyoneregion/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTStateMachine/AnRTstatemachinehasexactlyoneregion/context"/>

-      </genOperations>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTimeStateMach.ecore#//RTStateMachine/AnRTstatemachineisneverreentrant">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTStateMachine/AnRTstatemachineisneverreentrant/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTStateMachine/AnRTstatemachineisneverreentrant/context"/>

-      </genOperations>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTimeStateMach.ecore#//RTStateMachine/RTstatemachinesdonothaveparametersorparametersets">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTStateMachine/RTstatemachinesdonothaveparametersorparametersets/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTStateMachine/RTstatemachinesdonothaveparametersorparametersets/context"/>

-      </genOperations>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTimeStateMach.ecore#//RTStateMachine/RTstatemachinesmusthaveacontextanditmustbeaClass">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTStateMachine/RTstatemachinesmusthaveacontextanditmustbeaClass/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTStateMachine/RTstatemachinesmusthaveacontextanditmustbeaClass/context"/>

-      </genOperations>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTimeStateMach.ecore#//RTStateMachine/Passivestatemachineareonlyallowedonpassivedataclasses">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTStateMachine/Passivestatemachineareonlyallowedonpassivedataclasses/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTStateMachine/Passivestatemachineareonlyallowedonpassivedataclasses/context"/>

-      </genOperations>

     </genClasses>

     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLRealTimeStateMach.ecore#//RTRegion">

       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

           propertySortChoices="true" ecoreFeature="ecore:EReference UMLRealTimeStateMach.ecore#//RTRegion/base_Region"/>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTimeStateMach.ecore#//RTRegion/RegionsinRTstatemachinescannothaveafinalstate">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTRegion/RegionsinRTstatemachinescannothaveafinalstate/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTRegion/RegionsinRTstatemachinescannothaveafinalstate/context"/>

-      </genOperations>

     </genClasses>

     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLRealTimeStateMach.ecore#//RTState">

       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

           propertySortChoices="true" ecoreFeature="ecore:EReference UMLRealTimeStateMach.ecore#//RTState/base_State"/>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTimeStateMach.ecore#//RTState/AcomposteRTstatehasexactlyoneregion">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTState/AcomposteRTstatehasexactlyoneregion/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTState/AcomposteRTstatehasexactlyoneregion/context"/>

-      </genOperations>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTimeStateMach.ecore#//RTState/RTdoesnotsupportsubmachinestates">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTState/RTdoesnotsupportsubmachinestates/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTState/RTdoesnotsupportsubmachinestates/context"/>

-      </genOperations>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTimeStateMach.ecore#//RTState/RTstatemachinesdonotsupportdoactivities">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTState/RTstatemachinesdonotsupportdoactivities/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTState/RTstatemachinesdonotsupportdoactivities/context"/>

-      </genOperations>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTimeStateMach.ecore#//RTState/RTstatemachinescannothaveanydeferredtriggers">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTState/RTstatemachinescannothaveanydeferredtriggers/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTState/RTstatemachinescannothaveanydeferredtriggers/context"/>

-      </genOperations>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTimeStateMach.ecore#//RTState/Constraint5">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTState/Constraint5/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTState/Constraint5/context"/>

-      </genOperations>

     </genClasses>

     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLRealTimeStateMach.ecore#//RTPseudostate">

       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

           propertySortChoices="true" ecoreFeature="ecore:EReference UMLRealTimeStateMach.ecore#//RTPseudostate/base_Pseudostate"/>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTimeStateMach.ecore#//RTPseudostate/RTstatemachinesdonotsupportconcurrencyorshallowhistory">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTPseudostate/RTstatemachinesdonotsupportconcurrencyorshallowhistory/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTimeStateMach.ecore#//RTPseudostate/RTstatemachinesdonotsupportconcurrencyorshallowhistory/context"/>

-      </genOperations>

     </genClasses>

     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLRealTimeStateMach.ecore#//RTTrigger">

       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTimeStateMach.ecore b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTimeStateMach.ecore
index 552b21c51d0..25f53571635 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTimeStateMach.ecore
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTimeStateMach.ecore
@@ -1,118 +1,11 @@
 <?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="UMLRealTimeStateMach" nsURI="http:///UMLRealTimeStateMach.ecore"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="UMLRealTimeStateMach" nsURI="http://www.eclipse.org/papyrus/umlrt/statemachine"

     nsPrefix="UMLRealTimeStateMach">

   <eClassifiers xsi:type="ecore:EClass" name="RTStateMachine">

-    <eOperations name="AnRTstatemachinehasexactlyoneregion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="An RT state machine has exactly one region"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="base_StateMachine.region->size() = 1"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

-    <eOperations name="AnRTstatemachineisneverreentrant" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="An RT state machine is never re-entrant"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="not base_StateMachine.isReentrant"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

-    <eOperations name="RTstatemachinesdonothaveparametersorparametersets" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="RT state machines do not have parameters or parameter sets"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="(base_StateMachine.ownedParameter->size()=0) and &#xD;&#xA;(base_StateMachine.ownedParameterSet->size() = 0)"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

-    <eOperations name="RTstatemachinesmusthaveacontextanditmustbeaClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="RT state machines must have a context and it must be a Class"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="(base_StateMachine.behavioredClassifier->size()=1) &#xD;&#xA;and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

-    <eOperations name="Passivestatemachineareonlyallowedonpassivedataclasses" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="Passive state machine are only allowed on passive data classes"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="isPassive = not (base_StateMachine.behavioredClassifier.oclAsType(Class).isActive) "/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="base_StateMachine.region->size() = 1&#xD;&#xA;not base_StateMachine.isReentrant&#xD;&#xA;(base_StateMachine.ownedParameter->size()=0) and &#xD;&#xA;(base_StateMachine.ownedParameterSet->size() = 0)&#xD;&#xA;(base_StateMachine.behavioredClassifier->size()=1) &#xD;&#xA;and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))&#xD;&#xA;isPassive = not (base_StateMachine.behavioredClassifier.oclAsType(Class).isActive) "/>

+    </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EReference" name="base_StateMachine" ordered="false"

         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//StateMachine"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="isPassive" ordered="false"

@@ -120,162 +13,23 @@
         defaultValueLiteral="false"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="RTRegion">

-    <eOperations name="RegionsinRTstatemachinescannothaveafinalstate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="Regions in RT state machines cannot have a final state"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="base_Region.subvertex->forAll&#xD;&#xA;      (v | not v.oclIsKindOf(FinalState))"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="base_Region.subvertex->forAll&#xD;&#xA;      (v | not v.oclIsKindOf(FinalState))"/>

+    </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Region" ordered="false"

         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Region"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="RTState">

-    <eOperations name="AcomposteRTstatehasexactlyoneregion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="A composte RT state has exactly one region"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="base_State.isComposite implies &#xD;&#xA;           (base_State.region->size() = 1)"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

-    <eOperations name="RTdoesnotsupportsubmachinestates" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="RT does not support submachine states"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="not base_State.isSubmachineState"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

-    <eOperations name="RTstatemachinesdonotsupportdoactivities" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="RT state machines do not support &quot;do&quot; activities"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="base_State.doActivity->size() = 0"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

-    <eOperations name="RTstatemachinescannothaveanydeferredtriggers" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="RT state machines cannot have any deferred triggers "/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="base_State.deferrableTrigger->size() = 0"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

-    <eOperations name="Constraint5" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="base_State.isComposite implies &#xD;&#xA;           (base_State.region->size() = 1)&#xD;&#xA;not base_State.isSubmachineState&#xD;&#xA;base_State.doActivity->size() = 0&#xD;&#xA;base_State.deferrableTrigger->size() = 0"/>

+    </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EReference" name="base_State" ordered="false"

         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//State"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="RTPseudostate">

-    <eOperations name="RTstatemachinesdonotsupportconcurrencyorshallowhistory" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <details key="originalName" value="RT state machines do not support concurrency or shallow history"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="let knd = base_Pseudostate.kind in &#xD;&#xA;   (knd &lt;> UML::PseudostateKind::shallowHistory) and&#xD;&#xA;   (knd &lt;> UML::PseudostateKind::fork) and&#xD;&#xA;   (knd &lt;> UML::PseudostateKind::join)"/>

-      </eAnnotations>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-        </eAnnotations>

-      </eParameters>

-      <eParameters name="context">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The cache of context-specific information."/>

-        </eAnnotations>

-        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        </eGenericType>

-      </eParameters>

-    </eOperations>

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="let knd = base_Pseudostate.kind in &#xD;&#xA;   (knd &lt;> UML::PseudostateKind::shallowHistory) and&#xD;&#xA;   (knd &lt;> UML::PseudostateKind::fork) and&#xD;&#xA;   (knd &lt;> UML::PseudostateKind::join)"/>

+    </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Pseudostate" ordered="false"

         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Pseudostate"/>

   </eClassifiers>

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/uml-rt.genmodel b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/uml-rt.genmodel
index 225a045fdb8..3af60a81d77 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/uml-rt.genmodel
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/uml-rt.genmodel
@@ -5,8 +5,8 @@
     modelDirectory="/org.eclipse.papyrus.umlrt/src-gen" editDirectory="/org.eclipse.papyrus.umlrt.edit/src-gen"

     editorDirectory="/org.eclipse.papyrus.umlrt.editor/src-gen" modelPluginID="org.eclipse.papyrus.umlrt"

     modelName="Uml-rt" nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

-    testsDirectory="/org.eclipse.papyrus.umlrt.tests/src-gen" importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="6.0" copyrightFields="false"

-    usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml"

+    testsDirectory="/org.eclipse.papyrus.umlrt.tests/src-gen" importerID="org.eclipse.uml2.uml.ecore.importer"

+    complianceLevel="6.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml"

     operationReflection="true" importOrganizing="true">

   <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">

     <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>

@@ -14,27 +14,27 @@
     <details key="UNTYPED_PROPERTIES" value="REPORT"/>

     <details key="DUPLICATE_FEATURES" value="DISCARD"/>

     <details key="SUBSETTING_PROPERTIES" value="REPORT"/>

-    <details key="VALIDATION_DELEGATES" value="PROCESS"/>

+    <details key="VALIDATION_DELEGATES" value="IGNORE"/>

     <details key="OPPOSITE_ROLE_NAMES" value="IGNORE"/>

     <details key="COMMENTS" value="PROCESS"/>

     <details key="DUPLICATE_FEATURE_INHERITANCE" value="DISCARD"/>

     <details key="DUPLICATE_OPERATIONS" value="DISCARD"/>

     <details key="PROPERTY_DEFAULT_EXPRESSIONS" value="IGNORE"/>

-    <details key="INVARIANT_CONSTRAINTS" value="PROCESS"/>

+    <details key="INVARIANT_CONSTRAINTS" value="IGNORE"/>

     <details key="REDEFINING_PROPERTIES" value="REPORT"/>

     <details key="ANNOTATION_DETAILS" value="PROCESS"/>

     <details key="NON_API_INVARIANTS" value="IGNORE"/>

     <details key="DUPLICATE_OPERATION_INHERITANCE" value="DISCARD"/>

     <details key="REDEFINING_OPERATIONS" value="REPORT"/>

-    <details key="INVOCATION_DELEGATES" value="PROCESS"/>

+    <details key="INVOCATION_DELEGATES" value="IGNORE"/>

     <details key="DERIVED_FEATURES" value="PROCESS"/>

-    <details key="OPERATION_BODIES" value="PROCESS"/>

+    <details key="OPERATION_BODIES" value="IGNORE"/>

     <details key="CAMEL_CASE_NAMES" value="IGNORE"/>

     <details key="SUPER_CLASS_ORDER" value="PROCESS"/>

   </genAnnotations>

   <foreignModel>uml-rt.profile.uml</foreignModel>

   <genPackages xsi:type="genmodel:GenPackage" prefix="UMLRealTime" basePackage="org.eclipse.papyrus.umlrt"

-      resource="XML" disposableProviderFactory="true" ecorePackage="UMLRealTime.ecore#/">

+      disposableProviderFactory="true" ecorePackage="UMLRealTime.ecore#/">

     <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="UMLRealTime.ecore#//PortRegistrationType">

       <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="UMLRealTime.ecore#//PortRegistrationType/Automatic"/>

       <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="UMLRealTime.ecore#//PortRegistrationType/Application"/>

@@ -48,42 +48,6 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLRealTime.ecore#//Capsule">

       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

           propertySortChoices="true" ecoreFeature="ecore:EReference UMLRealTime.ecore#//Capsule/base_Class"/>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTime.ecore#//Capsule/Capsulesarealwaysactive">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Capsule/Capsulesarealwaysactive/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Capsule/Capsulesarealwaysactive/context"/>

-      </genOperations>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTime.ecore#//Capsule/AcapsulecannothaveReceptionfeatures">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Capsule/AcapsulecannothaveReceptionfeatures/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Capsule/AcapsulecannothaveReceptionfeatures/context"/>

-      </genOperations>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTime.ecore#//Capsule/Acapsuleclasscanalwaysbesubclassed">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Capsule/Acapsuleclasscanalwaysbesubclassed/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Capsule/Acapsuleclasscanalwaysbesubclassed/context"/>

-      </genOperations>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTime.ecore#//Capsule/Acapsulecanhaveatmostonesuperclass">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Capsule/Acapsulecanhaveatmostonesuperclass/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Capsule/Acapsulecanhaveatmostonesuperclass/context"/>

-      </genOperations>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTime.ecore#//Capsule/Capsuleclassesarealwayssubstitutable">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Capsule/Capsuleclassesarealwayssubstitutable/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Capsule/Capsuleclassesarealwayssubstitutable/context"/>

-      </genOperations>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTime.ecore#//Capsule/Allattributesofacapsuleclasshaveexactlyonetype">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Capsule/Allattributesofacapsuleclasshaveexactlyonetype/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Capsule/Allattributesofacapsuleclasshaveexactlyonetype/context"/>

-      </genOperations>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTime.ecore#//Capsule/Privatevisibilityisnotsupportedoncapsulefeatures">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Capsule/Privatevisibilityisnotsupportedoncapsulefeatures/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Capsule/Privatevisibilityisnotsupportedoncapsulefeatures/context"/>

-      </genOperations>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTime.ecore#//Capsule/Acapsuleclasscannothavenestedclassifiers">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Capsule/Acapsuleclasscannothavenestedclassifiers/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Capsule/Acapsuleclasscannothavenestedclassifiers/context"/>

-      </genOperations>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTime.ecore#//Capsule/Alloperationsofacapsulearesequential">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Capsule/Alloperationsofacapsulearesequential/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Capsule/Alloperationsofacapsulearesequential/context"/>

-      </genOperations>

     </genClasses>

     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLRealTime.ecore#//CapsulePart">

       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

@@ -92,10 +56,6 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLRealTime.ecore#//Protocol">

       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

           propertySortChoices="true" ecoreFeature="ecore:EReference UMLRealTime.ecore#//Protocol/base_Collaboration"/>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTime.ecore#//Protocol/Protocolscanhaveatmostonegeneralization">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Protocol/Protocolscanhaveatmostonegeneralization/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//Protocol/Protocolscanhaveatmostonegeneralization/context"/>

-      </genOperations>

     </genClasses>

     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLRealTime.ecore#//RTPort">

       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UMLRealTime.ecore#//RTPort/isNotification"/>

@@ -105,30 +65,10 @@
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UMLRealTime.ecore#//RTPort/registrationOverride"/>

       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

           propertySortChoices="true" ecoreFeature="ecore:EReference UMLRealTime.ecore#//RTPort/base_Port"/>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTime.ecore#//RTPort/Awiredportcannotpublishitsname">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//RTPort/Awiredportcannotpublishitsname/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//RTPort/Awiredportcannotpublishitsname/context"/>

-      </genOperations>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTime.ecore#//RTPort/Apublicportmustbedefinedasaserviceport">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//RTPort/Apublicportmustbedefinedasaserviceport/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//RTPort/Apublicportmustbedefinedasaserviceport/context"/>

-      </genOperations>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTime.ecore#//RTPort/ASAPunwiredunpublishedmusthaveprotectedvisibility">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//RTPort/ASAPunwiredunpublishedmusthaveprotectedvisibility/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//RTPort/ASAPunwiredunpublishedmusthaveprotectedvisibility/context"/>

-      </genOperations>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTime.ecore#//RTPort/AnSPPunwiredandpublishedmusthavepublicvisibility">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//RTPort/AnSPPunwiredandpublishedmusthavepublicvisibility/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//RTPort/AnSPPunwiredandpublishedmusthavepublicvisibility/context"/>

-      </genOperations>

     </genClasses>

     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLRealTime.ecore#//RTConnector">

       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

           propertySortChoices="true" ecoreFeature="ecore:EReference UMLRealTime.ecore#//RTConnector/base_Connector"/>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTime.ecore#//RTConnector/Onlybinaryconnectorsareallowed">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//RTConnector/Onlybinaryconnectorsareallowed/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//RTConnector/Onlybinaryconnectorsareallowed/context"/>

-      </genOperations>

     </genClasses>

     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLRealTime.ecore#//ProtocolContainer">

       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

@@ -137,10 +77,6 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLRealTime.ecore#//RTRExcludedElement">

       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

           propertySortChoices="true" ecoreFeature="ecore:EReference UMLRealTime.ecore#//RTRExcludedElement/base_RedefinableElement"/>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLRealTime.ecore#//RTRExcludedElement/ExclusioncanonlybeappliedtosomeUMLRTmodelelements">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//RTRExcludedElement/ExclusioncanonlybeappliedtosomeUMLRTmodelelements/diagnostics"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLRealTime.ecore#//RTRExcludedElement/ExclusioncanonlybeappliedtosomeUMLRTmodelelements/context"/>

-      </genOperations>

     </genClasses>

     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLRealTime.ecore#//RTMessageSet">

       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/uml-rt.profile.uml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/uml-rt.profile.uml
index dcd41181948..d6cd395a32c 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/uml-rt.profile.uml
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/uml-rt.profile.uml
@@ -1,15141 +1,99 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:PapyrusDSMLValidationRule="http://www.eclipse.org/papyrus/dsmlvalidation" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">

-  <uml:Profile xmi:id="_1h74oEeVEeO0lv5O1DTHOQ" name="UMLRealTime" metaclassReference="_0Mm20GDjEeOesvHnEWH_sQ _922ukGDjEeOesvHnEWH_sQ _923VoGDjEeOesvHnEWH_sQ _923VoWDjEeOesvHnEWH_sQ _NoL5UGDkEeOesvHnEWH_sQ _bmzwUGDkEeOesvHnEWH_sQ _bmzwUWDkEeOesvHnEWH_sQ _ELos0GGIEeOesvHnEWH_sQ _w9v-0KN2EeOMJMavfflX6A _IJTCAAbYEeSFB8mUNT_s_w _vk_NoAb2EeSFB8mUNT_s_w">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDcE3YEeO2GMk50x9RWA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-      <contents xmi:type="ecore:EPackage" xmi:id="_lVrL4BMpEeSz2qq_H0HScA" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_lVqk0BMpEeSz2qq_H0HScA/27" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrL4RMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrL4hMpEeSz2qq_H0HScA" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVvdURMpEeSz2qq_H0HScA" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVvdUhMpEeSz2qq_H0HScA" key="Version" value="0.1.16"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVvdUxMpEeSz2qq_H0HScA" key="Comment" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVvdVBMpEeSz2qq_H0HScA" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVvdVRMpEeSz2qq_H0HScA" key="Date" value="2014-07-24"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVvdVhMpEeSz2qq_H0HScA" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_lVrL4xMpEeSz2qq_H0HScA" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrL5BMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_lVrL5RMpEeSz2qq_H0HScA" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrL5hMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrL5xMpEeSz2qq_H0HScA" key="originalName" value="Capsules are always active"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrL6BMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrL6RMpEeSz2qq_H0HScA" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrL6xMpEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrL7BMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrL7RMpEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrL7xMpEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrL8BMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrL8RMpEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_lVrL8hMpEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrL8xMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrL9BMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_lVrL9RMpEeSz2qq_H0HScA" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrL9hMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrL9xMpEeSz2qq_H0HScA" key="originalName" value="A capsule cannot have Reception features"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrL-BMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrL-RMpEeSz2qq_H0HScA" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrL-xMpEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrL_BMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrL_RMpEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrL_xMpEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrMABMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrMARMpEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_lVrMAhMpEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrMAxMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrMBBMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_lVry8BMpEeSz2qq_H0HScA" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVry8RMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVry8hMpEeSz2qq_H0HScA" key="originalName" value="A capsule class can always be subclassed"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVry8xMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVry9BMpEeSz2qq_H0HScA" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVry9hMpEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVry9xMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVry-BMpEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVry-hMpEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVry-xMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVry_BMpEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_lVry_RMpEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVry_hMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVry_xMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_lVrzABMpEeSz2qq_H0HScA" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzARMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzAhMpEeSz2qq_H0HScA" key="originalName" value="A capsule can have at most one superclass"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzAxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzBBMpEeSz2qq_H0HScA" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzBhMpEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzBxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzCBMpEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzChMpEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzCxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzDBMpEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_lVrzDRMpEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzDhMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzDxMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_lVrzEBMpEeSz2qq_H0HScA" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzERMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzEhMpEeSz2qq_H0HScA" key="originalName" value="Capsule classes are always substitutable"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzExMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzFBMpEeSz2qq_H0HScA" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzFhMpEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzFxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzGBMpEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzGhMpEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzGxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzHBMpEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_lVrzHRMpEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzHhMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzHxMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_lVrzIBMpEeSz2qq_H0HScA" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzIRMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzIhMpEeSz2qq_H0HScA" key="originalName" value="All attributes of a capsule class have exactly one type"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzIxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzJBMpEeSz2qq_H0HScA" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzJhMpEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzJxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzKBMpEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzKhMpEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzKxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzLBMpEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_lVrzLRMpEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzLhMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzLxMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_lVrzMBMpEeSz2qq_H0HScA" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzMRMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzMhMpEeSz2qq_H0HScA" key="originalName" value="Private visibility is not supported on capsule features"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzMxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzNBMpEeSz2qq_H0HScA" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> UML::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzNhMpEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzNxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzOBMpEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzOhMpEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzOxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzPBMpEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_lVrzPRMpEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzPhMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzPxMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_lVrzQBMpEeSz2qq_H0HScA" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzQRMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzQhMpEeSz2qq_H0HScA" key="originalName" value="A capsule class cannot have nested classifiers"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzQxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzRBMpEeSz2qq_H0HScA" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzRhMpEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzRxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzSBMpEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzShMpEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzSxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzTBMpEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_lVrzTRMpEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzThMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzTxMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_lVrzUBMpEeSz2qq_H0HScA" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzURMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzUhMpEeSz2qq_H0HScA" key="originalName" value="All operations of a capsule are sequential"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzUxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzVBMpEeSz2qq_H0HScA" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = UML::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzVhMpEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzVxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzWBMpEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzWhMpEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzWxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzXBMpEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_lVrzXRMpEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzXhMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzXxMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_lVrzYBMpEeSz2qq_H0HScA" 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="_lVrzYhMpEeSz2qq_H0HScA" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzYxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_lVrzZBMpEeSz2qq_H0HScA" 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="_lVrzZhMpEeSz2qq_H0HScA" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzZxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_lVrzaBMpEeSz2qq_H0HScA" name="Protocolscanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzaRMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzahMpEeSz2qq_H0HScA" key="originalName" value="Protocols can have at most one generalization"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzaxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzbBMpEeSz2qq_H0HScA" key="body" value="base_Collaboration.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzbhMpEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzbxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzcBMpEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzchMpEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzcxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzdBMpEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_lVrzdRMpEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzdhMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzdxMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_lVrzeBMpEeSz2qq_H0HScA" name="base_Collaboration" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_lVrzehMpEeSz2qq_H0HScA" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzexMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_lVrzfBMpEeSz2qq_H0HScA" name="Awiredportcannotpublishitsname">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzfRMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzfhMpEeSz2qq_H0HScA" key="originalName" value="A wired port cannot publish its name"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzfxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzgBMpEeSz2qq_H0HScA" key="body" value="isWired implies not isPublish"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzghMpEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzgxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzhBMpEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzhhMpEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzhxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrziBMpEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_lVrziRMpEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzihMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzixMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_lVrzjBMpEeSz2qq_H0HScA" name="Apublicportmustbedefinedasaserviceport">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzjRMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzjhMpEeSz2qq_H0HScA" key="originalName" value="A public port must be defined as a service port"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzjxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzkBMpEeSz2qq_H0HScA" key="body" value="(base_Port.visibility = UML::VisibilityKind::public) &#xD;&#xA;    implies base_Port.isService  "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzkhMpEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzkxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzlBMpEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzlhMpEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzlxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzmBMpEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_lVrzmRMpEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzmhMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzmxMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_lVrznBMpEeSz2qq_H0HScA" name="ASAPunwiredunpublishedmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrznRMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrznhMpEeSz2qq_H0HScA" key="originalName" value="A SAP (unwired &amp; unpublished) must have protected visibility "/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrznxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzoBMpEeSz2qq_H0HScA" key="body" value="(not isWired and not isPublish) &#xD;&#xA;   implies (base_Port.visibility = UML::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzohMpEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzoxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzpBMpEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzphMpEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzpxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzqBMpEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_lVrzqRMpEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzqhMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzqxMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_lVrzrBMpEeSz2qq_H0HScA" name="AnSPPunwiredandpublishedmusthavepublicvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzrRMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzrhMpEeSz2qq_H0HScA" key="originalName" value="An SPP (unwired and published) must have public visibility"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzrxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzsBMpEeSz2qq_H0HScA" key="body" value="(not isWired and isPublish) implies &#xD;&#xA;   (base_Port.visibility = UML::VisibilityKind::public)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzshMpEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzsxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrztBMpEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrzthMpEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrztxMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrzuBMpEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_lVrzuRMpEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzuhMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrzuxMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_lVrzvBMpEeSz2qq_H0HScA" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_lVrzvhMpEeSz2qq_H0HScA" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_lVrzwBMpEeSz2qq_H0HScA" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_lVrzwhMpEeSz2qq_H0HScA" name="registration" ordered="false" eType="_lVrzyBMpEeSz2qq_H0HScA"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_lVrzxBMpEeSz2qq_H0HScA" name="registrationOverride" 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="_lVrzxhMpEeSz2qq_H0HScA" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_lVrzyBMpEeSz2qq_H0HScA" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzyRMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_lVrzyhMpEeSz2qq_H0HScA" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_lVrzyxMpEeSz2qq_H0HScA" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_lVrzzBMpEeSz2qq_H0HScA" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_lVrzzRMpEeSz2qq_H0HScA" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrzzhMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_lVrzzxMpEeSz2qq_H0HScA" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrz0BMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrz0RMpEeSz2qq_H0HScA" key="originalName" value="Only binary connectors are allowed"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrz0hMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrz0xMpEeSz2qq_H0HScA" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrz1RMpEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrz1hMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrz1xMpEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrz2RMpEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrz2hMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrz2xMpEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_lVrz3BMpEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrz3RMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrz3hMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_lVrz3xMpEeSz2qq_H0HScA" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_lVrz4RMpEeSz2qq_H0HScA" name="ProtocolContainer">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrz4hMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_lVrz4xMpEeSz2qq_H0HScA" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_lVrz5RMpEeSz2qq_H0HScA" name="RTRExcludedElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrz5hMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_lVrz5xMpEeSz2qq_H0HScA" name="ExclusioncanonlybeappliedtosomeUMLRTmodelelements">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrz6BMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrz6RMpEeSz2qq_H0HScA" key="originalName" value="Exclusion can only be applied to some UML-RT model elements"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrz6hMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrz6xMpEeSz2qq_H0HScA" key="body" value="let el = base_RedefinableElement in&#xD;&#xA;(el.oclIsKindOf(UML::Port) or&#xD;&#xA; el.oclIsKindOf(UML::Property) or&#xD;&#xA; el.oclIsKindOf(UML::Operation) or&#xD;&#xA; el.oclIsKindOf(UML::Behavior) or&#xD;&#xA;el.oclIsKindOf(UML::State) or&#xD;&#xA;el.oclIsKindOf(UML::Transition))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrz7RMpEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrz7hMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrz7xMpEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_lVrz8RMpEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrz8hMpEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lVrz8xMpEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_lVrz9BMpEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrz9RMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_lVrz9hMpEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_lVrz9xMpEeSz2qq_H0HScA" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_lVrz-RMpEeSz2qq_H0HScA" name="RTMessageSet">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVrz-hMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g6khEGDFEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_lVrz-xMpEeSz2qq_H0HScA" name="base_Interface" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_lVrz_RMpEeSz2qq_H0HScA" name="rtMsgKind" ordered="false" lowerBound="1" eType="_lVrz_xMpEeSz2qq_H0HScA" defaultValueLiteral="true"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_lVrz_xMpEeSz2qq_H0HScA" name="RTMessageKind">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lVr0ABMpEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXMMIGDdEeOesvHnEWH_sQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_lVr0ARMpEeSz2qq_H0HScA" name="in"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_lVr0AhMpEeSz2qq_H0HScA" name="out" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_lVr0AxMpEeSz2qq_H0HScA" name="inOut" value="2"/>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_R5bn4BMkEeSz2qq_H0HScA" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_R5X9gBMkEeSz2qq_H0HScA/26" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bn4RMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bn4hMkEeSz2qq_H0HScA" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5i8oRMkEeSz2qq_H0HScA" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5i8ohMkEeSz2qq_H0HScA" key="Version" value="0.1.15"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5i8oxMkEeSz2qq_H0HScA" key="Comment" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5i8pBMkEeSz2qq_H0HScA" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5i8pRMkEeSz2qq_H0HScA" key="Date" value="2014-07-24"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5i8phMkEeSz2qq_H0HScA" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_R5bn4xMkEeSz2qq_H0HScA" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bn5BMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_R5bn5RMkEeSz2qq_H0HScA" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bn5hMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bn5xMkEeSz2qq_H0HScA" key="originalName" value="Capsules are always active"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bn6BMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bn6RMkEeSz2qq_H0HScA" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5bn6xMkEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bn7BMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bn7RMkEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5bn7xMkEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bn8BMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bn8RMkEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_R5bn8hMkEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5bn8xMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5bn9BMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_R5bn9RMkEeSz2qq_H0HScA" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bn9hMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bn9xMkEeSz2qq_H0HScA" key="originalName" value="A capsule cannot have Reception features"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bn-BMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bn-RMkEeSz2qq_H0HScA" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5bn-xMkEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bn_BMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bn_RMkEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5bn_xMkEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boABMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boARMkEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_R5boAhMkEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5boAxMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5boBBMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_R5boBRMkEeSz2qq_H0HScA" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boBhMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boBxMkEeSz2qq_H0HScA" key="originalName" value="A capsule class can always be subclassed"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boCBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boCRMkEeSz2qq_H0HScA" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5boCxMkEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boDBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boDRMkEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5boDxMkEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boEBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boERMkEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_R5boEhMkEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5boExMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5boFBMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_R5boFRMkEeSz2qq_H0HScA" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boFhMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boFxMkEeSz2qq_H0HScA" key="originalName" value="A capsule can have at most one superclass"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boGBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boGRMkEeSz2qq_H0HScA" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5boGxMkEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boHBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boHRMkEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5boHxMkEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boIBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boIRMkEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_R5boIhMkEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5boIxMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5boJBMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_R5boJRMkEeSz2qq_H0HScA" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boJhMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boJxMkEeSz2qq_H0HScA" key="originalName" value="Capsule classes are always substitutable"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boKBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boKRMkEeSz2qq_H0HScA" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5boKxMkEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boLBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boLRMkEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5boLxMkEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boMBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boMRMkEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_R5boMhMkEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5boMxMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5boNBMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_R5boNRMkEeSz2qq_H0HScA" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boNhMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boNxMkEeSz2qq_H0HScA" key="originalName" value="All attributes of a capsule class have exactly one type"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boOBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boORMkEeSz2qq_H0HScA" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5boOxMkEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boPBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boPRMkEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5boPxMkEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boQBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boQRMkEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_R5boQhMkEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5boQxMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5boRBMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_R5boRRMkEeSz2qq_H0HScA" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boRhMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boRxMkEeSz2qq_H0HScA" key="originalName" value="Private visibility is not supported on capsule features"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boSBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boSRMkEeSz2qq_H0HScA" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> UML::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5boSxMkEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boTBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boTRMkEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5boTxMkEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boUBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boURMkEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_R5boUhMkEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5boUxMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5boVBMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_R5boVRMkEeSz2qq_H0HScA" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boVhMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boVxMkEeSz2qq_H0HScA" key="originalName" value="A capsule class cannot have nested classifiers"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boWBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boWRMkEeSz2qq_H0HScA" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5boWxMkEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boXBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boXRMkEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5boXxMkEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boYBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boYRMkEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_R5boYhMkEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5boYxMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5boZBMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_R5boZRMkEeSz2qq_H0HScA" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boZhMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boZxMkEeSz2qq_H0HScA" key="originalName" value="All operations of a capsule are sequential"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boaBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boaRMkEeSz2qq_H0HScA" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = UML::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5boaxMkEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bobBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bobRMkEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5bobxMkEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bocBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bocRMkEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_R5bochMkEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5bocxMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5bodBMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_R5bodRMkEeSz2qq_H0HScA" 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="_R5bodxMkEeSz2qq_H0HScA" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boeBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_R5boeRMkEeSz2qq_H0HScA" 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="_R5boexMkEeSz2qq_H0HScA" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bofBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_R5bofRMkEeSz2qq_H0HScA" name="Protocolscanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bofhMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bofxMkEeSz2qq_H0HScA" key="originalName" value="Protocols can have at most one generalization"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bogBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bogRMkEeSz2qq_H0HScA" key="body" value="base_Collaboration.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5bogxMkEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bohBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bohRMkEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5bohxMkEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boiBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boiRMkEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_R5boihMkEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5boixMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5bojBMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_R5bojRMkEeSz2qq_H0HScA" name="base_Collaboration" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_R5bojxMkEeSz2qq_H0HScA" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bokBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_R5bokRMkEeSz2qq_H0HScA" name="Awiredportcannotpublishitsname">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bokhMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bokxMkEeSz2qq_H0HScA" key="originalName" value="A wired port cannot publish its name"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bolBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bolRMkEeSz2qq_H0HScA" key="body" value="isWired implies not isPublish"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5bolxMkEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bomBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bomRMkEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5bomxMkEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bonBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bonRMkEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_R5bonhMkEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5bonxMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5booBMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_R5booRMkEeSz2qq_H0HScA" name="Apublicportmustbedefinedasaserviceport">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boohMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5booxMkEeSz2qq_H0HScA" key="originalName" value="A public port must be defined as a service port"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bopBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bopRMkEeSz2qq_H0HScA" key="body" value="(base_Port.visibility = UML::VisibilityKind::public) &#xD;&#xA;    implies base_Port.isService  "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5bopxMkEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boqBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boqRMkEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5boqxMkEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5borBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5borRMkEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_R5borhMkEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5borxMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5bosBMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_R5bosRMkEeSz2qq_H0HScA" name="ASAPunwiredunpublishedmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boshMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bosxMkEeSz2qq_H0HScA" key="originalName" value="A SAP (unwired &amp; unpublished) must have protected visibility "/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5botBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5botRMkEeSz2qq_H0HScA" key="body" value="(not isWired and not isPublish) &#xD;&#xA;   implies (base_Port.visibility = UML::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5botxMkEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bouBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bouRMkEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5bouxMkEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bovBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bovRMkEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_R5bovhMkEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5bovxMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5bowBMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_R5bowRMkEeSz2qq_H0HScA" name="AnSPPunwiredandpublishedmusthavepublicvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bowhMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bowxMkEeSz2qq_H0HScA" key="originalName" value="An SPP (unwired and published) must have public visibility"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boxBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boxRMkEeSz2qq_H0HScA" key="body" value="(not isWired and isPublish) implies &#xD;&#xA;   (base_Port.visibility = UML::VisibilityKind::public)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5boxxMkEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5boyBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5boyRMkEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5boyxMkEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bozBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bozRMkEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_R5bozhMkEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5bozxMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5bo0BMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_R5bo0RMkEeSz2qq_H0HScA" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_R5bo0xMkEeSz2qq_H0HScA" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_R5bo1RMkEeSz2qq_H0HScA" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_R5bo1xMkEeSz2qq_H0HScA" name="registration" ordered="false" eType="_R5bo3RMkEeSz2qq_H0HScA"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_R5bo2RMkEeSz2qq_H0HScA" name="registrationOverride" 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="_R5bo2xMkEeSz2qq_H0HScA" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_R5bo3RMkEeSz2qq_H0HScA" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bo3hMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_R5bo3xMkEeSz2qq_H0HScA" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_R5bo4BMkEeSz2qq_H0HScA" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_R5bo4RMkEeSz2qq_H0HScA" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_R5bo4hMkEeSz2qq_H0HScA" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bo4xMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_R5bo5BMkEeSz2qq_H0HScA" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bo5RMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bo5hMkEeSz2qq_H0HScA" key="originalName" value="Only binary connectors are allowed"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bo5xMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bo6BMkEeSz2qq_H0HScA" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5bo6hMkEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bo6xMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bo7BMkEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5bo7hMkEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bo7xMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bo8BMkEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_R5bo8RMkEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5bo8hMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5bo8xMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_R5bo9BMkEeSz2qq_H0HScA" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_R5bo9hMkEeSz2qq_H0HScA" name="ProtocolContainer">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bo9xMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_R5bo-BMkEeSz2qq_H0HScA" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_R5bo-hMkEeSz2qq_H0HScA" name="RTRExcludedElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bo-xMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_R5bo_BMkEeSz2qq_H0HScA" name="ExclusioncanonlybeappliedtosomeUMLRTmodelelements">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bo_RMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bo_hMkEeSz2qq_H0HScA" key="originalName" value="Exclusion can only be applied to some UML-RT model elements"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bo_xMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bpABMkEeSz2qq_H0HScA" key="body" value="let el = base_RedefinableElement in&#xD;&#xA;(el.oclIsKindOf(UML::Port) or&#xD;&#xA; el.oclIsKindOf(UML::Property) or&#xD;&#xA; el.oclIsKindOf(UML::Operation) or&#xD;&#xA; el.oclIsKindOf(UML::Behavior) or&#xD;&#xA;el.oclIsKindOf(UML::State) or&#xD;&#xA;el.oclIsKindOf(UML::Transition))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5bpAhMkEeSz2qq_H0HScA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bpAxMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bpBBMkEeSz2qq_H0HScA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_R5bpBhMkEeSz2qq_H0HScA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bpBxMkEeSz2qq_H0HScA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5bpCBMkEeSz2qq_H0HScA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_R5bpCRMkEeSz2qq_H0HScA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5bpChMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_R5bpCxMkEeSz2qq_H0HScA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_R5bpDBMkEeSz2qq_H0HScA" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_R5bpDhMkEeSz2qq_H0HScA" name="RTMessageSet">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bpDxMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g6khEGDFEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_R5bpEBMkEeSz2qq_H0HScA" name="base_Interface" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_R5bpEhMkEeSz2qq_H0HScA" name="rtMsgKind" ordered="false" lowerBound="1" eType="_R5bpFBMkEeSz2qq_H0HScA" defaultValueLiteral="true"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_R5bpFBMkEeSz2qq_H0HScA" name="RTMessageKind">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5bpFRMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXMMIGDdEeOesvHnEWH_sQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_R5bpFhMkEeSz2qq_H0HScA" name="in"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_R5bpFxMkEeSz2qq_H0HScA" name="out" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_R5bpGBMkEeSz2qq_H0HScA" name="inOut" value="2"/>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_Ioob0Ab4EeSFB8mUNT_s_w" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_IonNsAb4EeSFB8mUNT_s_w/25" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ioob0Qb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ioob0gb4EeSFB8mUNT_s_w" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Iow-sAb4EeSFB8mUNT_s_w" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Iow-sQb4EeSFB8mUNT_s_w" key="Version" value="0.1.14"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Iow-sgb4EeSFB8mUNT_s_w" key="Comment" value="Minor UI corrections"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Iow-swb4EeSFB8mUNT_s_w" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Iow-tAb4EeSFB8mUNT_s_w" key="Date" value="2014-07-08"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Iow-tQb4EeSFB8mUNT_s_w" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Ioob0wb4EeSFB8mUNT_s_w" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ioob1Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Ioob1Qb4EeSFB8mUNT_s_w" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ioob1gb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ioob1wb4EeSFB8mUNT_s_w" key="originalName" value="Capsules are always active"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ioob2Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ioob2Qb4EeSFB8mUNT_s_w" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Ioob2wb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ioob3Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ioob3Qb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Ioob3wb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ioob4Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ioob4Qb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Ioob4gb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Ioob4wb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Ioob5Ab4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Ioob5Qb4EeSFB8mUNT_s_w" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ioob5gb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ioob5wb4EeSFB8mUNT_s_w" key="originalName" value="A capsule cannot have Reception features"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ioob6Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ioob6Qb4EeSFB8mUNT_s_w" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Ioob6wb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ioob7Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ioob7Qb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Ioob7wb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ioob8Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ioob8Qb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Ioob8gb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Ioob8wb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Ioob9Ab4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Ioob9Qb4EeSFB8mUNT_s_w" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ioob9gb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ioob9wb4EeSFB8mUNT_s_w" key="originalName" value="A capsule class can always be subclassed"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ioob-Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ioob-Qb4EeSFB8mUNT_s_w" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Ioob-wb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ioob_Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ioob_Qb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Ioob_wb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocAAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocAQb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_IoocAgb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IoocAwb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IoocBAb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_IoocBQb4EeSFB8mUNT_s_w" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocBgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocBwb4EeSFB8mUNT_s_w" key="originalName" value="A capsule can have at most one superclass"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocCAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocCQb4EeSFB8mUNT_s_w" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IoocCwb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocDAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocDQb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IoocDwb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocEAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocEQb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_IoocEgb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IoocEwb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IoocFAb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_IoocFQb4EeSFB8mUNT_s_w" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocFgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocFwb4EeSFB8mUNT_s_w" key="originalName" value="Capsule classes are always substitutable"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocGAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocGQb4EeSFB8mUNT_s_w" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IoocGwb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocHAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocHQb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IoocHwb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocIAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocIQb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_IoocIgb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IoocIwb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IoocJAb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_IoocJQb4EeSFB8mUNT_s_w" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocJgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocJwb4EeSFB8mUNT_s_w" key="originalName" value="All attributes of a capsule class have exactly one type"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocKAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocKQb4EeSFB8mUNT_s_w" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IoocKwb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocLAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocLQb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IoocLwb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocMAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocMQb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_IoocMgb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IoocMwb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IoocNAb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_IoocNQb4EeSFB8mUNT_s_w" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocNgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocNwb4EeSFB8mUNT_s_w" key="originalName" value="Private visibility is not supported on capsule features"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocOAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocOQb4EeSFB8mUNT_s_w" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> UML::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IoocOwb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocPAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocPQb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IoocPwb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocQAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocQQb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_IoocQgb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IoocQwb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IoocRAb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_IoocRQb4EeSFB8mUNT_s_w" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocRgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocRwb4EeSFB8mUNT_s_w" key="originalName" value="A capsule class cannot have nested classifiers"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocSAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocSQb4EeSFB8mUNT_s_w" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IoocSwb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocTAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocTQb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IoocTwb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocUAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocUQb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_IoocUgb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IoocUwb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IoocVAb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_IoocVQb4EeSFB8mUNT_s_w" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocVgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocVwb4EeSFB8mUNT_s_w" key="originalName" value="All operations of a capsule are sequential"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocWAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocWQb4EeSFB8mUNT_s_w" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = UML::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IoocWwb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocXAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocXQb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IoocXwb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocYAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IoocYQb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_IoocYgb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IoocYwb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IoocZAb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_IoocZQb4EeSFB8mUNT_s_w" 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="_IoocZwb4EeSFB8mUNT_s_w" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocaAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_IoocaQb4EeSFB8mUNT_s_w" 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="_Ioocawb4EeSFB8mUNT_s_w" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IoocbAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_IoocbQb4EeSFB8mUNT_s_w" name="Protocolscanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ioocbgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ioocbwb4EeSFB8mUNT_s_w" key="originalName" value="Protocols can have at most one generalization"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IooccAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IooccQb4EeSFB8mUNT_s_w" key="body" value="base_Collaboration.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Iooccwb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopC4Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopC4Qb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IopC4wb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopC5Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopC5Qb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_IopC5gb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IopC5wb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IopC6Ab4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_IopC6Qb4EeSFB8mUNT_s_w" name="base_Collaboration" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_IopC6wb4EeSFB8mUNT_s_w" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopC7Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_IopC7Qb4EeSFB8mUNT_s_w" name="Awiredportcannotpublishitsname">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopC7gb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopC7wb4EeSFB8mUNT_s_w" key="originalName" value="A wired port cannot publish its name"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopC8Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopC8Qb4EeSFB8mUNT_s_w" key="body" value="isWired implies not isPublish"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IopC8wb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopC9Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopC9Qb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IopC9wb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopC-Ab4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopC-Qb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_IopC-gb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IopC-wb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IopC_Ab4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_IopC_Qb4EeSFB8mUNT_s_w" name="Apublicportmustbedefinedasaserviceport">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopC_gb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopC_wb4EeSFB8mUNT_s_w" key="originalName" value="A public port must be defined as a service port"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDAAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopDAQb4EeSFB8mUNT_s_w" key="body" value="(base_Port.visibility = UML::VisibilityKind::public) &#xD;&#xA;    implies base_Port.isService  "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IopDAwb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDBAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopDBQb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IopDBwb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDCAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopDCQb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_IopDCgb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IopDCwb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IopDDAb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_IopDDQb4EeSFB8mUNT_s_w" name="ASAPunwiredunpublishedmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDDgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopDDwb4EeSFB8mUNT_s_w" key="originalName" value="A SAP (unwired &amp; unpublished) must have protected visibility "/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDEAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopDEQb4EeSFB8mUNT_s_w" key="body" value="(not isWired and not isPublish) &#xD;&#xA;   implies (base_Port.visibility = UML::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IopDEwb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDFAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopDFQb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IopDFwb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDGAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopDGQb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_IopDGgb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IopDGwb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IopDHAb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_IopDHQb4EeSFB8mUNT_s_w" name="AnSPPunwiredandpublishedmusthavepublicvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDHgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopDHwb4EeSFB8mUNT_s_w" key="originalName" value="An SPP (unwired and published) must have public visibility"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDIAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopDIQb4EeSFB8mUNT_s_w" key="body" value="(not isWired and isPublish) implies &#xD;&#xA;   (base_Port.visibility = UML::VisibilityKind::public)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IopDIwb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDJAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopDJQb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IopDJwb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDKAb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopDKQb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_IopDKgb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IopDKwb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IopDLAb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_IopDLQb4EeSFB8mUNT_s_w" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_IopDLwb4EeSFB8mUNT_s_w" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_IopDMQb4EeSFB8mUNT_s_w" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_IopDMwb4EeSFB8mUNT_s_w" name="registration" ordered="false" eType="_IopDOQb4EeSFB8mUNT_s_w"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_IopDNQb4EeSFB8mUNT_s_w" name="registrationOverride" 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="_IopDNwb4EeSFB8mUNT_s_w" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_IopDOQb4EeSFB8mUNT_s_w" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDOgb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_IopDOwb4EeSFB8mUNT_s_w" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_IopDPAb4EeSFB8mUNT_s_w" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_IopDPQb4EeSFB8mUNT_s_w" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_IopDPgb4EeSFB8mUNT_s_w" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDPwb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_IopDQAb4EeSFB8mUNT_s_w" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDQQb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopDQgb4EeSFB8mUNT_s_w" key="originalName" value="Only binary connectors are allowed"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDQwb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopDRAb4EeSFB8mUNT_s_w" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IopDRgb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDRwb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopDSAb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IopDSgb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDSwb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopDTAb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_IopDTQb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IopDTgb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IopDTwb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_IopDUAb4EeSFB8mUNT_s_w" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_IopDUgb4EeSFB8mUNT_s_w" name="ProtocolContainer">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDUwb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_IopDVAb4EeSFB8mUNT_s_w" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_IopDVgb4EeSFB8mUNT_s_w" name="RTRExcludedElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDVwb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_IopDWAb4EeSFB8mUNT_s_w" name="ExclusioncanonlybeappliedtosomeUMLRTmodelelements">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDWQb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopDWgb4EeSFB8mUNT_s_w" key="originalName" value="Exclusion can only be applied to some UML-RT model elements"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDWwb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopDXAb4EeSFB8mUNT_s_w" key="body" value="let el = base_RedefinableElement in&#xD;&#xA;(el.oclIsKindOf(UML::Port) or&#xD;&#xA; el.oclIsKindOf(UML::Property) or&#xD;&#xA; el.oclIsKindOf(UML::Operation) or&#xD;&#xA; el.oclIsKindOf(UML::Behavior) or&#xD;&#xA;el.oclIsKindOf(UML::State) or&#xD;&#xA;el.oclIsKindOf(UML::Transition))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IopDXgb4EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDXwb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopDYAb4EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_IopDYgb4EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDYwb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IopDZAb4EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_IopDZQb4EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IopDZgb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_IopDZwb4EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_IopDaAb4EeSFB8mUNT_s_w" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_IopDagb4EeSFB8mUNT_s_w" name="RTMessageSet">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDawb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g6khEGDFEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_IopDbAb4EeSFB8mUNT_s_w" name="base_Interface" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_IopDbgb4EeSFB8mUNT_s_w" name="rtMsgKind" ordered="false" lowerBound="1" eType="_IopDcAb4EeSFB8mUNT_s_w" defaultValueLiteral="true"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_IopDcAb4EeSFB8mUNT_s_w" name="RTMessageKind">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IopDcQb4EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXMMIGDdEeOesvHnEWH_sQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_IopDcgb4EeSFB8mUNT_s_w" name="in"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_IopDcwb4EeSFB8mUNT_s_w" name="out" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_IopDdAb4EeSFB8mUNT_s_w" name="inOut" value="2"/>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_kQJm4Ab3EeSFB8mUNT_s_w" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_kQF8gAb3EeSFB8mUNT_s_w/24" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJm4Qb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJm4gb3EeSFB8mUNT_s_w" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQT-8Ab3EeSFB8mUNT_s_w" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQT-8Qb3EeSFB8mUNT_s_w" key="Version" value="0.1.13"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQT-8gb3EeSFB8mUNT_s_w" key="Comment" value="Updated with new protocol mode based on legacy Collaboration-based approach"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQT-8wb3EeSFB8mUNT_s_w" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQT-9Ab3EeSFB8mUNT_s_w" key="Date" value="2014-07-08"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQT-9Qb3EeSFB8mUNT_s_w" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_kQJm4wb3EeSFB8mUNT_s_w" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJm5Ab3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_kQJm5Qb3EeSFB8mUNT_s_w" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJm5gb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJm5wb3EeSFB8mUNT_s_w" key="originalName" value="Capsules are always active"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJm6Ab3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJm6Qb3EeSFB8mUNT_s_w" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJm6wb3EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJm7Ab3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJm7Qb3EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJm7wb3EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJm8Ab3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJm8Qb3EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_kQJm8gb3EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJm8wb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJm9Ab3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_kQJm9Qb3EeSFB8mUNT_s_w" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJm9gb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJm9wb3EeSFB8mUNT_s_w" key="originalName" value="A capsule cannot have Reception features"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJm-Ab3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJm-Qb3EeSFB8mUNT_s_w" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJm-wb3EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJm_Ab3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJm_Qb3EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJm_wb3EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnAAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnAQb3EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_kQJnAgb3EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJnAwb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJnBAb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_kQJnBQb3EeSFB8mUNT_s_w" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnBgb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnBwb3EeSFB8mUNT_s_w" key="originalName" value="A capsule class can always be subclassed"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnCAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnCQb3EeSFB8mUNT_s_w" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJnCwb3EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnDAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnDQb3EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJnDwb3EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnEAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnEQb3EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_kQJnEgb3EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJnEwb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJnFAb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_kQJnFQb3EeSFB8mUNT_s_w" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnFgb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnFwb3EeSFB8mUNT_s_w" key="originalName" value="A capsule can have at most one superclass"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnGAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnGQb3EeSFB8mUNT_s_w" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJnGwb3EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnHAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnHQb3EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJnHwb3EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnIAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnIQb3EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_kQJnIgb3EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJnIwb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJnJAb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_kQJnJQb3EeSFB8mUNT_s_w" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnJgb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnJwb3EeSFB8mUNT_s_w" key="originalName" value="Capsule classes are always substitutable"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnKAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnKQb3EeSFB8mUNT_s_w" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJnKwb3EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnLAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnLQb3EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJnLwb3EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnMAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnMQb3EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_kQJnMgb3EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJnMwb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJnNAb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_kQJnNQb3EeSFB8mUNT_s_w" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnNgb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnNwb3EeSFB8mUNT_s_w" key="originalName" value="All attributes of a capsule class have exactly one type"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnOAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnOQb3EeSFB8mUNT_s_w" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJnOwb3EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnPAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnPQb3EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJnPwb3EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnQAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnQQb3EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_kQJnQgb3EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJnQwb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJnRAb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_kQJnRQb3EeSFB8mUNT_s_w" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnRgb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnRwb3EeSFB8mUNT_s_w" key="originalName" value="Private visibility is not supported on capsule features"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnSAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnSQb3EeSFB8mUNT_s_w" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> UML::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJnSwb3EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnTAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnTQb3EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJnTwb3EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnUAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnUQb3EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_kQJnUgb3EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJnUwb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJnVAb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_kQJnVQb3EeSFB8mUNT_s_w" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnVgb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnVwb3EeSFB8mUNT_s_w" key="originalName" value="A capsule class cannot have nested classifiers"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnWAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnWQb3EeSFB8mUNT_s_w" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJnWwb3EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnXAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnXQb3EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJnXwb3EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnYAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnYQb3EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_kQJnYgb3EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJnYwb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJnZAb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_kQJnZQb3EeSFB8mUNT_s_w" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnZgb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnZwb3EeSFB8mUNT_s_w" key="originalName" value="All operations of a capsule are sequential"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnaAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnaQb3EeSFB8mUNT_s_w" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = UML::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJnawb3EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnbAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnbQb3EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJnbwb3EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJncAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJncQb3EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_kQJncgb3EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJncwb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJndAb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_kQJndQb3EeSFB8mUNT_s_w" 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="_kQJndwb3EeSFB8mUNT_s_w" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJneAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_kQJneQb3EeSFB8mUNT_s_w" 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="_kQJnewb3EeSFB8mUNT_s_w" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnfAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_kQJnfQb3EeSFB8mUNT_s_w" name="Protocolscanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnfgb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnfwb3EeSFB8mUNT_s_w" key="originalName" value="Protocols can have at most one generalization"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJngAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJngQb3EeSFB8mUNT_s_w" key="body" value="base_Collaboration.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJngwb3EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnhAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnhQb3EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJnhwb3EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJniAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJniQb3EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_kQJnigb3EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJniwb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJnjAb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_kQJnjQb3EeSFB8mUNT_s_w" name="base_Collaboration" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_kQJnjwb3EeSFB8mUNT_s_w" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnkAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_kQJnkQb3EeSFB8mUNT_s_w" name="Awiredportcannotpublishitsname">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnkgb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnkwb3EeSFB8mUNT_s_w" key="originalName" value="A wired port cannot publish its name"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnlAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnlQb3EeSFB8mUNT_s_w" key="body" value="isWired implies not isPublish"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJnlwb3EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnmAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnmQb3EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJnmwb3EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnnAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnnQb3EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_kQJnngb3EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJnnwb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJnoAb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_kQJnoQb3EeSFB8mUNT_s_w" name="Apublicportmustbedefinedasaserviceport">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnogb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnowb3EeSFB8mUNT_s_w" key="originalName" value="A public port must be defined as a service port"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnpAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnpQb3EeSFB8mUNT_s_w" key="body" value="(base_Port.visibility = UML::VisibilityKind::public) &#xD;&#xA;    implies base_Port.isService  "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJnpwb3EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnqAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnqQb3EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQJnqwb3EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnrAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnrQb3EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_kQJnrgb3EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJnrwb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQJnsAb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_kQJnsQb3EeSFB8mUNT_s_w" name="ASAPunwiredunpublishedmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJnsgb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJnswb3EeSFB8mUNT_s_w" key="originalName" value="A SAP (unwired &amp; unpublished) must have protected visibility "/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQJntAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQJntQb3EeSFB8mUNT_s_w" key="body" value="(not isWired and not isPublish) &#xD;&#xA;   implies (base_Port.visibility = UML::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQKN8Qb3EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKN8gb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQKN8wb3EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQKN9Qb3EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKN9gb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQKN9wb3EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_kQKN-Ab3EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQKN-Qb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQKN-gb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_kQKN-wb3EeSFB8mUNT_s_w" name="AnSPPunwiredandpublishedmusthavepublicvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKN_Ab3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQKN_Qb3EeSFB8mUNT_s_w" key="originalName" value="An SPP (unwired and published) must have public visibility"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKN_gb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQKN_wb3EeSFB8mUNT_s_w" key="body" value="(not isWired and isPublish) implies &#xD;&#xA;   (base_Port.visibility = UML::VisibilityKind::public)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQKOAQb3EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKOAgb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQKOAwb3EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQKOBQb3EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKOBgb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQKOBwb3EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_kQKOCAb3EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQKOCQb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQKOCgb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_kQKOCwb3EeSFB8mUNT_s_w" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_kQKODQb3EeSFB8mUNT_s_w" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_kQKODwb3EeSFB8mUNT_s_w" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_kQKOEQb3EeSFB8mUNT_s_w" name="registration" ordered="false" eType="_kQKOFwb3EeSFB8mUNT_s_w"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_kQKOEwb3EeSFB8mUNT_s_w" name="registrationOverride" 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="_kQKOFQb3EeSFB8mUNT_s_w" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_kQKOFwb3EeSFB8mUNT_s_w" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKOGAb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_kQKOGQb3EeSFB8mUNT_s_w" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_kQKOGgb3EeSFB8mUNT_s_w" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_kQKOGwb3EeSFB8mUNT_s_w" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_kQKOHAb3EeSFB8mUNT_s_w" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKOHQb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_kQKOHgb3EeSFB8mUNT_s_w" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKOHwb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQKOIAb3EeSFB8mUNT_s_w" key="originalName" value="Only binary connectors are allowed"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKOIQb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQKOIgb3EeSFB8mUNT_s_w" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQKOJAb3EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKOJQb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQKOJgb3EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQKOKAb3EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKOKQb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQKOKgb3EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_kQKOKwb3EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQKOLAb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQKOLQb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_kQKOLgb3EeSFB8mUNT_s_w" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_kQKOMAb3EeSFB8mUNT_s_w" name="ProtocolContainer">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKOMQb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_kQKOMgb3EeSFB8mUNT_s_w" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_kQKONAb3EeSFB8mUNT_s_w" name="RTRExcludedElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKONQb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_kQKONgb3EeSFB8mUNT_s_w" name="ExclusioncanonlybeappliedtosomeUMLRTmodelelements">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKONwb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQKOOAb3EeSFB8mUNT_s_w" key="originalName" value="Exclusion can only be applied to some UML-RT model elements"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKOOQb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQKOOgb3EeSFB8mUNT_s_w" key="body" value="let el = base_RedefinableElement in&#xD;&#xA;(el.oclIsKindOf(UML::Port) or&#xD;&#xA; el.oclIsKindOf(UML::Property) or&#xD;&#xA; el.oclIsKindOf(UML::Operation) or&#xD;&#xA; el.oclIsKindOf(UML::Behavior) or&#xD;&#xA;el.oclIsKindOf(UML::State) or&#xD;&#xA;el.oclIsKindOf(UML::Transition))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQKOPAb3EeSFB8mUNT_s_w" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKOPQb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQKOPgb3EeSFB8mUNT_s_w" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_kQKOQAb3EeSFB8mUNT_s_w" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKOQQb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQKOQgb3EeSFB8mUNT_s_w" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_kQKOQwb3EeSFB8mUNT_s_w">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQKORAb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_kQKORQb3EeSFB8mUNT_s_w">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_kQKORgb3EeSFB8mUNT_s_w" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_kQKOSAb3EeSFB8mUNT_s_w" name="RTMessageSet">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKOSQb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g6khEGDFEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_kQKOSgb3EeSFB8mUNT_s_w" name="base_Interface" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_kQKOTAb3EeSFB8mUNT_s_w" name="rtMsgKind" ordered="false" lowerBound="1" eType="_kQKOTgb3EeSFB8mUNT_s_w" defaultValueLiteral="true"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_kQKOTgb3EeSFB8mUNT_s_w" name="RTMessageKind">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQKOTwb3EeSFB8mUNT_s_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXMMIGDdEeOesvHnEWH_sQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_kQKOUAb3EeSFB8mUNT_s_w" name="in"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_kQKOUQb3EeSFB8mUNT_s_w" name="out" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_kQKOUgb3EeSFB8mUNT_s_w" name="inOut" value="2"/>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_r3eiQKUbEeOMJMavfflX6A" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_r3d7MKUbEeOMJMavfflX6A/23" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eiQaUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eiQqUbEeOMJMavfflX6A" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3lP8qUbEeOMJMavfflX6A" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3lP86UbEeOMJMavfflX6A" key="Version" value="0.1.12"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3lP9KUbEeOMJMavfflX6A" key="Comment" value="Missed some &quot;uml&quot;s"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3lP9aUbEeOMJMavfflX6A" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3lP9qUbEeOMJMavfflX6A" key="Date" value="2014-03-06"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3lP96UbEeOMJMavfflX6A" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_r3eiQ6UbEeOMJMavfflX6A" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eiRKUbEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_r3eiRaUbEeOMJMavfflX6A" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eiRqUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eiR6UbEeOMJMavfflX6A" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3eiSaUbEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eiSqUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eiS6UbEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3eiTaUbEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eiTqUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eiT6UbEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_r3eiUKUbEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3eiUaUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3eiUqUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_r3eiU6UbEeOMJMavfflX6A" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eiVKUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eiVaUbEeOMJMavfflX6A" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3eiV6UbEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eiWKUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eiWaUbEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3eiW6UbEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eiXKUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eiXaUbEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_r3eiXqUbEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3eiX6UbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3eiYKUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_r3eiYaUbEeOMJMavfflX6A" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eiYqUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eiY6UbEeOMJMavfflX6A" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3eiZaUbEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eiZqUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eiZ6UbEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3eiaaUbEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eiaqUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eia6UbEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_r3eibKUbEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3eibaUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3eibqUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_r3eib6UbEeOMJMavfflX6A" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eicKUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eicaUbEeOMJMavfflX6A" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3eic6UbEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eidKUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eidaUbEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3eid6UbEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eieKUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eieaUbEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_r3eieqUbEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3eie6UbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3eifKUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_r3eifaUbEeOMJMavfflX6A" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eifqUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eif6UbEeOMJMavfflX6A" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3eigaUbEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eigqUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eig6UbEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3eihaUbEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eihqUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eih6UbEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_r3eiiKUbEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3eiiaUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3eiiqUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_r3eii6UbEeOMJMavfflX6A" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eijKUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eijaUbEeOMJMavfflX6A" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3eij6UbEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eikKUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eikaUbEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3eik6UbEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eilKUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eilaUbEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_r3eilqUbEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3eil6UbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3eimKUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_r3eimaUbEeOMJMavfflX6A" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eimqUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eim6UbEeOMJMavfflX6A" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> UML::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3einaUbEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3einqUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ein6UbEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3eioaUbEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eioqUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eio6UbEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_r3eipKUbEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3eipaUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3eipqUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_r3eip6UbEeOMJMavfflX6A" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eiqKUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eiqaUbEeOMJMavfflX6A" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3eiq6UbEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eirKUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eiraUbEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3eir6UbEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eisKUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eisaUbEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_r3eisqUbEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3eis6UbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3eitKUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_r3eitaUbEeOMJMavfflX6A" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eitqUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eit6UbEeOMJMavfflX6A" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = UML::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3eiuaUbEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eiuqUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eiu6UbEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3eivaUbEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eivqUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eiv6UbEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_r3eiwKUbEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3eiwaUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3eiwqUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_r3eiw6UbEeOMJMavfflX6A" 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="_r3eixaUbEeOMJMavfflX6A" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eixqUbEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_r3eix6UbEeOMJMavfflX6A" 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="_r3eiyaUbEeOMJMavfflX6A" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eiyqUbEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_r3eiy6UbEeOMJMavfflX6A" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3eizKUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3eizaUbEeOMJMavfflX6A" key="body" value="base_Class.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3eiz6UbEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ei0KUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ei0aUbEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3ei06UbEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ei1KUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ei1aUbEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_r3ei1qUbEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3ei16UbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3ei2KUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_r3ei2aUbEeOMJMavfflX6A" 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="_r3ei26UbEeOMJMavfflX6A" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ei3KUbEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_r3ei3aUbEeOMJMavfflX6A" name="Awiredportcannotpublishitsname">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ei3qUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ei36UbEeOMJMavfflX6A" key="body" value="isWired implies not isPublish"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3ei4aUbEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ei4qUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ei46UbEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3ei5aUbEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ei5qUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ei56UbEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_r3ei6KUbEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3ei6aUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3ei6qUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_r3ei66UbEeOMJMavfflX6A" name="Apublicportmustbedefinedasaserviceport">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ei7KUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ei7aUbEeOMJMavfflX6A" key="body" value="(base_Port.visibility = UML::VisibilityKind::public) &#xD;&#xA;    implies base_Port.isService  "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3ei76UbEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ei8KUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ei8aUbEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3ei86UbEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ei9KUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ei9aUbEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_r3ei9qUbEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3ei96UbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3ei-KUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_r3ei-aUbEeOMJMavfflX6A" name="ASAPunwiredunpublishedmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ei-qUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ei-6UbEeOMJMavfflX6A" key="body" value="(not isWired and not isPublish) &#xD;&#xA;   implies (base_Port.visibility = UML::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3ei_aUbEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ei_qUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ei_6UbEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3ejAaUbEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ejAqUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ejA6UbEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_r3ejBKUbEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3ejBaUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3ejBqUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_r3ejB6UbEeOMJMavfflX6A" name="AnSPPunwiredandpublishedmusthavepublicvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ejCKUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ejCaUbEeOMJMavfflX6A" key="body" value="(not isWired and isPublish) implies &#xD;&#xA;   (base_Port.visibility = UML::VisibilityKind::public)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3ejC6UbEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ejDKUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ejDaUbEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3ejD6UbEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ejEKUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ejEaUbEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_r3ejEqUbEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3ejE6UbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3ejFKUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_r3ejFaUbEeOMJMavfflX6A" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_r3ejF6UbEeOMJMavfflX6A" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_r3ejGaUbEeOMJMavfflX6A" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_r3ejG6UbEeOMJMavfflX6A" name="registration" ordered="false" eType="_r3ejIaUbEeOMJMavfflX6A"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_r3ejHaUbEeOMJMavfflX6A" name="registrationOverride" 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="_r3ejH6UbEeOMJMavfflX6A" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_r3ejIaUbEeOMJMavfflX6A" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ejIqUbEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_r3ejI6UbEeOMJMavfflX6A" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_r3ejJKUbEeOMJMavfflX6A" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_r3ejJaUbEeOMJMavfflX6A" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_r3ejJqUbEeOMJMavfflX6A" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ejJ6UbEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_r3ejKKUbEeOMJMavfflX6A" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ejKaUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ejKqUbEeOMJMavfflX6A" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3ejLKUbEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ejLaUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ejLqUbEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3ejMKUbEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ejMaUbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ejMqUbEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_r3ejM6UbEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3ejNKUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3ejNaUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_r3ejNqUbEeOMJMavfflX6A" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_r3ejOKUbEeOMJMavfflX6A" name="ProtocolPackage">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ejOaUbEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_r3ejOqUbEeOMJMavfflX6A" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_r3ejPKUbEeOMJMavfflX6A" name="RTRExcludedElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ejPaUbEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_r3ejPqUbEeOMJMavfflX6A" name="ExclusioncanonlybeappliedtosomeUMLRTmodelelements">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ejP6UbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ejQKUbEeOMJMavfflX6A" key="body" value="let el = base_RedefinableElement in&#xD;&#xA;(el.oclIsKindOf(UML::Port) or&#xD;&#xA; el.oclIsKindOf(UML::Property) or&#xD;&#xA; el.oclIsKindOf(UML::Operation) or&#xD;&#xA; el.oclIsKindOf(UML::Behavior) or&#xD;&#xA;el.oclIsKindOf(UML::State) or&#xD;&#xA;el.oclIsKindOf(UML::Transition))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3ejQqUbEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ejQ6UbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ejRKUbEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_r3ejRqUbEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ejR6UbEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r3ejSKUbEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_r3ejSaUbEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3ejSqUbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_r3ejS6UbEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_r3ejTKUbEeOMJMavfflX6A" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_r3ejTqUbEeOMJMavfflX6A" name="MessageSet">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ejT6UbEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g6khEGDFEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_r3ejUKUbEeOMJMavfflX6A" name="base_Interface" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_r3ejUqUbEeOMJMavfflX6A" name="isIncoming" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_r3ejVKUbEeOMJMavfflX6A" name="TriggerEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ejVaUbEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_r3ejVqUbEeOMJMavfflX6A" name="evType" ordered="false" lowerBound="1" eType="_r3fJU6UbEeOMJMavfflX6A"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_r3fJUaUbEeOMJMavfflX6A" name="base_SignalEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//SignalEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_r3fJU6UbEeOMJMavfflX6A" name="EventType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3fJVKUbEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXMMIGDdEeOesvHnEWH_sQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_r3fJVaUbEeOMJMavfflX6A" name="inEvent"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_r3fJVqUbEeOMJMavfflX6A" name="outEvent" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_r3fJV6UbEeOMJMavfflX6A" name="inOutEvent" value="2"/>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_yARfwKULEeOMJMavfflX6A" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_yAQ4sKULEeOMJMavfflX6A/22" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARfwaULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARfwqULEeOMJMavfflX6A" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yAXmYKULEeOMJMavfflX6A" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yAXmYaULEeOMJMavfflX6A" key="Version" value="0.1.11"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yAXmYqULEeOMJMavfflX6A" key="Comment" value="Defined"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yAXmY6ULEeOMJMavfflX6A" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yAXmZKULEeOMJMavfflX6A" key="Date" value="2014-03-06"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yAXmZaULEeOMJMavfflX6A" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_yARfw6ULEeOMJMavfflX6A" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARfxKULEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_yARfxaULEeOMJMavfflX6A" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARfxqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARfx6ULEeOMJMavfflX6A" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARfyaULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARfyqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARfy6ULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARfzaULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARfzqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARfz6ULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_yARf0KULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARf0aULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARf0qULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_yARf06ULEeOMJMavfflX6A" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARf1KULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARf1aULEeOMJMavfflX6A" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARf16ULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARf2KULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARf2aULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARf26ULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARf3KULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARf3aULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_yARf3qULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARf36ULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARf4KULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_yARf4aULEeOMJMavfflX6A" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARf4qULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARf46ULEeOMJMavfflX6A" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARf5aULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARf5qULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARf56ULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARf6aULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARf6qULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARf66ULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_yARf7KULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARf7aULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARf7qULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_yARf76ULEeOMJMavfflX6A" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARf8KULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARf8aULEeOMJMavfflX6A" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARf86ULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARf9KULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARf9aULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARf96ULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARf-KULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARf-aULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_yARf-qULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARf-6ULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARf_KULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_yARf_aULEeOMJMavfflX6A" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARf_qULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARf_6ULEeOMJMavfflX6A" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARgAaULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgAqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgA6ULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARgBaULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgBqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgB6ULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_yARgCKULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARgCaULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARgCqULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_yARgC6ULEeOMJMavfflX6A" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgDKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgDaULEeOMJMavfflX6A" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARgD6ULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgEKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgEaULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARgE6ULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgFKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgFaULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_yARgFqULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARgF6ULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARgGKULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_yARgGaULEeOMJMavfflX6A" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgGqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgG6ULEeOMJMavfflX6A" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> UML::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARgHaULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgHqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgH6ULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARgIaULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgIqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgI6ULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_yARgJKULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARgJaULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARgJqULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_yARgJ6ULEeOMJMavfflX6A" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgKKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgKaULEeOMJMavfflX6A" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARgK6ULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgLKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgLaULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARgL6ULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgMKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgMaULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_yARgMqULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARgM6ULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARgNKULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_yARgNaULEeOMJMavfflX6A" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgNqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgN6ULEeOMJMavfflX6A" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = UML::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARgOaULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgOqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgO6ULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARgPaULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgPqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgP6ULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_yARgQKULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARgQaULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARgQqULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_yARgQ6ULEeOMJMavfflX6A" 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="_yARgRaULEeOMJMavfflX6A" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgRqULEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_yARgR6ULEeOMJMavfflX6A" 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="_yARgSaULEeOMJMavfflX6A" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgSqULEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_yARgS6ULEeOMJMavfflX6A" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgTKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgTaULEeOMJMavfflX6A" key="body" value="base_Class.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARgT6ULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgUKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgUaULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARgU6ULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgVKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgVaULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_yARgVqULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARgV6ULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARgWKULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_yARgWaULEeOMJMavfflX6A" 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="_yARgW6ULEeOMJMavfflX6A" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgXKULEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_yARgXaULEeOMJMavfflX6A" name="Awiredportcannotpublishitsname">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgXqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgX6ULEeOMJMavfflX6A" key="body" value="isWired implies not isPublish"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARgYaULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgYqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgY6ULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARgZaULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgZqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgZ6ULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_yARgaKULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARgaaULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARgaqULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_yARga6ULEeOMJMavfflX6A" name="Apublicportmustbedefinedasaserviceport">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgbKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgbaULEeOMJMavfflX6A" key="body" value="(base_Port.visibility = UML::VisibilityKind::public) &#xD;&#xA;    implies base_Port.isService  "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARgb6ULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgcKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgcaULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARgc6ULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgdKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgdaULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_yARgdqULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARgd6ULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARgeKULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_yARgeaULEeOMJMavfflX6A" name="ASAPunwiredunpublishedmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgeqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARge6ULEeOMJMavfflX6A" key="body" value="(not isWired and not isPublish) &#xD;&#xA;   implies (base_Port.visibility = UML::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARgfaULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgfqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgf6ULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARggaULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARggqULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgg6ULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_yARghKULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARghaULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARghqULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_yARgh6ULEeOMJMavfflX6A" name="AnSPPunwiredandpublishedmusthavepublicvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgiKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgiaULEeOMJMavfflX6A" key="body" value="(not isWired and isPublish) implies &#xD;&#xA;   (base_Port.visibility = UML::VisibilityKind::public)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARgi6ULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgjKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgjaULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yARgj6ULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yARgkKULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yARgkaULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_yARgkqULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARgk6ULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yARglKULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_yARglaULEeOMJMavfflX6A" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_yARgl6ULEeOMJMavfflX6A" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_yARgmaULEeOMJMavfflX6A" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_yARgm6ULEeOMJMavfflX6A" name="registration" ordered="false" eType="_yASG1KULEeOMJMavfflX6A"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_yASG0KULEeOMJMavfflX6A" name="registrationOverride" 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="_yASG0qULEeOMJMavfflX6A" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_yASG1KULEeOMJMavfflX6A" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yASG1aULEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_yASG1qULEeOMJMavfflX6A" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_yASG16ULEeOMJMavfflX6A" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_yASG2KULEeOMJMavfflX6A" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_yASG2aULEeOMJMavfflX6A" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yASG2qULEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_yASG26ULEeOMJMavfflX6A" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yASG3KULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yASG3aULEeOMJMavfflX6A" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yASG36ULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yASG4KULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yASG4aULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yASG46ULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yASG5KULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yASG5aULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_yASG5qULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yASG56ULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yASG6KULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_yASG6aULEeOMJMavfflX6A" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_yASG66ULEeOMJMavfflX6A" name="ProtocolPackage">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yASG7KULEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_yASG7aULEeOMJMavfflX6A" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_yASG76ULEeOMJMavfflX6A" name="RTRExcludedElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yASG8KULEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_yASG8aULEeOMJMavfflX6A" name="ExclusioncanonlybeappliedtosomeUMLRTmodelelements">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yASG8qULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yASG86ULEeOMJMavfflX6A" key="body" value="let el = base_RedefinableElement in&#xD;&#xA;(el.oclIsKindOf(uml::Port) or&#xD;&#xA; el.oclIsKindOf(uml::Property) or&#xD;&#xA; el.oclIsKindOf(uml::Operation) or&#xD;&#xA; el.oclIsKindOf(uml::Behavior) or&#xD;&#xA;el.oclIsKindOf(uml::State) or&#xD;&#xA;el.oclIsKindOf(uml::Transition))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yASG9aULEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yASG9qULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yASG96ULEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_yASG-aULEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yASG-qULEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yASG-6ULEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_yASG_KULEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yASG_aULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_yASG_qULEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_yASG_6ULEeOMJMavfflX6A" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_yASHAaULEeOMJMavfflX6A" name="MessageSet">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yASHAqULEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g6khEGDFEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_yASHA6ULEeOMJMavfflX6A" name="base_Interface" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_yASHBaULEeOMJMavfflX6A" name="isIncoming" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_yASHB6ULEeOMJMavfflX6A" name="TriggerEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yASHCKULEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_yASHCaULEeOMJMavfflX6A" name="evType" ordered="false" lowerBound="1" eType="_yASHDaULEeOMJMavfflX6A"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_yASHC6ULEeOMJMavfflX6A" name="base_SignalEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//SignalEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_yASHDaULEeOMJMavfflX6A" name="EventType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yASHDqULEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXMMIGDdEeOesvHnEWH_sQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_yASHD6ULEeOMJMavfflX6A" name="inEvent"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_yASHEKULEeOMJMavfflX6A" name="outEvent" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_yASHEaULEeOMJMavfflX6A" name="inOutEvent" value="2"/>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_WColoKUKEeOMJMavfflX6A" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_WCn-kKUKEeOMJMavfflX6A/21" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WColoaUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WColoqUKEeOMJMavfflX6A" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCv6YKUKEeOMJMavfflX6A" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCv6YaUKEeOMJMavfflX6A" key="Version" value="0.1.10"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCv6YqUKEeOMJMavfflX6A" key="Comment" value="Refined version after: &#xD;&#xA;&#xD;&#xA;(1) Defining a model library associated with the profile&#xD;&#xA;(2) Changing references to &quot;uml&quot; to be &quot;UML&quot; (as per Ansgar's advice)"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCv6Y6UKEeOMJMavfflX6A" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCv6ZKUKEeOMJMavfflX6A" key="Date" value="2014-03-06"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCv6ZaUKEeOMJMavfflX6A" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_WColo6UKEeOMJMavfflX6A" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WColpKUKEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_WColpaUKEeOMJMavfflX6A" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WColpqUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WColp6UKEeOMJMavfflX6A" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WColqaUKEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WColqqUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WColq6UKEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WColraUKEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WColrqUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WColr6UKEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_WColsKUKEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WColsaUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WColsqUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_WCols6UKEeOMJMavfflX6A" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WColtKUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WColtaUKEeOMJMavfflX6A" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WColt6UKEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WColuKUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WColuaUKEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WColu6UKEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WColvKUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WColvaUKEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_WColvqUKEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WColv6UKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WColwKUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_WColwaUKEeOMJMavfflX6A" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WColwqUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WColw6UKEeOMJMavfflX6A" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WColxaUKEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WColxqUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WColx6UKEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WColyaUKEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WColyqUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WColy6UKEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_WColzKUKEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WColzaUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WColzqUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_WColz6UKEeOMJMavfflX6A" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCol0KUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCol0aUKEeOMJMavfflX6A" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WCol06UKEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCol1KUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCol1aUKEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WCol16UKEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCol2KUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCol2aUKEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_WCol2qUKEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WCol26UKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WCol3KUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_WCol3aUKEeOMJMavfflX6A" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCol3qUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCol36UKEeOMJMavfflX6A" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WCol4aUKEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCol4qUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCol46UKEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WCol5aUKEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCol5qUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCol56UKEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_WCol6KUKEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WCol6aUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WCol6qUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_WCol66UKEeOMJMavfflX6A" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCol7KUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCol7aUKEeOMJMavfflX6A" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WCol76UKEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCol8KUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCol8aUKEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WCol86UKEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCol9KUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCol9aUKEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_WCol9qUKEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WCol96UKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WCol-KUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_WCol-aUKEeOMJMavfflX6A" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCol-qUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCol-6UKEeOMJMavfflX6A" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> UML::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WCol_aUKEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCol_qUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCol_6UKEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WComAaUKEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComAqUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WComA6UKEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_WComBKUKEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WComBaUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WComBqUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_WComB6UKEeOMJMavfflX6A" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComCKUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WComCaUKEeOMJMavfflX6A" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WComC6UKEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComDKUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WComDaUKEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WComD6UKEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComEKUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WComEaUKEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_WComEqUKEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WComE6UKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WComFKUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_WComFaUKEeOMJMavfflX6A" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComFqUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WComF6UKEeOMJMavfflX6A" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = UML::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WComGaUKEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComGqUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WComG6UKEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WComHaUKEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComHqUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WComH6UKEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_WComIKUKEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WComIaUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WComIqUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_WComI6UKEeOMJMavfflX6A" 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="_WComJaUKEeOMJMavfflX6A" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComJqUKEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_WComJ6UKEeOMJMavfflX6A" 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="_WComKaUKEeOMJMavfflX6A" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComKqUKEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_WComK6UKEeOMJMavfflX6A" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComLKUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WComLaUKEeOMJMavfflX6A" key="body" value="base_Class.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WComL6UKEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComMKUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WComMaUKEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WComM6UKEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComNKUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WComNaUKEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_WComNqUKEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WComN6UKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WComOKUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_WComOaUKEeOMJMavfflX6A" 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="_WComO6UKEeOMJMavfflX6A" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComPKUKEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_WComPaUKEeOMJMavfflX6A" name="Awiredportcannotpublishitsname">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComPqUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WComP6UKEeOMJMavfflX6A" key="body" value="isWired implies not isPublish"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WComQaUKEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComQqUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WComQ6UKEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WComRaUKEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComRqUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WComR6UKEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_WComSKUKEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WComSaUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WComSqUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_WComS6UKEeOMJMavfflX6A" name="Apublicportmustbedefinedasaserviceport">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComTKUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WComTaUKEeOMJMavfflX6A" key="body" value="(base_Port.visibility = UML::VisibilityKind::public) &#xD;&#xA;    implies base_Port.isService  "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WComT6UKEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComUKUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WComUaUKEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WComU6UKEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComVKUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WComVaUKEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_WComVqUKEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WComV6UKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WComWKUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_WComWaUKEeOMJMavfflX6A" name="ASAPunwiredunpublishedmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComWqUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WComW6UKEeOMJMavfflX6A" key="body" value="(not isWired and not isPublish) &#xD;&#xA;   implies (base_Port.visibility = UML::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WComXaUKEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WComXqUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCpMsKUKEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WCpMsqUKEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCpMs6UKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCpMtKUKEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_WCpMtaUKEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WCpMtqUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WCpMt6UKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_WCpMuKUKEeOMJMavfflX6A" name="AnSPPunwiredandpublishedmusthavepublicvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCpMuaUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCpMuqUKEeOMJMavfflX6A" key="body" value="(not isWired and isPublish) implies &#xD;&#xA;   (base_Port.visibility = UML::VisibilityKind::public)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WCpMvKUKEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCpMvaUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCpMvqUKEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WCpMwKUKEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCpMwaUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCpMwqUKEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_WCpMw6UKEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WCpMxKUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WCpMxaUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_WCpMxqUKEeOMJMavfflX6A" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_WCpMyKUKEeOMJMavfflX6A" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_WCpMyqUKEeOMJMavfflX6A" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_WCpMzKUKEeOMJMavfflX6A" name="registration" ordered="false" eType="_WCpM0qUKEeOMJMavfflX6A"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_WCpMzqUKEeOMJMavfflX6A" name="registrationOverride" 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="_WCpM0KUKEeOMJMavfflX6A" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_WCpM0qUKEeOMJMavfflX6A" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCpM06UKEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_WCpM1KUKEeOMJMavfflX6A" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_WCpM1aUKEeOMJMavfflX6A" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_WCpM1qUKEeOMJMavfflX6A" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_WCpM16UKEeOMJMavfflX6A" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCpM2KUKEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_WCpM2aUKEeOMJMavfflX6A" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCpM2qUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCpM26UKEeOMJMavfflX6A" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WCpM3aUKEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCpM3qUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCpM36UKEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WCpM4aUKEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCpM4qUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCpM46UKEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_WCpM5KUKEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WCpM5aUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WCpM5qUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_WCpM56UKEeOMJMavfflX6A" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_WCpM6aUKEeOMJMavfflX6A" name="ProtocolPackage">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCpM6qUKEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_WCpM66UKEeOMJMavfflX6A" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_WCpM7aUKEeOMJMavfflX6A" name="RTRExcludedElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCpM7qUKEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_WCpM76UKEeOMJMavfflX6A" name="ExclusioncanonlybeappliedtosomeUMLRTmodelelements">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCpM8KUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCpM8aUKEeOMJMavfflX6A" key="body" value="let el = base_RedefinableElement in&#xD;&#xA;(el.oclIsKindOf(uml::Port) or&#xD;&#xA; el.oclIsKindOf(uml::Property) or&#xD;&#xA; el.oclIsKindOf(uml::Operation) or&#xD;&#xA; el.oclIsKindOf(uml::Behavior) or&#xD;&#xA;el.oclIsKindOf(uml::State) or&#xD;&#xA;el.oclIsKindOf(uml::Transition))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WCpM86UKEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCpM9KUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCpM9aUKEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_WCpM96UKEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCpM-KUKEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WCpM-aUKEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_WCpM-qUKEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WCpM-6UKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_WCpM_KUKEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_WCpM_aUKEeOMJMavfflX6A" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_WCpM_6UKEeOMJMavfflX6A" name="MessageSet">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCpNAKUKEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g6khEGDFEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_WCpNAaUKEeOMJMavfflX6A" name="base_Interface" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_WCpNA6UKEeOMJMavfflX6A" name="isIncoming" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_WCpNBaUKEeOMJMavfflX6A" name="TriggerEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCpNBqUKEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_WCpNB6UKEeOMJMavfflX6A" name="evType" ordered="false" lowerBound="1" eType="_WCpNC6UKEeOMJMavfflX6A"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_WCpNCaUKEeOMJMavfflX6A" name="base_SignalEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//SignalEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_WCpNC6UKEeOMJMavfflX6A" name="EventType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WCpNDKUKEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXMMIGDdEeOesvHnEWH_sQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_WCpNDaUKEeOMJMavfflX6A" name="inEvent"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_WCpNDqUKEeOMJMavfflX6A" name="outEvent" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_WCpND6UKEeOMJMavfflX6A" name="inOutEvent" value="2"/>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_FE_n0KOhEeOMJMavfflX6A" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_FE_AwKOhEeOMJMavfflX6A/20" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_n0aOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_n0qOhEeOMJMavfflX6A" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFFHY6OhEeOMJMavfflX6A" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFFHZKOhEeOMJMavfflX6A" key="Version" value="0.1.9"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFFHZaOhEeOMJMavfflX6A" key="Comment" value="Removed RTSignal and RTPriority from definition"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFFHZqOhEeOMJMavfflX6A" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFFHZ6OhEeOMJMavfflX6A" key="Date" value="2014-03-04"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFFHaKOhEeOMJMavfflX6A" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_FE_n06OhEeOMJMavfflX6A" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_n1KOhEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_FE_n1aOhEeOMJMavfflX6A" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_n1qOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_n16OhEeOMJMavfflX6A" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_n2aOhEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_n2qOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_n26OhEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_n3aOhEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_n3qOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_n36OhEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_FE_n4KOhEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_n4aOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_n4qOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_FE_n46OhEeOMJMavfflX6A" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_n5KOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_n5aOhEeOMJMavfflX6A" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_n56OhEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_n6KOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_n6aOhEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_n66OhEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_n7KOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_n7aOhEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_FE_n7qOhEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_n76OhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_n8KOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_FE_n8aOhEeOMJMavfflX6A" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_n8qOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_n86OhEeOMJMavfflX6A" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_n9aOhEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_n9qOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_n96OhEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_n-aOhEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_n-qOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_n-6OhEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_FE_n_KOhEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_n_aOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_n_qOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_FE_n_6OhEeOMJMavfflX6A" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oAKOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oAaOhEeOMJMavfflX6A" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_oA6OhEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oBKOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oBaOhEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_oB6OhEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oCKOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oCaOhEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_FE_oCqOhEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_oC6OhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_oDKOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_FE_oDaOhEeOMJMavfflX6A" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oDqOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oD6OhEeOMJMavfflX6A" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_oEaOhEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oEqOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oE6OhEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_oFaOhEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oFqOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oF6OhEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_FE_oGKOhEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_oGaOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_oGqOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_FE_oG6OhEeOMJMavfflX6A" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oHKOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oHaOhEeOMJMavfflX6A" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_oH6OhEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oIKOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oIaOhEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_oI6OhEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oJKOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oJaOhEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_FE_oJqOhEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_oJ6OhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_oKKOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_FE_oKaOhEeOMJMavfflX6A" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oKqOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oK6OhEeOMJMavfflX6A" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_oLaOhEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oLqOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oL6OhEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_oMaOhEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oMqOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oM6OhEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_FE_oNKOhEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_oNaOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_oNqOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_FE_oN6OhEeOMJMavfflX6A" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oOKOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oOaOhEeOMJMavfflX6A" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_oO6OhEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oPKOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oPaOhEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_oP6OhEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oQKOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oQaOhEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_FE_oQqOhEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_oQ6OhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_oRKOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_FE_oRaOhEeOMJMavfflX6A" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oRqOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oR6OhEeOMJMavfflX6A" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_oSaOhEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oSqOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oS6OhEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_oTaOhEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oTqOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oT6OhEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_FE_oUKOhEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_oUaOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_oUqOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_FE_oU6OhEeOMJMavfflX6A" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oVKOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oVaOhEeOMJMavfflX6A" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_oV6OhEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oWKOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oWaOhEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FE_oW6OhEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oXKOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FE_oXaOhEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_FE_oXqOhEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_oX6OhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FE_oYKOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_FE_oYaOhEeOMJMavfflX6A" 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="_FE_oY6OhEeOMJMavfflX6A" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oZKOhEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_FE_oZaOhEeOMJMavfflX6A" 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="_FE_oZ6OhEeOMJMavfflX6A" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FE_oaKOhEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_FFAO4KOhEeOMJMavfflX6A" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAO4aOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAO4qOhEeOMJMavfflX6A" key="body" value="base_Class.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FFAO5KOhEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAO5aOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAO5qOhEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FFAO6KOhEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAO6aOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAO6qOhEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_FFAO66OhEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FFAO7KOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FFAO7aOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_FFAO7qOhEeOMJMavfflX6A" 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="_FFAO8KOhEeOMJMavfflX6A" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAO8aOhEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_FFAO8qOhEeOMJMavfflX6A" name="Awiredportcannotpublishitsname">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAO86OhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAO9KOhEeOMJMavfflX6A" key="body" value="isWired implies not isPublish"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FFAO9qOhEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAO96OhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAO-KOhEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FFAO-qOhEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAO-6OhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAO_KOhEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_FFAO_aOhEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FFAO_qOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FFAO_6OhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_FFAPAKOhEeOMJMavfflX6A" name="Apublicportmustbedefinedasaserviceport">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPAaOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAPAqOhEeOMJMavfflX6A" key="body" value="(base_Port.visibility = uml::VisibilityKind::public) &#xD;&#xA;    implies base_Port.isService  "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FFAPBKOhEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPBaOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAPBqOhEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FFAPCKOhEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPCaOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAPCqOhEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_FFAPC6OhEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FFAPDKOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FFAPDaOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_FFAPDqOhEeOMJMavfflX6A" name="ASAPunwiredunpublishedmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPD6OhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAPEKOhEeOMJMavfflX6A" key="body" value="(not isWired and not isPublish) &#xD;&#xA;   implies (base_Port.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FFAPEqOhEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPE6OhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAPFKOhEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FFAPFqOhEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPF6OhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAPGKOhEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_FFAPGaOhEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FFAPGqOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FFAPG6OhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_FFAPHKOhEeOMJMavfflX6A" name="AnSPPunwiredandpublishedmusthavepublicvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPHaOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAPHqOhEeOMJMavfflX6A" key="body" value="(not isWired and isPublish) implies &#xD;&#xA;   (base_Port.visibility = uml::VisibilityKind::public)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FFAPIKOhEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPIaOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAPIqOhEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FFAPJKOhEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPJaOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAPJqOhEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_FFAPJ6OhEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FFAPKKOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FFAPKaOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_FFAPKqOhEeOMJMavfflX6A" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_FFAPLKOhEeOMJMavfflX6A" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_FFAPLqOhEeOMJMavfflX6A" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_FFAPMKOhEeOMJMavfflX6A" name="registration" ordered="false" eType="_FFAPNqOhEeOMJMavfflX6A"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_FFAPMqOhEeOMJMavfflX6A" name="registrationOverride" 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="_FFAPNKOhEeOMJMavfflX6A" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_FFAPNqOhEeOMJMavfflX6A" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPN6OhEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_FFAPOKOhEeOMJMavfflX6A" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_FFAPOaOhEeOMJMavfflX6A" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_FFAPOqOhEeOMJMavfflX6A" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_FFAPO6OhEeOMJMavfflX6A" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPPKOhEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_FFAPPaOhEeOMJMavfflX6A" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPPqOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAPP6OhEeOMJMavfflX6A" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FFAPQaOhEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPQqOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAPQ6OhEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FFAPRaOhEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPRqOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAPR6OhEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_FFAPSKOhEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FFAPSaOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FFAPSqOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_FFAPS6OhEeOMJMavfflX6A" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_FFAPTaOhEeOMJMavfflX6A" name="ProtocolPackage">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPTqOhEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_FFAPT6OhEeOMJMavfflX6A" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_FFAPUaOhEeOMJMavfflX6A" name="RTRExcludedElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPUqOhEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_FFAPU6OhEeOMJMavfflX6A" name="ExclusioncanonlybeappliedtosomeUMLRTmodelelements">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPVKOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAPVaOhEeOMJMavfflX6A" key="body" value="let el = base_RedefinableElement in&#xD;&#xA;(el.oclIsKindOf(uml::Port) or&#xD;&#xA; el.oclIsKindOf(uml::Property) or&#xD;&#xA; el.oclIsKindOf(uml::Operation) or&#xD;&#xA; el.oclIsKindOf(uml::Behavior) or&#xD;&#xA;el.oclIsKindOf(uml::State) or&#xD;&#xA;el.oclIsKindOf(uml::Transition))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FFAPV6OhEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPWKOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAPWaOhEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_FFAPW6OhEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPXKOhEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FFAPXaOhEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_FFAPXqOhEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FFAPX6OhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_FFAPYKOhEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_FFAPYaOhEeOMJMavfflX6A" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_FFAPY6OhEeOMJMavfflX6A" name="MessageSet">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPZKOhEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g6khEGDFEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_FFAPZaOhEeOMJMavfflX6A" name="base_Interface" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_FFAPZ6OhEeOMJMavfflX6A" name="isIncoming" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_FFAPaaOhEeOMJMavfflX6A" name="TriggerEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPaqOhEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_FFAPa6OhEeOMJMavfflX6A" name="evType" ordered="false" lowerBound="1" eType="_FFAPb6OhEeOMJMavfflX6A"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_FFAPbaOhEeOMJMavfflX6A" name="base_SignalEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//SignalEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_FFAPb6OhEeOMJMavfflX6A" name="EventType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FFAPcKOhEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXMMIGDdEeOesvHnEWH_sQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_FFAPcaOhEeOMJMavfflX6A" name="inEvent"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_FFAPcqOhEeOMJMavfflX6A" name="outEvent" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_FFAPc6OhEeOMJMavfflX6A" name="inOutEvent" value="2"/>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_fCKBUKOJEeOMJMavfflX6A" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_fCJaQKOJEeOMJMavfflX6A/19" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKBUaOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKBUqOJEeOMJMavfflX6A" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKBU6OJEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/4.0.0/UML">

-          <references xmi:type="uml:Model" href="UMLRealTimeCoreLibrary.uml#_qqS0AKOHEeOMJMavfflX6A"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCRWEKOJEeOMJMavfflX6A" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCRWEaOJEeOMJMavfflX6A" key="Version" value="0.1.8"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCRWEqOJEeOMJMavfflX6A" key="Comment" value="Added import of Core Library and moved RTPriority to that library"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCRWE6OJEeOMJMavfflX6A" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCRWFKOJEeOMJMavfflX6A" key="Date" value="2014-03-04"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCRWFaOJEeOMJMavfflX6A" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_fCKBVKOJEeOMJMavfflX6A" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKBVaOJEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_fCKBVqOJEeOMJMavfflX6A" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKBV6OJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKBWKOJEeOMJMavfflX6A" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKBWqOJEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKBW6OJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKBXKOJEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKBXqOJEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKBX6OJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKBYKOJEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_fCKBYaOJEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKBYqOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKBY6OJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_fCKBZKOJEeOMJMavfflX6A" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKBZaOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKBZqOJEeOMJMavfflX6A" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKBaKOJEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKBaaOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKBaqOJEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKBbKOJEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKBbaOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKBbqOJEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_fCKBb6OJEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKBcKOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKBcaOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_fCKBcqOJEeOMJMavfflX6A" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKBc6OJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKBdKOJEeOMJMavfflX6A" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKBdqOJEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKoYKOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKoYaOJEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKoY6OJEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKoZKOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKoZaOJEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_fCKoZqOJEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKoZ6OJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKoaKOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_fCKoaaOJEeOMJMavfflX6A" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKoaqOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKoa6OJEeOMJMavfflX6A" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKobaOJEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKobqOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKob6OJEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKocaOJEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKocqOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKoc6OJEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_fCKodKOJEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKodaOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKodqOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_fCKod6OJEeOMJMavfflX6A" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKoeKOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKoeaOJEeOMJMavfflX6A" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKoe6OJEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKofKOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKofaOJEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKof6OJEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKogKOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKogaOJEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_fCKogqOJEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKog6OJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKohKOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_fCKohaOJEeOMJMavfflX6A" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKohqOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKoh6OJEeOMJMavfflX6A" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKoiaOJEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKoiqOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKoi6OJEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKojaOJEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKojqOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKoj6OJEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_fCKokKOJEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKokaOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKokqOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_fCKok6OJEeOMJMavfflX6A" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKolKOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKolaOJEeOMJMavfflX6A" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKol6OJEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKomKOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKomaOJEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKom6OJEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKonKOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKonaOJEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_fCKonqOJEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKon6OJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKooKOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_fCKooaOJEeOMJMavfflX6A" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKooqOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKoo6OJEeOMJMavfflX6A" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKopaOJEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKopqOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKop6OJEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKoqaOJEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKoqqOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKoq6OJEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_fCKorKOJEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKoraOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKorqOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_fCKor6OJEeOMJMavfflX6A" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKosKOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKosaOJEeOMJMavfflX6A" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKos6OJEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKotKOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKotaOJEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKot6OJEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKouKOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKouaOJEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_fCKouqOJEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKou6OJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKovKOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_fCKovaOJEeOMJMavfflX6A" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKovqOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKov6OJEeOMJMavfflX6A" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKowaOJEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKowqOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKow6OJEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKoxaOJEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKoxqOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKox6OJEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_fCKoyKOJEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKoyaOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKoyqOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_fCKoy6OJEeOMJMavfflX6A" 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="_fCKozaOJEeOMJMavfflX6A" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKozqOJEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_fCKoz6OJEeOMJMavfflX6A" 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="_fCKo0aOJEeOMJMavfflX6A" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKo0qOJEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_fCKo06OJEeOMJMavfflX6A" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKo1KOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKo1aOJEeOMJMavfflX6A" key="body" value="base_Class.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKo16OJEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKo2KOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKo2aOJEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKo26OJEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKo3KOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKo3aOJEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_fCKo3qOJEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKo36OJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKo4KOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_fCKo4aOJEeOMJMavfflX6A" 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="_fCKo46OJEeOMJMavfflX6A" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKo5KOJEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_fCKo5aOJEeOMJMavfflX6A" name="Awiredportcannotpublishitsname">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKo5qOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKo56OJEeOMJMavfflX6A" key="body" value="isWired implies not isPublish"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKo6aOJEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKo6qOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKo66OJEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKo7aOJEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKo7qOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKo76OJEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_fCKo8KOJEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKo8aOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKo8qOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_fCKo86OJEeOMJMavfflX6A" name="Apublicportmustbedefinedasaserviceport">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKo9KOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKo9aOJEeOMJMavfflX6A" key="body" value="(base_Port.visibility = uml::VisibilityKind::public) &#xD;&#xA;    implies base_Port.isService  "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKo96OJEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKo-KOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKo-aOJEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKo-6OJEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKo_KOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKo_aOJEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_fCKo_qOJEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKo_6OJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKpAKOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_fCKpAaOJEeOMJMavfflX6A" name="ASAPunwiredunpublishedmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpAqOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKpA6OJEeOMJMavfflX6A" key="body" value="(not isWired and not isPublish) &#xD;&#xA;   implies (base_Port.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKpBaOJEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpBqOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKpB6OJEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKpCaOJEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpCqOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKpC6OJEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_fCKpDKOJEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKpDaOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKpDqOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_fCKpD6OJEeOMJMavfflX6A" name="AnSPPunwiredandpublishedmusthavepublicvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpEKOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKpEaOJEeOMJMavfflX6A" key="body" value="(not isWired and isPublish) implies &#xD;&#xA;   (base_Port.visibility = uml::VisibilityKind::public)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKpE6OJEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpFKOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKpFaOJEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKpF6OJEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpGKOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKpGaOJEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_fCKpGqOJEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKpG6OJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKpHKOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_fCKpHaOJEeOMJMavfflX6A" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_fCKpH6OJEeOMJMavfflX6A" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_fCKpIaOJEeOMJMavfflX6A" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_fCKpI6OJEeOMJMavfflX6A" name="registration" ordered="false" eType="_fCKpKaOJEeOMJMavfflX6A"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_fCKpJaOJEeOMJMavfflX6A" name="registrationOverride" 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="_fCKpJ6OJEeOMJMavfflX6A" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_fCKpKaOJEeOMJMavfflX6A" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpKqOJEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_fCKpK6OJEeOMJMavfflX6A" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_fCKpLKOJEeOMJMavfflX6A" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_fCKpLaOJEeOMJMavfflX6A" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_fCKpLqOJEeOMJMavfflX6A" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpL6OJEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_fCKpMKOJEeOMJMavfflX6A" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpMaOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKpMqOJEeOMJMavfflX6A" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKpNKOJEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpNaOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKpNqOJEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKpOKOJEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpOaOJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKpOqOJEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_fCKpO6OJEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKpPKOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKpPaOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_fCKpPqOJEeOMJMavfflX6A" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_fCKpQKOJEeOMJMavfflX6A" name="ProtocolPackage">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpQaOJEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_fCKpQqOJEeOMJMavfflX6A" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_fCKpRKOJEeOMJMavfflX6A" name="RTRExcludedElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpRaOJEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_fCKpRqOJEeOMJMavfflX6A" name="ExclusioncanonlybeappliedtosomeUMLRTmodelelements">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpR6OJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKpSKOJEeOMJMavfflX6A" key="body" value="let el = base_RedefinableElement in&#xD;&#xA;(el.oclIsKindOf(uml::Port) or&#xD;&#xA; el.oclIsKindOf(uml::Property) or&#xD;&#xA; el.oclIsKindOf(uml::Operation) or&#xD;&#xA; el.oclIsKindOf(uml::Behavior) or&#xD;&#xA;el.oclIsKindOf(uml::State) or&#xD;&#xA;el.oclIsKindOf(uml::Transition))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKpSqOJEeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpS6OJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKpTKOJEeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_fCKpTqOJEeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpT6OJEeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCKpUKOJEeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_fCKpUaOJEeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKpUqOJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_fCKpU6OJEeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_fCKpVKOJEeOMJMavfflX6A" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_fCKpVqOJEeOMJMavfflX6A" name="MessageSet">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpV6OJEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g6khEGDFEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_fCKpWKOJEeOMJMavfflX6A" name="base_Interface" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_fCKpWqOJEeOMJMavfflX6A" name="isIncoming" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_fCKpXKOJEeOMJMavfflX6A" name="TriggerEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpXaOJEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_fCKpXqOJEeOMJMavfflX6A" name="evType" ordered="false" lowerBound="1" eType="_fCKpYqOJEeOMJMavfflX6A"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_fCKpYKOJEeOMJMavfflX6A" name="base_SignalEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//SignalEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_fCKpYqOJEeOMJMavfflX6A" name="EventType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpY6OJEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXMMIGDdEeOesvHnEWH_sQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_fCKpZKOJEeOMJMavfflX6A" name="inEvent"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_fCKpZaOJEeOMJMavfflX6A" name="outEvent" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_fCKpZqOJEeOMJMavfflX6A" name="inOutEvent" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_fCKpZ6OJEeOMJMavfflX6A" name="RTSignal">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpaKOJEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_fCKpaaOJEeOMJMavfflX6A" name="base_Signal" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Signal"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_fCKpa6OJEeOMJMavfflX6A" name="priority" ordered="false" lowerBound="1" eType="_fCKpbaOJEeOMJMavfflX6A" defaultValueLiteral="General"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_fCKpbaOJEeOMJMavfflX6A" name="UMLRealTimeCoreLibrary_RTPriority">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCKpbqOJEeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML">

-            <references xmi:type="uml:Enumeration" href="UMLRealTimeCoreLibrary.uml#_rp0h4KOIEeOMJMavfflX6A"/>

-          </eAnnotations>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_fCKpb6OJEeOMJMavfflX6A" name="System"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_fCKpcKOJEeOMJMavfflX6A" name="Synchronous" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_fCKpcaOJEeOMJMavfflX6A" name="Panic" value="2"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_fCKpcqOJEeOMJMavfflX6A" name="High" value="3"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_fCKpc6OJEeOMJMavfflX6A" name="General" value="4"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_fCKpdKOJEeOMJMavfflX6A" name="Low" value="5"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_fCKpdaOJEeOMJMavfflX6A" name="Background" value="6"/>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_wbtIEKN-EeOMJMavfflX6A" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_wbshAKN-EeOMJMavfflX6A/18" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wbvkUqN-EeOMJMavfflX6A" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wbvkU6N-EeOMJMavfflX6A" key="Version" value="0.1.7"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wbvkVKN-EeOMJMavfflX6A" key="Comment" value="Graphical layout improvements"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wbvkVaN-EeOMJMavfflX6A" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wbvkVqN-EeOMJMavfflX6A" key="Date" value="2014-03-04"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wbvkV6N-EeOMJMavfflX6A" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_wbtIEaN-EeOMJMavfflX6A" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wbtIEqN-EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wbtIE6N-EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wbtIFKN-EeOMJMavfflX6A" key="documentation" value="base_Class.isActive&#xD;&#xA;base_Class.ownedReception->isEmpty()&#xD;&#xA;not(base_Class.isFinalSpecialization)&#xD;&#xA;(base_Class.generalization->size()) &lt;= 1&#xD;&#xA;(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))&#xD;&#xA;base_Class.ownedAttribute->forAll(at | at.type->size() = 1)&#xD;&#xA;base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)&#xD;&#xA;(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))&#xD;&#xA;base_Class.nestedClassifier->isEmpty()&#xD;&#xA;base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-          </eAnnotations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_wbtIFaN-EeOMJMavfflX6A" 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="_wbtIF6N-EeOMJMavfflX6A" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wbtIGKN-EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_wbtIGaN-EeOMJMavfflX6A" 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="_wbtIG6N-EeOMJMavfflX6A" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wbtIHKN-EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wbtIHaN-EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wbtIHqN-EeOMJMavfflX6A" key="documentation" value="base_Class.generalization->size() &lt;= 1"/>

-          </eAnnotations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_wbtIH6N-EeOMJMavfflX6A" 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="_wbtIIaN-EeOMJMavfflX6A" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wbtIIqN-EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wbtII6N-EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wbtIJKN-EeOMJMavfflX6A" key="documentation" value="isWired implies not isPublish&#xD;&#xA;(base_Port.visibility = uml::VisibilityKind::public) &#xD;&#xA;    implies base_Port.isService  &#xD;&#xA;(not isWired and not isPublish) &#xD;&#xA;   implies (base_Port.visibility = uml::VisibilityKind::protected)&#xD;&#xA;(not isWired and isPublish) implies &#xD;&#xA;   (base_Port.visibility = uml::VisibilityKind::public)"/>

-          </eAnnotations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_wbtIJaN-EeOMJMavfflX6A" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_wbtIJ6N-EeOMJMavfflX6A" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_wbtIKaN-EeOMJMavfflX6A" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_wbtIK6N-EeOMJMavfflX6A" name="registration" ordered="false" eType="_wbtIMaN-EeOMJMavfflX6A"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_wbtILaN-EeOMJMavfflX6A" name="registrationOverride" 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="_wbtIL6N-EeOMJMavfflX6A" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_wbtIMaN-EeOMJMavfflX6A" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wbtIMqN-EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_wbtIM6N-EeOMJMavfflX6A" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_wbtINKN-EeOMJMavfflX6A" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_wbtINaN-EeOMJMavfflX6A" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_wbtINqN-EeOMJMavfflX6A" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wbtIN6N-EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wbtIOKN-EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wbtIOaN-EeOMJMavfflX6A" key="documentation" value="base_Connector.end->size() = 2"/>

-          </eAnnotations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_wbtIOqN-EeOMJMavfflX6A" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_wbtIPKN-EeOMJMavfflX6A" name="ProtocolPackage">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wbtIPaN-EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_wbtIPqN-EeOMJMavfflX6A" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_wbtIQKN-EeOMJMavfflX6A" name="RTRExcludedElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wbtIQaN-EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wbtIQqN-EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wbtIQ6N-EeOMJMavfflX6A" key="documentation" value="let el = base_RedefinableElement in&#xD;&#xA;(el.oclIsKindOf(uml::Port) or&#xD;&#xA; el.oclIsKindOf(uml::Property) or&#xD;&#xA; el.oclIsKindOf(uml::Operation) or&#xD;&#xA; el.oclIsKindOf(uml::Behavior) or&#xD;&#xA;el.oclIsKindOf(uml::State) or&#xD;&#xA;el.oclIsKindOf(uml::Transition))"/>

-          </eAnnotations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_wbtIRKN-EeOMJMavfflX6A" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_wbtIRqN-EeOMJMavfflX6A" name="MessageSet">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wbtIR6N-EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g6khEGDFEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_wbtISKN-EeOMJMavfflX6A" name="base_Interface" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_wbtISqN-EeOMJMavfflX6A" name="isIncoming" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_wbtITKN-EeOMJMavfflX6A" name="TriggerEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wbtITaN-EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_wbtITqN-EeOMJMavfflX6A" name="evType" ordered="false" lowerBound="1" eType="_wbtIUqN-EeOMJMavfflX6A"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_wbtIUKN-EeOMJMavfflX6A" name="base_SignalEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//SignalEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_wbtIUqN-EeOMJMavfflX6A" name="EventType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wbtIU6N-EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXMMIGDdEeOesvHnEWH_sQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_wbtIVKN-EeOMJMavfflX6A" name="inEvent"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_wbtIVaN-EeOMJMavfflX6A" name="outEvent" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_wbtIVqN-EeOMJMavfflX6A" name="inOutEvent" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_wbtIV6N-EeOMJMavfflX6A" name="RTSignal">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wbtIWKN-EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_wbtIWaN-EeOMJMavfflX6A" name="base_Signal" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Signal"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_wbtIW6N-EeOMJMavfflX6A" name="priority" ordered="false" lowerBound="1" eType="_wbtIXaN-EeOMJMavfflX6A" defaultValueLiteral="General"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_wbtIXaN-EeOMJMavfflX6A" name="RTPriority">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wbtIXqN-EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_wbtIX6N-EeOMJMavfflX6A" name="System"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_wbtIYKN-EeOMJMavfflX6A" name="Synchronous" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_wbtIYaN-EeOMJMavfflX6A" name="Panic" value="2"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_wbtIYqN-EeOMJMavfflX6A" name="High" value="3"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_wbtIY6N-EeOMJMavfflX6A" name="General" value="4"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_wbtIZKN-EeOMJMavfflX6A" name="Low" value="5"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_wbtIZaN-EeOMJMavfflX6A" name="Background" value="6"/>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_-Ji1QKN3EeOMJMavfflX6A" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_-JhnIKN3EeOMJMavfflX6A/17" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1QaN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1QqN3EeOMJMavfflX6A" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Jpi8qN3EeOMJMavfflX6A" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Jpi86N3EeOMJMavfflX6A" key="Version" value="0.1.6"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Jpi9KN3EeOMJMavfflX6A" key="Comment" value="Added RTPriority enumeration and RTSignal stereotype"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Jpi9aN3EeOMJMavfflX6A" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Jpi9qN3EeOMJMavfflX6A" key="Date" value="2014-03-04"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Jpi96N3EeOMJMavfflX6A" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_-Ji1Q6N3EeOMJMavfflX6A" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1RKN3EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_-Ji1RaN3EeOMJMavfflX6A" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1RqN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1R6N3EeOMJMavfflX6A" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1SaN3EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1SqN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1S6N3EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1TaN3EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1TqN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1T6N3EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_-Ji1UKN3EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji1UaN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji1UqN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_-Ji1U6N3EeOMJMavfflX6A" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1VKN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1VaN3EeOMJMavfflX6A" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1V6N3EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1WKN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1WaN3EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1W6N3EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1XKN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1XaN3EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_-Ji1XqN3EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji1X6N3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji1YKN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_-Ji1YaN3EeOMJMavfflX6A" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1YqN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1Y6N3EeOMJMavfflX6A" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1ZaN3EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1ZqN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1Z6N3EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1aaN3EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1aqN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1a6N3EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_-Ji1bKN3EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji1baN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji1bqN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_-Ji1b6N3EeOMJMavfflX6A" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1cKN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1caN3EeOMJMavfflX6A" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1c6N3EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1dKN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1daN3EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1d6N3EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1eKN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1eaN3EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_-Ji1eqN3EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji1e6N3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji1fKN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_-Ji1faN3EeOMJMavfflX6A" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1fqN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1f6N3EeOMJMavfflX6A" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1gaN3EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1gqN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1g6N3EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1haN3EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1hqN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1h6N3EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_-Ji1iKN3EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji1iaN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji1iqN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_-Ji1i6N3EeOMJMavfflX6A" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1jKN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1jaN3EeOMJMavfflX6A" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1j6N3EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1kKN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1kaN3EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1k6N3EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1lKN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1laN3EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_-Ji1lqN3EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji1l6N3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji1mKN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_-Ji1maN3EeOMJMavfflX6A" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1mqN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1m6N3EeOMJMavfflX6A" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1naN3EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1nqN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1n6N3EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1oaN3EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1oqN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1o6N3EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_-Ji1pKN3EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji1paN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji1pqN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_-Ji1p6N3EeOMJMavfflX6A" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1qKN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1qaN3EeOMJMavfflX6A" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1q6N3EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1rKN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1raN3EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1r6N3EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1sKN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1saN3EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_-Ji1sqN3EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji1s6N3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji1tKN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_-Ji1taN3EeOMJMavfflX6A" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1tqN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1t6N3EeOMJMavfflX6A" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1uaN3EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1uqN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1u6N3EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1vaN3EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1vqN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1v6N3EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_-Ji1wKN3EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji1waN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji1wqN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_-Ji1w6N3EeOMJMavfflX6A" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1xKN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1xaN3EeOMJMavfflX6A" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1x6N3EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1yKN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1yaN3EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji1y6N3EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji1zKN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji1zaN3EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_-Ji1zqN3EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji1z6N3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji10KN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_-Ji10aN3EeOMJMavfflX6A" 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="_-Ji106N3EeOMJMavfflX6A" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji11KN3EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_-Ji11aN3EeOMJMavfflX6A" 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="_-Ji116N3EeOMJMavfflX6A" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji12KN3EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_-Ji12aN3EeOMJMavfflX6A" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji12qN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji126N3EeOMJMavfflX6A" key="body" value="base_Class.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji13aN3EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji13qN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji136N3EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Ji14aN3EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Ji14qN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Ji146N3EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_-Ji15KN3EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji15aN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Ji15qN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_-JjcUKN3EeOMJMavfflX6A" 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="_-JjcUqN3EeOMJMavfflX6A" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjcU6N3EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_-JjcVKN3EeOMJMavfflX6A" name="Awiredportcannotpublishitsname">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjcVaN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-JjcVqN3EeOMJMavfflX6A" key="body" value="isWired implies not isPublish"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-JjcWKN3EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjcWaN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-JjcWqN3EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-JjcXKN3EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjcXaN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-JjcXqN3EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_-JjcX6N3EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-JjcYKN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-JjcYaN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_-JjcYqN3EeOMJMavfflX6A" name="Apublicportmustbedefinedasaserviceport">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjcY6N3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-JjcZKN3EeOMJMavfflX6A" key="body" value="(base_Port.visibility = uml::VisibilityKind::public) &#xD;&#xA;    implies base_Port.isService  "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-JjcZqN3EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjcZ6N3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-JjcaKN3EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-JjcaqN3EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Jjca6N3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-JjcbKN3EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_-JjcbaN3EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-JjcbqN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Jjcb6N3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_-JjccKN3EeOMJMavfflX6A" name="ASAPunwiredunpublishedmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjccaN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-JjccqN3EeOMJMavfflX6A" key="body" value="(not isWired and not isPublish) &#xD;&#xA;   implies (base_Port.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-JjcdKN3EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjcdaN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-JjcdqN3EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-JjceKN3EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjceaN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-JjceqN3EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_-Jjce6N3EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-JjcfKN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-JjcfaN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_-JjcfqN3EeOMJMavfflX6A" name="AnSPPunwiredandpublishedmusthavepublicvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Jjcf6N3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-JjcgKN3EeOMJMavfflX6A" key="body" value="(not isWired and isPublish) implies &#xD;&#xA;   (base_Port.visibility = uml::VisibilityKind::public)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-JjcgqN3EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Jjcg6N3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-JjchKN3EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-JjchqN3EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Jjch6N3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-JjciKN3EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_-JjciaN3EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-JjciqN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Jjci6N3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_-JjcjKN3EeOMJMavfflX6A" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_-JjcjqN3EeOMJMavfflX6A" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_-JjckKN3EeOMJMavfflX6A" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_-JjckqN3EeOMJMavfflX6A" name="registration" ordered="false" eType="_-JjcmKN3EeOMJMavfflX6A"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_-JjclKN3EeOMJMavfflX6A" name="registrationOverride" 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="_-JjclqN3EeOMJMavfflX6A" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_-JjcmKN3EeOMJMavfflX6A" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjcmaN3EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_-JjcmqN3EeOMJMavfflX6A" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_-Jjcm6N3EeOMJMavfflX6A" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_-JjcnKN3EeOMJMavfflX6A" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_-JjcnaN3EeOMJMavfflX6A" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjcnqN3EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_-Jjcn6N3EeOMJMavfflX6A" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjcoKN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-JjcoaN3EeOMJMavfflX6A" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Jjco6N3EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjcpKN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-JjcpaN3EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-Jjcp6N3EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjcqKN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-JjcqaN3EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_-JjcqqN3EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-Jjcq6N3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-JjcrKN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_-JjcraN3EeOMJMavfflX6A" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_-Jjcr6N3EeOMJMavfflX6A" name="ProtocolPackage">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjcsKN3EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_-JjcsaN3EeOMJMavfflX6A" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_-Jjcs6N3EeOMJMavfflX6A" name="RTRExcludedElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjctKN3EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_-JjctaN3EeOMJMavfflX6A" name="ExclusioncanonlybeappliedtosomeUMLRTmodelelements">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjctqN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Jjct6N3EeOMJMavfflX6A" key="body" value="let el = base_RedefinableElement in&#xD;&#xA;(el.oclIsKindOf(uml::Port) or&#xD;&#xA; el.oclIsKindOf(uml::Property) or&#xD;&#xA; el.oclIsKindOf(uml::Operation) or&#xD;&#xA; el.oclIsKindOf(uml::Behavior) or&#xD;&#xA;el.oclIsKindOf(uml::State) or&#xD;&#xA;el.oclIsKindOf(uml::Transition))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-JjcuaN3EeOMJMavfflX6A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjcuqN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Jjcu6N3EeOMJMavfflX6A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_-JjcvaN3EeOMJMavfflX6A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjcvqN3EeOMJMavfflX6A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-Jjcv6N3EeOMJMavfflX6A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_-JjcwKN3EeOMJMavfflX6A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-JjcwaN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_-JjcwqN3EeOMJMavfflX6A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_-Jjcw6N3EeOMJMavfflX6A" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_-JjcxaN3EeOMJMavfflX6A" name="MessageSet">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjcxqN3EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g6khEGDFEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_-Jjcx6N3EeOMJMavfflX6A" name="base_Interface" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_-JjcyaN3EeOMJMavfflX6A" name="isIncoming" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_-Jjcy6N3EeOMJMavfflX6A" name="TriggerEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-JjczKN3EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_-JjczaN3EeOMJMavfflX6A" name="evType" ordered="false" lowerBound="1" eType="_-Jjc0aN3EeOMJMavfflX6A"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_-Jjcz6N3EeOMJMavfflX6A" name="base_SignalEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//SignalEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_-Jjc0aN3EeOMJMavfflX6A" name="EventType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Jjc0qN3EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXMMIGDdEeOesvHnEWH_sQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_-Jjc06N3EeOMJMavfflX6A" name="inEvent"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_-Jjc1KN3EeOMJMavfflX6A" name="outEvent" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_-Jjc1aN3EeOMJMavfflX6A" name="inOutEvent" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_-Jjc1qN3EeOMJMavfflX6A" name="RTSignal">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Jjc16N3EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_-Jjc2KN3EeOMJMavfflX6A" name="base_Signal" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Signal"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_-Jjc2qN3EeOMJMavfflX6A" name="priority" ordered="false" lowerBound="1" eType="_-Jjc3KN3EeOMJMavfflX6A" defaultValueLiteral="General"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_-Jjc3KN3EeOMJMavfflX6A" name="RTPriority">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-Jjc3aN3EeOMJMavfflX6A" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_-Jjc3qN3EeOMJMavfflX6A" name="System"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_-Jjc36N3EeOMJMavfflX6A" name="Synchronous" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_-Jjc4KN3EeOMJMavfflX6A" name="Panic" value="2"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_-Jjc4aN3EeOMJMavfflX6A" name="High" value="3"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_-Jjc4qN3EeOMJMavfflX6A" name="General" value="4"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_-Jjc46N3EeOMJMavfflX6A" name="Low" value="5"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_-Jjc5KN3EeOMJMavfflX6A" name="Background" value="6"/>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_GWeHkKBQEeORvLnuUJYVNA" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_GWYA8KBQEeORvLnuUJYVNA/16" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqcKBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqcaBQEeORvLnuUJYVNA" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GW0F0KBQEeORvLnuUJYVNA" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GW0F0aBQEeORvLnuUJYVNA" key="Version" value="0.1.5"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GW0F0qBQEeORvLnuUJYVNA" key="Comment" value="Removed constraint that forces capsule variables to have protected visibility since it was allowed by previous toolsets and is, therefore, needed for backward compatibility."/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GW0F06BQEeORvLnuUJYVNA" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GW0F1KBQEeORvLnuUJYVNA" key="Date" value="2014-02-28"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GW0F1aBQEeORvLnuUJYVNA" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_GWmqcqBQEeORvLnuUJYVNA" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqc6BQEeORvLnuUJYVNA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GWmqdKBQEeORvLnuUJYVNA" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqdaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqdqBQEeORvLnuUJYVNA" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmqeKBQEeORvLnuUJYVNA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqeaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqeqBQEeORvLnuUJYVNA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmqfKBQEeORvLnuUJYVNA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqfaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqfqBQEeORvLnuUJYVNA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GWmqf6BQEeORvLnuUJYVNA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmqgKBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmqgaBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GWmqgqBQEeORvLnuUJYVNA" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqg6BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqhKBQEeORvLnuUJYVNA" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmqhqBQEeORvLnuUJYVNA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqh6BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqiKBQEeORvLnuUJYVNA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmqiqBQEeORvLnuUJYVNA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqi6BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqjKBQEeORvLnuUJYVNA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GWmqjaBQEeORvLnuUJYVNA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmqjqBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmqj6BQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GWmqkKBQEeORvLnuUJYVNA" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqkaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqkqBQEeORvLnuUJYVNA" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmqlKBQEeORvLnuUJYVNA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqlaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqlqBQEeORvLnuUJYVNA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmqmKBQEeORvLnuUJYVNA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqmaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqmqBQEeORvLnuUJYVNA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GWmqm6BQEeORvLnuUJYVNA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmqnKBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmqnaBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GWmqnqBQEeORvLnuUJYVNA" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqn6BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqoKBQEeORvLnuUJYVNA" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmqoqBQEeORvLnuUJYVNA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqo6BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqpKBQEeORvLnuUJYVNA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmqpqBQEeORvLnuUJYVNA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqp6BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqqKBQEeORvLnuUJYVNA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GWmqqaBQEeORvLnuUJYVNA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmqqqBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmqq6BQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GWmqrKBQEeORvLnuUJYVNA" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqraBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqrqBQEeORvLnuUJYVNA" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmqsKBQEeORvLnuUJYVNA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqsaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqsqBQEeORvLnuUJYVNA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmqtKBQEeORvLnuUJYVNA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqtaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqtqBQEeORvLnuUJYVNA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GWmqt6BQEeORvLnuUJYVNA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmquKBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmquaBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GWmquqBQEeORvLnuUJYVNA" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqu6BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqvKBQEeORvLnuUJYVNA" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmqvqBQEeORvLnuUJYVNA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqv6BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqwKBQEeORvLnuUJYVNA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmqwqBQEeORvLnuUJYVNA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqw6BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqxKBQEeORvLnuUJYVNA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GWmqxaBQEeORvLnuUJYVNA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmqxqBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmqx6BQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GWmqyKBQEeORvLnuUJYVNA" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqyaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqyqBQEeORvLnuUJYVNA" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmqzKBQEeORvLnuUJYVNA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmqzaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmqzqBQEeORvLnuUJYVNA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmq0KBQEeORvLnuUJYVNA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmq0aBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmq0qBQEeORvLnuUJYVNA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GWmq06BQEeORvLnuUJYVNA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmq1KBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmq1aBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GWmq1qBQEeORvLnuUJYVNA" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmq16BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmq2KBQEeORvLnuUJYVNA" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmq2qBQEeORvLnuUJYVNA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmq26BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmq3KBQEeORvLnuUJYVNA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmq3qBQEeORvLnuUJYVNA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmq36BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmq4KBQEeORvLnuUJYVNA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GWmq4aBQEeORvLnuUJYVNA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmq4qBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmq46BQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GWmq5KBQEeORvLnuUJYVNA" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmq5aBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmq5qBQEeORvLnuUJYVNA" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmq6KBQEeORvLnuUJYVNA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmq6aBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmq6qBQEeORvLnuUJYVNA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmq7KBQEeORvLnuUJYVNA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmq7aBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmq7qBQEeORvLnuUJYVNA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GWmq76BQEeORvLnuUJYVNA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmq8KBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmq8aBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GWmq8qBQEeORvLnuUJYVNA" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmq86BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmq9KBQEeORvLnuUJYVNA" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmq9qBQEeORvLnuUJYVNA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmq96BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmq-KBQEeORvLnuUJYVNA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmq-qBQEeORvLnuUJYVNA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmq-6BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmq_KBQEeORvLnuUJYVNA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GWmq_aBQEeORvLnuUJYVNA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmq_qBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmq_6BQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_GWmrAKBQEeORvLnuUJYVNA" 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="_GWmrAqBQEeORvLnuUJYVNA" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmrA6BQEeORvLnuUJYVNA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_GWmrBKBQEeORvLnuUJYVNA" 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="_GWmrBqBQEeORvLnuUJYVNA" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmrB6BQEeORvLnuUJYVNA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GWmrCKBQEeORvLnuUJYVNA" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmrCaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmrCqBQEeORvLnuUJYVNA" key="body" value="base_Class.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmrDKBQEeORvLnuUJYVNA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmrDaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmrDqBQEeORvLnuUJYVNA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmrEKBQEeORvLnuUJYVNA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmrEaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmrEqBQEeORvLnuUJYVNA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GWmrE6BQEeORvLnuUJYVNA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmrFKBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmrFaBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_GWmrFqBQEeORvLnuUJYVNA" 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="_GWmrGKBQEeORvLnuUJYVNA" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmrGaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GWmrGqBQEeORvLnuUJYVNA" name="Awiredportcannotpublishitsname">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmrG6BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmrHKBQEeORvLnuUJYVNA" key="body" value="isWired implies not isPublish"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmrHqBQEeORvLnuUJYVNA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmrH6BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmrIKBQEeORvLnuUJYVNA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmrIqBQEeORvLnuUJYVNA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmrI6BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmrJKBQEeORvLnuUJYVNA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GWmrJaBQEeORvLnuUJYVNA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmrJqBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmrJ6BQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GWmrKKBQEeORvLnuUJYVNA" name="Apublicportmustbedefinedasaserviceport">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmrKaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmrKqBQEeORvLnuUJYVNA" key="body" value="(base_Port.visibility = uml::VisibilityKind::public) &#xD;&#xA;    implies base_Port.isService  "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmrLKBQEeORvLnuUJYVNA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmrLaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmrLqBQEeORvLnuUJYVNA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmrMKBQEeORvLnuUJYVNA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmrMaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmrMqBQEeORvLnuUJYVNA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GWmrM6BQEeORvLnuUJYVNA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmrNKBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmrNaBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GWmrNqBQEeORvLnuUJYVNA" name="ASAPunwiredunpublishedmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmrN6BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmrOKBQEeORvLnuUJYVNA" key="body" value="(not isWired and not isPublish) &#xD;&#xA;   implies (base_Port.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmrOqBQEeORvLnuUJYVNA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmrO6BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmrPKBQEeORvLnuUJYVNA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmrPqBQEeORvLnuUJYVNA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmrP6BQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmrQKBQEeORvLnuUJYVNA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GWmrQaBQEeORvLnuUJYVNA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmrQqBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmrQ6BQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GWmrRKBQEeORvLnuUJYVNA" name="AnSPPunwiredandpublishedmusthavepublicvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmrRaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmrRqBQEeORvLnuUJYVNA" key="body" value="(not isWired and isPublish) implies &#xD;&#xA;   (base_Port.visibility = uml::VisibilityKind::public)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmrSKBQEeORvLnuUJYVNA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmrSaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmrSqBQEeORvLnuUJYVNA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWmrTKBQEeORvLnuUJYVNA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWmrTaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWmrTqBQEeORvLnuUJYVNA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GWmrT6BQEeORvLnuUJYVNA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmrUKBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWmrUaBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_GWmrUqBQEeORvLnuUJYVNA" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_GWmrVKBQEeORvLnuUJYVNA" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_GWmrVqBQEeORvLnuUJYVNA" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_GWmrWKBQEeORvLnuUJYVNA" name="registration" ordered="false" eType="_GWnRgKBQEeORvLnuUJYVNA"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_GWmrWqBQEeORvLnuUJYVNA" name="registrationOverride" 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="_GWmrXKBQEeORvLnuUJYVNA" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_GWnRgKBQEeORvLnuUJYVNA" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWnRgaBQEeORvLnuUJYVNA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_GWnRgqBQEeORvLnuUJYVNA" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_GWnRg6BQEeORvLnuUJYVNA" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_GWnRhKBQEeORvLnuUJYVNA" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_GWnRhaBQEeORvLnuUJYVNA" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWnRhqBQEeORvLnuUJYVNA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GWnRh6BQEeORvLnuUJYVNA" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWnRiKBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWnRiaBQEeORvLnuUJYVNA" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWnRi6BQEeORvLnuUJYVNA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWnRjKBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWnRjaBQEeORvLnuUJYVNA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWnRj6BQEeORvLnuUJYVNA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWnRkKBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWnRkaBQEeORvLnuUJYVNA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GWnRkqBQEeORvLnuUJYVNA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWnRk6BQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWnRlKBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_GWnRlaBQEeORvLnuUJYVNA" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_GWnRl6BQEeORvLnuUJYVNA" name="ProtocolPackage">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWnRmKBQEeORvLnuUJYVNA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_GWnRmaBQEeORvLnuUJYVNA" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_GWnRm6BQEeORvLnuUJYVNA" name="RTRExcludedElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWnRnKBQEeORvLnuUJYVNA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_GWnRnaBQEeORvLnuUJYVNA" name="ExclusioncanonlybeappliedtosomeUMLRTmodelelements">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWnRnqBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWnRn6BQEeORvLnuUJYVNA" key="body" value="let el = base_RedefinableElement in&#xD;&#xA;(el.oclIsKindOf(uml::Port) or&#xD;&#xA; el.oclIsKindOf(uml::Property) or&#xD;&#xA; el.oclIsKindOf(uml::Operation) or&#xD;&#xA; el.oclIsKindOf(uml::Behavior) or&#xD;&#xA;el.oclIsKindOf(uml::State) or&#xD;&#xA;el.oclIsKindOf(uml::Transition))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWnRoaBQEeORvLnuUJYVNA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWnRoqBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWnRo6BQEeORvLnuUJYVNA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_GWnRpaBQEeORvLnuUJYVNA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWnRpqBQEeORvLnuUJYVNA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GWnRp6BQEeORvLnuUJYVNA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_GWnRqKBQEeORvLnuUJYVNA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWnRqaBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_GWnRqqBQEeORvLnuUJYVNA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_GWnRq6BQEeORvLnuUJYVNA" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_GWnRraBQEeORvLnuUJYVNA" name="MessageSet">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWnRrqBQEeORvLnuUJYVNA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g6khEGDFEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_GWnRr6BQEeORvLnuUJYVNA" name="base_Interface" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_GWnRsaBQEeORvLnuUJYVNA" name="isIncoming" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_GWnRs6BQEeORvLnuUJYVNA" name="TriggerEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWnRtKBQEeORvLnuUJYVNA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_GWnRtaBQEeORvLnuUJYVNA" name="evType" ordered="false" lowerBound="1" eType="_GWnRuaBQEeORvLnuUJYVNA"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_GWnRt6BQEeORvLnuUJYVNA" name="base_SignalEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//SignalEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_GWnRuaBQEeORvLnuUJYVNA" name="EventType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GWnRuqBQEeORvLnuUJYVNA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXMMIGDdEeOesvHnEWH_sQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_GWnRu6BQEeORvLnuUJYVNA" name="inEvent"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_GWnRvKBQEeORvLnuUJYVNA" name="outEvent" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_GWnRvaBQEeORvLnuUJYVNA" name="inOutEvent" value="2"/>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_17JsoGfQEeO447LqwGjc0A" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_17JFkGfQEeO447LqwGjc0A/15" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JsoWfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JsomfQEeO447LqwGjc0A" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17PMMWfQEeO447LqwGjc0A" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17PMMmfQEeO447LqwGjc0A" key="Version" value="0.1.4"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17PMM2fQEeO447LqwGjc0A" key="Comment" value="Moved RTTrigger to state machine subprofile"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17PMNGfQEeO447LqwGjc0A" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17PMNWfQEeO447LqwGjc0A" key="Date" value="2013-12-18"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17PMNmfQEeO447LqwGjc0A" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_17Jso2fQEeO447LqwGjc0A" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JspGfQEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_17JspWfQEeO447LqwGjc0A" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JspmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Jsp2fQEeO447LqwGjc0A" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JsqWfQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JsqmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Jsq2fQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JsrWfQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JsrmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Jsr2fQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_17JssGfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JssWfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JssmfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_17Jss2fQEeO447LqwGjc0A" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JstGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JstWfQEeO447LqwGjc0A" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17Jst2fQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JsuGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JsuWfQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17Jsu2fQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JsvGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JsvWfQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_17JsvmfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17Jsv2fQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JswGfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_17JswWfQEeO447LqwGjc0A" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JswmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Jsw2fQEeO447LqwGjc0A" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JsxWfQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JsxmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Jsx2fQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JsyWfQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JsymfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Jsy2fQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_17JszGfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JszWfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JszmfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_17Jsz2fQEeO447LqwGjc0A" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17Js0GfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Js0WfQEeO447LqwGjc0A" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17Js02fQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17Js1GfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Js1WfQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17Js12fQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17Js2GfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Js2WfQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_17Js2mfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17Js22fQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17Js3GfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_17Js3WfQEeO447LqwGjc0A" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17Js3mfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Js32fQEeO447LqwGjc0A" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17Js4WfQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17Js4mfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Js42fQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17Js5WfQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17Js5mfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Js52fQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_17Js6GfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17Js6WfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17Js6mfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_17Js62fQEeO447LqwGjc0A" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17Js7GfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Js7WfQEeO447LqwGjc0A" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17Js72fQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17Js8GfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Js8WfQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17Js82fQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17Js9GfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Js9WfQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_17Js9mfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17Js92fQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17Js-GfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_17Js-WfQEeO447LqwGjc0A" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17Js-mfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Js-2fQEeO447LqwGjc0A" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17Js_WfQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17Js_mfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Js_2fQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JtAWfQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtAmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtA2fQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_17JtBGfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtBWfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtBmfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_17JtB2fQEeO447LqwGjc0A" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtCGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtCWfQEeO447LqwGjc0A" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JtC2fQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtDGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtDWfQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JtD2fQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtEGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtEWfQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_17JtEmfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtE2fQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtFGfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_17JtFWfQEeO447LqwGjc0A" name="Capsulevariablescanonlyhaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtFmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtF2fQEeO447LqwGjc0A" key="body" value="base_Class.ownedAttribute->forAll(at | not(at.oclIsKindOf(uml::Port)) implies (at.visibility = uml::VisibilityKind::protected))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JtGWfQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtGmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtG2fQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JtHWfQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtHmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtH2fQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_17JtIGfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtIWfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtImfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_17JtI2fQEeO447LqwGjc0A" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtJGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtJWfQEeO447LqwGjc0A" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JtJ2fQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtKGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtKWfQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JtK2fQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtLGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtLWfQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_17JtLmfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtL2fQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtMGfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_17JtMWfQEeO447LqwGjc0A" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtMmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtM2fQEeO447LqwGjc0A" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JtNWfQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtNmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtN2fQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JtOWfQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtOmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtO2fQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_17JtPGfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtPWfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtPmfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_17JtP2fQEeO447LqwGjc0A" 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="_17JtQWfQEeO447LqwGjc0A" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtQmfQEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_17JtQ2fQEeO447LqwGjc0A" 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="_17JtRWfQEeO447LqwGjc0A" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtRmfQEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_17JtR2fQEeO447LqwGjc0A" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtSGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtSWfQEeO447LqwGjc0A" key="body" value="base_Class.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JtS2fQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtTGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtTWfQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JtT2fQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtUGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtUWfQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_17JtUmfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtU2fQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtVGfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_17JtVWfQEeO447LqwGjc0A" 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="_17JtV2fQEeO447LqwGjc0A" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtWGfQEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_17JtWWfQEeO447LqwGjc0A" name="Awiredportcannotpublishitsname">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtWmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtW2fQEeO447LqwGjc0A" key="body" value="isWired implies not isPublish"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JtXWfQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtXmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtX2fQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JtYWfQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtYmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtY2fQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_17JtZGfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtZWfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtZmfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_17JtZ2fQEeO447LqwGjc0A" name="Apublicportmustbedefinedasaserviceport">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtaGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtaWfQEeO447LqwGjc0A" key="body" value="(base_Port.visibility = uml::VisibilityKind::public) &#xD;&#xA;    implies base_Port.isService  "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17Jta2fQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtbGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtbWfQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17Jtb2fQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtcGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtcWfQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_17JtcmfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17Jtc2fQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtdGfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_17JtdWfQEeO447LqwGjc0A" name="ASAPunwiredunpublishedmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtdmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Jtd2fQEeO447LqwGjc0A" key="body" value="(not isWired and not isPublish) &#xD;&#xA;   implies (base_Port.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JteWfQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtemfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Jte2fQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JtfWfQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtfmfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17Jtf2fQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_17JtgGfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtgWfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtgmfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_17Jtg2fQEeO447LqwGjc0A" name="AnSPPunwiredandpublishedmusthavepublicvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JthGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JthWfQEeO447LqwGjc0A" key="body" value="(not isWired and isPublish) implies &#xD;&#xA;   (base_Port.visibility = uml::VisibilityKind::public)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17Jth2fQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtiGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtiWfQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17Jti2fQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtjGfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtjWfQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_17JtjmfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17Jtj2fQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtkGfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_17JtkWfQEeO447LqwGjc0A" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_17Jtk2fQEeO447LqwGjc0A" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_17JtlWfQEeO447LqwGjc0A" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_17Jtl2fQEeO447LqwGjc0A" name="registration" ordered="false" eType="_17JtnWfQEeO447LqwGjc0A"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_17JtmWfQEeO447LqwGjc0A" name="registrationOverride" 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="_17Jtm2fQEeO447LqwGjc0A" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_17JtnWfQEeO447LqwGjc0A" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtnmfQEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_17Jtn2fQEeO447LqwGjc0A" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_17JtoGfQEeO447LqwGjc0A" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_17JtoWfQEeO447LqwGjc0A" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_17JtomfQEeO447LqwGjc0A" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17Jto2fQEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_17JtpGfQEeO447LqwGjc0A" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtpWfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtpmfQEeO447LqwGjc0A" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JtqGfQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtqWfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtqmfQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JtrGfQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtrWfQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtrmfQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_17Jtr2fQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtsGfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtsWfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_17JtsmfQEeO447LqwGjc0A" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_17JttGfQEeO447LqwGjc0A" name="ProtocolPackage">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JttWfQEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_17JttmfQEeO447LqwGjc0A" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_17JtuGfQEeO447LqwGjc0A" name="RTRExcludedElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17JtuWfQEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_17JtumfQEeO447LqwGjc0A" name="ExclusioncanonlybeappliedtosomeUMLRTmodelelements">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17Jtu2fQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtvGfQEeO447LqwGjc0A" key="body" value="let el = base_RedefinableElement in&#xD;&#xA;(el.oclIsKindOf(uml::Port) or&#xD;&#xA; el.oclIsKindOf(uml::Property) or&#xD;&#xA; el.oclIsKindOf(uml::Operation) or&#xD;&#xA; el.oclIsKindOf(uml::Behavior) or&#xD;&#xA;el.oclIsKindOf(uml::State) or&#xD;&#xA;el.oclIsKindOf(uml::Transition))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JtvmfQEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17Jtv2fQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtwGfQEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_17JtwmfQEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17Jtw2fQEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17JtxGfQEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_17JtxWfQEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17JtxmfQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_17Jtx2fQEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_17JtyGfQEeO447LqwGjc0A" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_17JtymfQEeO447LqwGjc0A" name="MessageSet">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17Jty2fQEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g6khEGDFEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_17JtzGfQEeO447LqwGjc0A" name="base_Interface" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_17JtzmfQEeO447LqwGjc0A" name="isIncoming" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_17Jt0GfQEeO447LqwGjc0A" name="TriggerEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17Jt0WfQEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_17Jt0mfQEeO447LqwGjc0A" name="evType" ordered="false" lowerBound="1" eType="_17Jt1mfQEeO447LqwGjc0A"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_17Jt1GfQEeO447LqwGjc0A" name="base_SignalEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//SignalEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_17Jt1mfQEeO447LqwGjc0A" name="EventType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17Jt12fQEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXMMIGDdEeOesvHnEWH_sQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_17Jt2GfQEeO447LqwGjc0A" name="inEvent"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_17Jt2WfQEeO447LqwGjc0A" name="outEvent" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_17Jt2mfQEeO447LqwGjc0A" name="inOutEvent" value="2"/>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_ux8kYGfHEeO447LqwGjc0A" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_ux12sGfHEeO447LqwGjc0A/14" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8kYWfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8kYmfHEeO447LqwGjc0A" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uyFHQ2fHEeO447LqwGjc0A" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uyFHRGfHEeO447LqwGjc0A" key="Version" value="0.1.3"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uyFHRWfHEeO447LqwGjc0A" key="Comment" value="Added new constraints, removed some, changed some, and also changed RedefinedElement to ExcludedElement, "/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uyFHRmfHEeO447LqwGjc0A" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uyFHR2fHEeO447LqwGjc0A" key="Date" value="2013-12-18"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uyFHSGfHEeO447LqwGjc0A" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_ux8kY2fHEeO447LqwGjc0A" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8kZGfHEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ux8kZWfHEeO447LqwGjc0A" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8kZmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8kZ2fHEeO447LqwGjc0A" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux8kaWfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8kamfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8ka2fHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux8kbWfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8kbmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8kb2fHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ux8kcGfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux8kcWfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux8kcmfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ux8kc2fHEeO447LqwGjc0A" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8kdGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8kdWfHEeO447LqwGjc0A" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux8kd2fHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8keGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8keWfHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux8ke2fHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8kfGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8kfWfHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ux8kfmfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux8kf2fHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux8kgGfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ux8kgWfHEeO447LqwGjc0A" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8kgmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8kg2fHEeO447LqwGjc0A" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux8khWfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8khmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8kh2fHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux8kiWfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8kimfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8ki2fHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ux8kjGfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux8kjWfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux8kjmfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ux8kj2fHEeO447LqwGjc0A" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8kkGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8kkWfHEeO447LqwGjc0A" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux8kk2fHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8klGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8klWfHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux8kl2fHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8kmGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8kmWfHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ux8kmmfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux8km2fHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux8knGfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ux8knWfHEeO447LqwGjc0A" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8knmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8kn2fHEeO447LqwGjc0A" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux8koWfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8komfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8ko2fHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux8kpWfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8kpmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8kp2fHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ux8kqGfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux8kqWfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux8kqmfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ux8kq2fHEeO447LqwGjc0A" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8krGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8krWfHEeO447LqwGjc0A" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux8kr2fHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8ksGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8ksWfHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux8ks2fHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8ktGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8ktWfHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ux8ktmfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux8kt2fHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux8kuGfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ux8kuWfHEeO447LqwGjc0A" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8kumfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8ku2fHEeO447LqwGjc0A" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux8kvWfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8kvmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8kv2fHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux8kwWfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8kwmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8kw2fHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ux8kxGfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux8kxWfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux8kxmfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ux8kx2fHEeO447LqwGjc0A" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux8kyGfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux8kyWfHEeO447LqwGjc0A" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9LcGfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9LcWfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9LcmfHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9LdGfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9LdWfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9LdmfHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ux9Ld2fHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9LeGfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9LeWfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ux9LemfHEeO447LqwGjc0A" name="Capsulevariablescanonlyhaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9Le2fHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9LfGfHEeO447LqwGjc0A" key="body" value="base_Class.ownedAttribute->forAll(at | not(at.oclIsKindOf(uml::Port)) implies (at.visibility = uml::VisibilityKind::protected))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9LfmfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9Lf2fHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9LgGfHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9LgmfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9Lg2fHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9LhGfHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ux9LhWfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9LhmfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9Lh2fHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ux9LiGfHEeO447LqwGjc0A" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9LiWfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9LimfHEeO447LqwGjc0A" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9LjGfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9LjWfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9LjmfHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9LkGfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9LkWfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9LkmfHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ux9Lk2fHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9LlGfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9LlWfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ux9LlmfHEeO447LqwGjc0A" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9Ll2fHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9LmGfHEeO447LqwGjc0A" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9LmmfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9Lm2fHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9LnGfHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9LnmfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9Ln2fHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9LoGfHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ux9LoWfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9LomfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9Lo2fHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ux9LpGfHEeO447LqwGjc0A" 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="_ux9LpmfHEeO447LqwGjc0A" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9Lp2fHEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ux9LqGfHEeO447LqwGjc0A" 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="_ux9LqmfHEeO447LqwGjc0A" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9Lq2fHEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ux9LrGfHEeO447LqwGjc0A" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9LrWfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9LrmfHEeO447LqwGjc0A" key="body" value="base_Class.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9LsGfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9LsWfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9LsmfHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9LtGfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9LtWfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9LtmfHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ux9Lt2fHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9LuGfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9LuWfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ux9LumfHEeO447LqwGjc0A" 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="_ux9LvGfHEeO447LqwGjc0A" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9LvWfHEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ux9LvmfHEeO447LqwGjc0A" name="Awiredportcannotpublishitsname">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9Lv2fHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9LwGfHEeO447LqwGjc0A" key="body" value="isWired implies not isPublish"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9LwmfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9Lw2fHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9LxGfHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9LxmfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9Lx2fHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9LyGfHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ux9LyWfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9LymfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9Ly2fHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ux9LzGfHEeO447LqwGjc0A" name="Apublicportmustbedefinedasaserviceport">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9LzWfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9LzmfHEeO447LqwGjc0A" key="body" value="(base_Port.visibility = uml::VisibilityKind::public) &#xD;&#xA;    implies base_Port.isService  "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9L0GfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9L0WfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9L0mfHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9L1GfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9L1WfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9L1mfHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ux9L12fHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9L2GfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9L2WfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ux9L2mfHEeO447LqwGjc0A" name="ASAPunwiredunpublishedmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9L22fHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9L3GfHEeO447LqwGjc0A" key="body" value="(not isWired and not isPublish) &#xD;&#xA;   implies (base_Port.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9L3mfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9L32fHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9L4GfHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9L4mfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9L42fHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9L5GfHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ux9L5WfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9L5mfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9L52fHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ux9L6GfHEeO447LqwGjc0A" name="AnSPPunwiredandpublishedmusthavepublicvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9L6WfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9L6mfHEeO447LqwGjc0A" key="body" value="(not isWired and isPublish) implies &#xD;&#xA;   (base_Port.visibility = uml::VisibilityKind::public)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9L7GfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9L7WfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9L7mfHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9L8GfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9L8WfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9L8mfHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ux9L82fHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9L9GfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9L9WfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ux9L9mfHEeO447LqwGjc0A" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ux9L-GfHEeO447LqwGjc0A" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ux9L-mfHEeO447LqwGjc0A" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ux9L_GfHEeO447LqwGjc0A" name="registration" ordered="false" eType="_ux9MAmfHEeO447LqwGjc0A"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ux9L_mfHEeO447LqwGjc0A" name="registrationOverride" 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="_ux9MAGfHEeO447LqwGjc0A" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_ux9MAmfHEeO447LqwGjc0A" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9MA2fHEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_ux9MBGfHEeO447LqwGjc0A" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_ux9MBWfHEeO447LqwGjc0A" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_ux9MBmfHEeO447LqwGjc0A" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_ux9MB2fHEeO447LqwGjc0A" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9MCGfHEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ux9MCWfHEeO447LqwGjc0A" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9MCmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9MC2fHEeO447LqwGjc0A" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9MDWfHEeO447LqwGjc0A" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9MDmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9MD2fHEeO447LqwGjc0A" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ux9MEWfHEeO447LqwGjc0A" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9MEmfHEeO447LqwGjc0A" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ux9ME2fHEeO447LqwGjc0A" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ux9MFGfHEeO447LqwGjc0A">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9MFWfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ux9MFmfHEeO447LqwGjc0A">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ux9MF2fHEeO447LqwGjc0A" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_ux9MGWfHEeO447LqwGjc0A" name="ProtocolPackage">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9MGmfHEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ux9MG2fHEeO447LqwGjc0A" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_ux9MHWfHEeO447LqwGjc0A" name="RTRExcludedElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9MHmfHEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ux9MH2fHEeO447LqwGjc0A" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_ux9MIWfHEeO447LqwGjc0A" name="MessageSet">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9MImfHEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g6khEGDFEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ux9MI2fHEeO447LqwGjc0A" name="base_Interface" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ux9MJWfHEeO447LqwGjc0A" name="isIncoming" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_ux9MJ2fHEeO447LqwGjc0A" name="TriggerEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9MKGfHEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ux9MKWfHEeO447LqwGjc0A" name="evType" ordered="false" lowerBound="1" eType="_ux9MLWfHEeO447LqwGjc0A"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ux9MK2fHEeO447LqwGjc0A" name="base_SignalEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//SignalEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_ux9MLWfHEeO447LqwGjc0A" name="EventType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9MLmfHEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXMMIGDdEeOesvHnEWH_sQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_ux9ML2fHEeO447LqwGjc0A" name="inEvent"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_ux9MMGfHEeO447LqwGjc0A" name="outEvent" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_ux9MMWfHEeO447LqwGjc0A" name="inOutEvent" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_ux9MMmfHEeO447LqwGjc0A" name="Trigger">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ux9MM2fHEeO447LqwGjc0A" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ux9MNGfHEeO447LqwGjc0A" name="base_Operation" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_UCSl8GJYEeOesvHnEWH_sQ" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_UCR-4GJYEeOesvHnEWH_sQ/13" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSl8WJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSl8mJYEeOesvHnEWH_sQ" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCW3YmJYEeOesvHnEWH_sQ" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCW3Y2JYEeOesvHnEWH_sQ" key="Version" value="0.1.2"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCW3ZGJYEeOesvHnEWH_sQ" key="Comment" value="Removed isSubstitutable from CapsulePart (covered by UML) and isConjugate from RTPort (also covered by base UML)"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCW3ZWJYEeOesvHnEWH_sQ" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCW3ZmJYEeOesvHnEWH_sQ" key="Date" value="2013-12-11"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCW3Z2JYEeOesvHnEWH_sQ" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_UCSl82JYEeOesvHnEWH_sQ" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSl9GJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_UCSl9WJYEeOesvHnEWH_sQ" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSl9mJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSl92JYEeOesvHnEWH_sQ" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSl-WJYEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSl-mJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSl-2JYEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSl_WJYEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSl_mJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSl_2JYEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_UCSmAGJYEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmAWJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmAmJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_UCSmA2JYEeOesvHnEWH_sQ" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmBGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmBWJYEeOesvHnEWH_sQ" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmB2JYEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmCGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmCWJYEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmC2JYEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmDGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmDWJYEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_UCSmDmJYEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmD2JYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmEGJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_UCSmEWJYEeOesvHnEWH_sQ" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmEmJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmE2JYEeOesvHnEWH_sQ" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmFWJYEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmFmJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmF2JYEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmGWJYEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmGmJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmG2JYEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_UCSmHGJYEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmHWJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmHmJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_UCSmH2JYEeOesvHnEWH_sQ" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmIGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmIWJYEeOesvHnEWH_sQ" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmI2JYEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmJGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmJWJYEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmJ2JYEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmKGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmKWJYEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_UCSmKmJYEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmK2JYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmLGJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_UCSmLWJYEeOesvHnEWH_sQ" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmLmJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmL2JYEeOesvHnEWH_sQ" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmMWJYEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmMmJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmM2JYEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmNWJYEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmNmJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmN2JYEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_UCSmOGJYEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmOWJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmOmJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_UCSmO2JYEeOesvHnEWH_sQ" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmPGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmPWJYEeOesvHnEWH_sQ" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmP2JYEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmQGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmQWJYEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmQ2JYEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmRGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmRWJYEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_UCSmRmJYEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmR2JYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmSGJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_UCSmSWJYEeOesvHnEWH_sQ" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmSmJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmS2JYEeOesvHnEWH_sQ" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmTWJYEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmTmJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmT2JYEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmUWJYEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmUmJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmU2JYEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_UCSmVGJYEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmVWJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmVmJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_UCSmV2JYEeOesvHnEWH_sQ" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmWGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmWWJYEeOesvHnEWH_sQ" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmW2JYEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmXGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmXWJYEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmX2JYEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmYGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmYWJYEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_UCSmYmJYEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmY2JYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmZGJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_UCSmZWJYEeOesvHnEWH_sQ" name="Capsulevariablescanonlyhaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmZmJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmZ2JYEeOesvHnEWH_sQ" key="body" value="base_Class.ownedAttribute->forAll(at | not(at.oclIsKindOf(uml::Port)) implies (at.visibility = uml::VisibilityKind::protected))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmaWJYEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmamJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSma2JYEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmbWJYEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmbmJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmb2JYEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_UCSmcGJYEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmcWJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmcmJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_UCSmc2JYEeOesvHnEWH_sQ" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmdGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmdWJYEeOesvHnEWH_sQ" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmd2JYEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmeGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmeWJYEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSme2JYEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmfGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmfWJYEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_UCSmfmJYEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmf2JYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmgGJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_UCSmgWJYEeOesvHnEWH_sQ" name="SAPsunwiredunpublishedportsmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmgmJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmg2JYEeOesvHnEWH_sQ" key="body" value="let saps = base_Class.ownedPort->select(p | not p.isService) in&#xD;&#xA;   (saps->notEmpty()) implies&#xD;&#xA;      saps->forAll(s | s.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmhWJYEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmhmJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmh2JYEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmiWJYEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmimJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmi2JYEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_UCSmjGJYEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmjWJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmjmJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_UCSmj2JYEeOesvHnEWH_sQ" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmkGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmkWJYEeOesvHnEWH_sQ" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmk2JYEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmlGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmlWJYEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSml2JYEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmmGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmmWJYEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_UCSmmmJYEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmm2JYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmnGJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_UCSmnWJYEeOesvHnEWH_sQ" name="Acapsuleclassonlysupportsstatemachinebehaviors">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmnmJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmn2JYEeOesvHnEWH_sQ" key="body" value="base_Class.classifierBehavior->notEmpty() implies&#xD;&#xA;      (base_Class.classifierBehavior.oclIsTypeOf(uml::StateMachine))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmoWJYEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmomJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmo2JYEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmpWJYEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmpmJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmp2JYEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_UCSmqGJYEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmqWJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmqmJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_UCSmq2JYEeOesvHnEWH_sQ" 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="_UCSmrWJYEeOesvHnEWH_sQ" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmrmJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_UCSmr2JYEeOesvHnEWH_sQ" 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="_UCSmsWJYEeOesvHnEWH_sQ" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmsmJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_UCSms2JYEeOesvHnEWH_sQ" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmtGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmtWJYEeOesvHnEWH_sQ" key="body" value="base_Class.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmt2JYEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmuGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmuWJYEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmu2JYEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmvGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmvWJYEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_UCSmvmJYEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmv2JYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSmwGJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_UCSmwWJYEeOesvHnEWH_sQ" 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="_UCSmw2JYEeOesvHnEWH_sQ" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmxGJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_UCSmxWJYEeOesvHnEWH_sQ" name="Wiredportsmustbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmxmJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmx2JYEeOesvHnEWH_sQ" key="body" value="isWired implies base_Port.isService"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmyWJYEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmymJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmy2JYEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSmzWJYEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSmzmJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSmz2JYEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_UCSm0GJYEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSm0WJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSm0mJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_UCSm02JYEeOesvHnEWH_sQ" name="UnwiredUnpublishedportscannotbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSm1GJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSm1WJYEeOesvHnEWH_sQ" key="body" value="(not (isWired or isPublish)) implies (not base_Port.isService)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSm12JYEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSm2GJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSm2WJYEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSm22JYEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSm3GJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSm3WJYEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_UCSm3mJYEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSm32JYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSm4GJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_UCSm4WJYEeOesvHnEWH_sQ" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_UCSm42JYEeOesvHnEWH_sQ" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_UCSm5WJYEeOesvHnEWH_sQ" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_UCSm52JYEeOesvHnEWH_sQ" name="registration" ordered="false" eType="_UCSm7WJYEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_UCSm6WJYEeOesvHnEWH_sQ" name="registrationOverride" 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="_UCSm62JYEeOesvHnEWH_sQ" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_UCSm7WJYEeOesvHnEWH_sQ" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSm7mJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_UCSm72JYEeOesvHnEWH_sQ" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_UCSm8GJYEeOesvHnEWH_sQ" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_UCSm8WJYEeOesvHnEWH_sQ" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_UCSm8mJYEeOesvHnEWH_sQ" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSm82JYEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_UCSm9GJYEeOesvHnEWH_sQ" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSm9WJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSm9mJYEeOesvHnEWH_sQ" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSm-GJYEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSm-WJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSm-mJYEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_UCSm_GJYEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSm_WJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UCSm_mJYEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_UCSm_2JYEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSnAGJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_UCSnAWJYEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_UCSnAmJYEeOesvHnEWH_sQ" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_UCSnBGJYEeOesvHnEWH_sQ" name="ProtocolPackage">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSnBWJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_UCSnBmJYEeOesvHnEWH_sQ" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_UCSnCGJYEeOesvHnEWH_sQ" name="RTRedefinableElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSnCWJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_UCSnCmJYEeOesvHnEWH_sQ" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_UCSnDGJYEeOesvHnEWH_sQ" name="rootFragment" ordered="false">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_UCSnDmJYEeOesvHnEWH_sQ" name="isExcluded" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_UCSnEGJYEeOesvHnEWH_sQ" name="MessageSet">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSnEWJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g6khEGDFEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_UCSnEmJYEeOesvHnEWH_sQ" name="base_Interface" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_UCSnFGJYEeOesvHnEWH_sQ" name="isIncoming" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_UCSnFmJYEeOesvHnEWH_sQ" name="TriggerEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSnF2JYEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_UCSnGGJYEeOesvHnEWH_sQ" name="evType" ordered="false" lowerBound="1" eType="_UCSnHGJYEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_UCSnGmJYEeOesvHnEWH_sQ" name="base_SignalEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//SignalEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_UCSnHGJYEeOesvHnEWH_sQ" name="EventType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UCSnHWJYEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXMMIGDdEeOesvHnEWH_sQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_UCSnHmJYEeOesvHnEWH_sQ" name="inEvent"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_UCSnH2JYEeOesvHnEWH_sQ" name="outEvent" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_UCSnIGJYEeOesvHnEWH_sQ" name="inOutEvent" value="2"/>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_tJq-QGJREeOesvHnEWH_sQ" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_tJqXMGJREeOesvHnEWH_sQ/12" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-QWJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-QmJREeOesvHnEWH_sQ" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJvPtGJREeOesvHnEWH_sQ" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJvPtWJREeOesvHnEWH_sQ" key="Version" value="0.1.1"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJvPtmJREeOesvHnEWH_sQ" key="Comment" value="fixed ref to uml::StateMachine"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJvPt2JREeOesvHnEWH_sQ" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJvPuGJREeOesvHnEWH_sQ" key="Date" value="2013-12-11"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJvPuWJREeOesvHnEWH_sQ" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_tJq-Q2JREeOesvHnEWH_sQ" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-RGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_tJq-RWJREeOesvHnEWH_sQ" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-RmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-R2JREeOesvHnEWH_sQ" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-SWJREeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-SmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-S2JREeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-TWJREeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-TmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-T2JREeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_tJq-UGJREeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-UWJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-UmJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_tJq-U2JREeOesvHnEWH_sQ" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-VGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-VWJREeOesvHnEWH_sQ" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-V2JREeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-WGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-WWJREeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-W2JREeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-XGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-XWJREeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_tJq-XmJREeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-X2JREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-YGJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_tJq-YWJREeOesvHnEWH_sQ" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-YmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-Y2JREeOesvHnEWH_sQ" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-ZWJREeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-ZmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-Z2JREeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-aWJREeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-amJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-a2JREeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_tJq-bGJREeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-bWJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-bmJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_tJq-b2JREeOesvHnEWH_sQ" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-cGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-cWJREeOesvHnEWH_sQ" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-c2JREeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-dGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-dWJREeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-d2JREeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-eGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-eWJREeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_tJq-emJREeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-e2JREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-fGJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_tJq-fWJREeOesvHnEWH_sQ" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-fmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-f2JREeOesvHnEWH_sQ" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-gWJREeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-gmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-g2JREeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-hWJREeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-hmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-h2JREeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_tJq-iGJREeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-iWJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-imJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_tJq-i2JREeOesvHnEWH_sQ" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-jGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-jWJREeOesvHnEWH_sQ" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-j2JREeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-kGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-kWJREeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-k2JREeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-lGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-lWJREeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_tJq-lmJREeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-l2JREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-mGJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_tJq-mWJREeOesvHnEWH_sQ" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-mmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-m2JREeOesvHnEWH_sQ" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-nWJREeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-nmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-n2JREeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-oWJREeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-omJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-o2JREeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_tJq-pGJREeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-pWJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-pmJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_tJq-p2JREeOesvHnEWH_sQ" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-qGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-qWJREeOesvHnEWH_sQ" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-q2JREeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-rGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-rWJREeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-r2JREeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-sGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-sWJREeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_tJq-smJREeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-s2JREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-tGJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_tJq-tWJREeOesvHnEWH_sQ" name="Capsulevariablescanonlyhaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-tmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-t2JREeOesvHnEWH_sQ" key="body" value="base_Class.ownedAttribute->forAll(at | not(at.oclIsKindOf(uml::Port)) implies (at.visibility = uml::VisibilityKind::protected))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-uWJREeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-umJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-u2JREeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-vWJREeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-vmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-v2JREeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_tJq-wGJREeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-wWJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-wmJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_tJq-w2JREeOesvHnEWH_sQ" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-xGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-xWJREeOesvHnEWH_sQ" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-x2JREeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-yGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-yWJREeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-y2JREeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-zGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-zWJREeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_tJq-zmJREeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-z2JREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-0GJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_tJq-0WJREeOesvHnEWH_sQ" name="SAPsunwiredunpublishedportsmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-0mJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-02JREeOesvHnEWH_sQ" key="body" value="let saps = base_Class.ownedPort->select(p | not p.isService) in&#xD;&#xA;   (saps->notEmpty()) implies&#xD;&#xA;      saps->forAll(s | s.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-1WJREeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-1mJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-12JREeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-2WJREeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-2mJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-22JREeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_tJq-3GJREeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-3WJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-3mJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_tJq-32JREeOesvHnEWH_sQ" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-4GJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-4WJREeOesvHnEWH_sQ" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-42JREeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-5GJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-5WJREeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-52JREeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-6GJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-6WJREeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_tJq-6mJREeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-62JREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq-7GJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_tJq-7WJREeOesvHnEWH_sQ" name="Acapsuleclassonlysupportsstatemachinebehaviors">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-7mJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-72JREeOesvHnEWH_sQ" key="body" value="base_Class.classifierBehavior->notEmpty() implies&#xD;&#xA;      (base_Class.classifierBehavior.oclIsTypeOf(uml::StateMachine))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-8WJREeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-8mJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-82JREeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq-9WJREeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-9mJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq-92JREeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_tJq--GJREeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq--WJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq--mJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_tJq--2JREeOesvHnEWH_sQ" 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="_tJq-_WJREeOesvHnEWH_sQ" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq-_mJREeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_tJq-_2JREeOesvHnEWH_sQ" 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:EAttribute" xmi:id="_tJq_AWJREeOesvHnEWH_sQ" name="isSubstitutable" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_tJq_A2JREeOesvHnEWH_sQ" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq_BGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_tJq_BWJREeOesvHnEWH_sQ" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq_BmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq_B2JREeOesvHnEWH_sQ" key="body" value="base_Class.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq_CWJREeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq_CmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq_C2JREeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq_DWJREeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq_DmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq_D2JREeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_tJq_EGJREeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq_EWJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq_EmJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_tJq_E2JREeOesvHnEWH_sQ" 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="_tJq_FWJREeOesvHnEWH_sQ" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq_FmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_tJq_F2JREeOesvHnEWH_sQ" name="Wiredportsmustbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq_GGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq_GWJREeOesvHnEWH_sQ" key="body" value="isWired implies base_Port.isService"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq_G2JREeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq_HGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq_HWJREeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq_H2JREeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq_IGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq_IWJREeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_tJq_ImJREeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq_I2JREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq_JGJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_tJq_JWJREeOesvHnEWH_sQ" name="UnwiredUnpublishedportscannotbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq_JmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq_J2JREeOesvHnEWH_sQ" key="body" value="(not (isWired or isPublish)) implies (not base_Port.isService)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq_KWJREeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq_KmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq_K2JREeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq_LWJREeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq_LmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq_L2JREeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_tJq_MGJREeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq_MWJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJq_MmJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_tJq_M2JREeOesvHnEWH_sQ" name="isConjugate" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_tJq_NWJREeOesvHnEWH_sQ" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_tJq_N2JREeOesvHnEWH_sQ" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_tJq_OWJREeOesvHnEWH_sQ" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_tJq_O2JREeOesvHnEWH_sQ" name="registration" ordered="false" eType="_tJq_QWJREeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_tJq_PWJREeOesvHnEWH_sQ" name="registrationOverride" 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="_tJq_P2JREeOesvHnEWH_sQ" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_tJq_QWJREeOesvHnEWH_sQ" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq_QmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_tJq_Q2JREeOesvHnEWH_sQ" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_tJq_RGJREeOesvHnEWH_sQ" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_tJq_RWJREeOesvHnEWH_sQ" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_tJq_RmJREeOesvHnEWH_sQ" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq_R2JREeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_tJq_SGJREeOesvHnEWH_sQ" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJq_SWJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJq_SmJREeOesvHnEWH_sQ" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJq_TGJREeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJrlUGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJrlUWJREeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_tJrlU2JREeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJrlVGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJrlVWJREeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_tJrlVmJREeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJrlV2JREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_tJrlWGJREeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_tJrlWWJREeOesvHnEWH_sQ" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_tJrlW2JREeOesvHnEWH_sQ" name="ProtocolPackage">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJrlXGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_tJrlXWJREeOesvHnEWH_sQ" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_tJrlX2JREeOesvHnEWH_sQ" name="RTRedefinableElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJrlYGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_tJrlYWJREeOesvHnEWH_sQ" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_tJrlY2JREeOesvHnEWH_sQ" name="rootFragment" ordered="false">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_tJrlZWJREeOesvHnEWH_sQ" name="isExcluded" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_tJrlZ2JREeOesvHnEWH_sQ" name="MessageSet">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJrlaGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g6khEGDFEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_tJrlaWJREeOesvHnEWH_sQ" name="base_Interface" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_tJrla2JREeOesvHnEWH_sQ" name="isIncoming" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_tJrlbWJREeOesvHnEWH_sQ" name="TriggerEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJrlbmJREeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_tJrlb2JREeOesvHnEWH_sQ" name="evType" ordered="false" lowerBound="1" eType="_tJrlc2JREeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_tJrlcWJREeOesvHnEWH_sQ" name="base_SignalEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//SignalEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_tJrlc2JREeOesvHnEWH_sQ" name="EventType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tJrldGJREeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXMMIGDdEeOesvHnEWH_sQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_tJrldWJREeOesvHnEWH_sQ" name="inEvent"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_tJrldmJREeOesvHnEWH_sQ" name="outEvent" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_tJrld2JREeOesvHnEWH_sQ" name="inOutEvent" value="2"/>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_keNwcGGVEeOesvHnEWH_sQ" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_keMiUGGVEeOesvHnEWH_sQ/11" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwcWGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwcmGVEeOesvHnEWH_sQ" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keSB5mGVEeOesvHnEWH_sQ" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keSB52GVEeOesvHnEWH_sQ" key="Version" value="0.1.0"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keSB6GGVEeOesvHnEWH_sQ" key="Comment" value="First release of revised structure modeling profile"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keSB6WGVEeOesvHnEWH_sQ" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keSo8GGVEeOesvHnEWH_sQ" key="Date" value="2013-12-10"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keSo8WGVEeOesvHnEWH_sQ" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_keNwc2GVEeOesvHnEWH_sQ" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwdGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_keNwdWGVEeOesvHnEWH_sQ" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwdmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwd2GVEeOesvHnEWH_sQ" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNweWGVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwemGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwe2GVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNwfWGVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwfmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwf2GVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_keNwgGGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNwgWGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNwgmGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_keNwg2GVEeOesvHnEWH_sQ" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwhGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwhWGVEeOesvHnEWH_sQ" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNwh2GVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwiGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwiWGVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNwi2GVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwjGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwjWGVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_keNwjmGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNwj2GVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNwkGGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_keNwkWGVEeOesvHnEWH_sQ" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwkmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwk2GVEeOesvHnEWH_sQ" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNwlWGVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwlmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwl2GVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNwmWGVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwmmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwm2GVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_keNwnGGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNwnWGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNwnmGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_keNwn2GVEeOesvHnEWH_sQ" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwoGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwoWGVEeOesvHnEWH_sQ" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNwo2GVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwpGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwpWGVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNwp2GVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwqGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwqWGVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_keNwqmGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNwq2GVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNwrGGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_keNwrWGVEeOesvHnEWH_sQ" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwrmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwr2GVEeOesvHnEWH_sQ" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNwsWGVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwsmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNws2GVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNwtWGVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwtmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwt2GVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_keNwuGGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNwuWGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNwumGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_keNwu2GVEeOesvHnEWH_sQ" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwvGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwvWGVEeOesvHnEWH_sQ" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNwv2GVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwwGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwwWGVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNww2GVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwxGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwxWGVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_keNwxmGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNwx2GVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNwyGGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_keNwyWGVEeOesvHnEWH_sQ" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwymGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwy2GVEeOesvHnEWH_sQ" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNwzWGVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNwzmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNwz2GVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNw0WGVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNw0mGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNw02GVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_keNw1GGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNw1WGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNw1mGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_keNw12GVEeOesvHnEWH_sQ" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNw2GGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNw2WGVEeOesvHnEWH_sQ" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNw22GVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNw3GGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNw3WGVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNw32GVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNw4GGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNw4WGVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_keNw4mGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNw42GVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNw5GGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_keNw5WGVEeOesvHnEWH_sQ" name="Capsulevariablescanonlyhaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNw5mGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNw52GVEeOesvHnEWH_sQ" key="body" value="base_Class.ownedAttribute->forAll(at | not(at.oclIsKindOf(uml::Port)) implies (at.visibility = uml::VisibilityKind::protected))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNw6WGVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNw6mGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNw62GVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNw7WGVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNw7mGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNw72GVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_keNw8GGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNw8WGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNw8mGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_keNw82GVEeOesvHnEWH_sQ" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNw9GGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNw9WGVEeOesvHnEWH_sQ" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNw92GVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNw-GGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNw-WGVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNw-2GVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNw_GGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNw_WGVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_keNw_mGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNw_2GVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNxAGGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_keNxAWGVEeOesvHnEWH_sQ" name="SAPsunwiredunpublishedportsmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxAmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxA2GVEeOesvHnEWH_sQ" key="body" value="let saps = base_Class.ownedPort->select(p | not p.isService) in&#xD;&#xA;   (saps->notEmpty()) implies&#xD;&#xA;      saps->forAll(s | s.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNxBWGVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxBmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxB2GVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNxCWGVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxCmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxC2GVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_keNxDGGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNxDWGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNxDmGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_keNxD2GVEeOesvHnEWH_sQ" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxEGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxEWGVEeOesvHnEWH_sQ" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNxE2GVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxFGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxFWGVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNxF2GVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxGGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxGWGVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_keNxGmGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNxG2GVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNxHGGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_keNxHWGVEeOesvHnEWH_sQ" name="Acapsuleclassonlysupportsstatemachinebehaviors">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxHmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxH2GVEeOesvHnEWH_sQ" key="body" value="base_Class.classifierBehavior->notEmpty() implies&#xD;&#xA;      (base_Class.classifierBehavior.oclIsTypeOf(StateMachine))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNxIWGVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxImGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxI2GVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNxJWGVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxJmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxJ2GVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_keNxKGGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNxKWGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNxKmGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_keNxK2GVEeOesvHnEWH_sQ" 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="_keNxLWGVEeOesvHnEWH_sQ" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxLmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_keNxL2GVEeOesvHnEWH_sQ" 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:EAttribute" xmi:id="_keNxMWGVEeOesvHnEWH_sQ" name="isSubstitutable" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_keNxM2GVEeOesvHnEWH_sQ" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxNGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_keNxNWGVEeOesvHnEWH_sQ" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxNmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxN2GVEeOesvHnEWH_sQ" key="body" value="base_Class.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNxOWGVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxOmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxO2GVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNxPWGVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxPmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxP2GVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_keNxQGGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNxQWGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNxQmGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_keNxQ2GVEeOesvHnEWH_sQ" 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="_keNxRWGVEeOesvHnEWH_sQ" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxRmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_keNxR2GVEeOesvHnEWH_sQ" name="Wiredportsmustbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxSGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxSWGVEeOesvHnEWH_sQ" key="body" value="isWired implies base_Port.isService"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNxS2GVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxTGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxTWGVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNxT2GVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxUGGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxUWGVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_keNxUmGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNxU2GVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNxVGGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_keNxVWGVEeOesvHnEWH_sQ" name="UnwiredUnpublishedportscannotbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxVmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxV2GVEeOesvHnEWH_sQ" key="body" value="(not (isWired or isPublish)) implies (not base_Port.isService)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNxWWGVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxWmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxW2GVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNxXWGVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxXmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxX2GVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_keNxYGGVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNxYWGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNxYmGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_keNxY2GVEeOesvHnEWH_sQ" name="isConjugate" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_keNxZWGVEeOesvHnEWH_sQ" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_keNxZ2GVEeOesvHnEWH_sQ" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_keNxaWGVEeOesvHnEWH_sQ" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_keNxa2GVEeOesvHnEWH_sQ" name="registration" ordered="false" eType="_keNxcWGVEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_keNxbWGVEeOesvHnEWH_sQ" name="registrationOverride" 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="_keNxb2GVEeOesvHnEWH_sQ" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_keNxcWGVEeOesvHnEWH_sQ" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxcmGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_keNxc2GVEeOesvHnEWH_sQ" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_keNxdGGVEeOesvHnEWH_sQ" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_keNxdWGVEeOesvHnEWH_sQ" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_keNxdmGVEeOesvHnEWH_sQ" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxd2GVEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_keNxeGGVEeOesvHnEWH_sQ" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxeWGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxemGVEeOesvHnEWH_sQ" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNxfGGVEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxfWGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxfmGVEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_keNxgGGVEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxgWGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_keNxgmGVEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_keNxg2GVEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNxhGGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_keNxhWGVEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_keNxhmGVEeOesvHnEWH_sQ" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_keNxiGGVEeOesvHnEWH_sQ" name="ProtocolPackage">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxiWGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_keNximGVEeOesvHnEWH_sQ" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_keNxjGGVEeOesvHnEWH_sQ" name="RTRedefinableElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxjWGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_keNxjmGVEeOesvHnEWH_sQ" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_keNxkGGVEeOesvHnEWH_sQ" name="rootFragment" ordered="false">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_keNxkmGVEeOesvHnEWH_sQ" name="isExcluded" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_keNxlGGVEeOesvHnEWH_sQ" name="MessageSet">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxlWGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g6khEGDFEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_keNxlmGVEeOesvHnEWH_sQ" name="base_Interface" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_keNxmGGVEeOesvHnEWH_sQ" name="isIncoming" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_keNxmmGVEeOesvHnEWH_sQ" name="TriggerEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxm2GVEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_keNxnGGVEeOesvHnEWH_sQ" name="evType" ordered="false" lowerBound="1" eType="_keNxoGGVEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_keNxnmGVEeOesvHnEWH_sQ" name="base_SignalEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//SignalEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_keNxoGGVEeOesvHnEWH_sQ" name="EventType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_keNxoWGVEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXMMIGDdEeOesvHnEWH_sQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_keNxomGVEeOesvHnEWH_sQ" name="inEvent"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_keNxo2GVEeOesvHnEWH_sQ" name="outEvent" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_keNxpGGVEeOesvHnEWH_sQ" name="inOutEvent" value="2"/>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_iVr-wGDGEeOesvHnEWH_sQ" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_iVkqAGDGEeOesvHnEWH_sQ/10" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr-wWDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr-wmDGEeOesvHnEWH_sQ" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVz6kGDGEeOesvHnEWH_sQ" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVz6kWDGEeOesvHnEWH_sQ" key="Version" value="0.0.11"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVz6kmDGEeOesvHnEWH_sQ" key="Comment" value="Added ProtocolRole stereotype and &quot;isExcluded&quot; attribute; reorganized diagrams"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVz6k2DGEeOesvHnEWH_sQ" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVz6lGDGEeOesvHnEWH_sQ" key="Date" value="2013-12-09"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVz6lWDGEeOesvHnEWH_sQ" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_iVr-w2DGEeOesvHnEWH_sQ" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr-xGDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_iVr-xWDGEeOesvHnEWH_sQ" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr-xmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr-x2DGEeOesvHnEWH_sQ" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr-yWDGEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr-ymDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr-y2DGEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr-zWDGEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr-zmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr-z2DGEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_iVr-0GDGEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr-0WDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr-0mDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_iVr-02DGEeOesvHnEWH_sQ" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr-1GDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr-1WDGEeOesvHnEWH_sQ" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr-12DGEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr-2GDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr-2WDGEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr-22DGEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr-3GDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr-3WDGEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_iVr-3mDGEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr-32DGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr-4GDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_iVr-4WDGEeOesvHnEWH_sQ" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr-4mDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr-42DGEeOesvHnEWH_sQ" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr-5WDGEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr-5mDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr-52DGEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr-6WDGEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr-6mDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr-62DGEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_iVr-7GDGEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr-7WDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr-7mDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_iVr-72DGEeOesvHnEWH_sQ" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr-8GDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr-8WDGEeOesvHnEWH_sQ" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr-82DGEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr-9GDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr-9WDGEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr-92DGEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr--GDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr--WDGEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_iVr--mDGEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr--2DGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr-_GDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_iVr-_WDGEeOesvHnEWH_sQ" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr-_mDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr-_2DGEeOesvHnEWH_sQ" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_AWDGEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_AmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_A2DGEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_BWDGEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_BmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_B2DGEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_iVr_CGDGEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_CWDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_CmDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_iVr_C2DGEeOesvHnEWH_sQ" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_DGDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_DWDGEeOesvHnEWH_sQ" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_D2DGEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_EGDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_EWDGEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_E2DGEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_FGDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_FWDGEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_iVr_FmDGEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_F2DGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_GGDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_iVr_GWDGEeOesvHnEWH_sQ" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_GmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_G2DGEeOesvHnEWH_sQ" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_HWDGEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_HmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_H2DGEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_IWDGEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_ImDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_I2DGEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_iVr_JGDGEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_JWDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_JmDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_iVr_J2DGEeOesvHnEWH_sQ" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_KGDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_KWDGEeOesvHnEWH_sQ" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_K2DGEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_LGDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_LWDGEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_L2DGEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_MGDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_MWDGEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_iVr_MmDGEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_M2DGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_NGDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_iVr_NWDGEeOesvHnEWH_sQ" name="Capsulevariablescanonlyhaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_NmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_N2DGEeOesvHnEWH_sQ" key="body" value="base_Class.ownedAttribute->forAll(at | not(at.oclIsKindOf(uml::Port)) implies (at.visibility = uml::VisibilityKind::protected))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_OWDGEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_OmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_O2DGEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_PWDGEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_PmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_P2DGEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_iVr_QGDGEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_QWDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_QmDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_iVr_Q2DGEeOesvHnEWH_sQ" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_RGDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_RWDGEeOesvHnEWH_sQ" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_R2DGEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_SGDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_SWDGEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_S2DGEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_TGDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_TWDGEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_iVr_TmDGEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_T2DGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_UGDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_iVr_UWDGEeOesvHnEWH_sQ" name="SAPsunwiredunpublishedportsmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_UmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_U2DGEeOesvHnEWH_sQ" key="body" value="let saps = base_Class.ownedPort->select(p | not p.isService) in&#xD;&#xA;   (saps->notEmpty()) implies&#xD;&#xA;      saps->forAll(s | s.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_VWDGEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_VmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_V2DGEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_WWDGEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_WmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_W2DGEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_iVr_XGDGEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_XWDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_XmDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_iVr_X2DGEeOesvHnEWH_sQ" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_YGDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_YWDGEeOesvHnEWH_sQ" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_Y2DGEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_ZGDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_ZWDGEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_Z2DGEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_aGDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_aWDGEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_iVr_amDGEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_a2DGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_bGDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_iVr_bWDGEeOesvHnEWH_sQ" name="Acapsuleclassonlysupportsstatemachinebehaviors">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_bmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_b2DGEeOesvHnEWH_sQ" key="body" value="base_Class.classifierBehavior->notEmpty() implies&#xD;&#xA;      (base_Class.classifierBehavior.oclIsTypeOf(StateMachine))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_cWDGEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_cmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_c2DGEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_dWDGEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_dmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_d2DGEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_iVr_eGDGEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_eWDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_emDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_iVr_e2DGEeOesvHnEWH_sQ" 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="_iVr_fWDGEeOesvHnEWH_sQ" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_fmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_iVr_f2DGEeOesvHnEWH_sQ" 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:EAttribute" xmi:id="_iVr_gWDGEeOesvHnEWH_sQ" name="isSubstitutable" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_iVr_g2DGEeOesvHnEWH_sQ" name="InEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_hGDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_iVr_hWDGEeOesvHnEWH_sQ" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_iVr_h2DGEeOesvHnEWH_sQ" name="OutEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_iGDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_iVr_iWDGEeOesvHnEWH_sQ" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_iVr_i2DGEeOesvHnEWH_sQ" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_jGDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_iVr_jWDGEeOesvHnEWH_sQ" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_jmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_j2DGEeOesvHnEWH_sQ" key="body" value="base_Collaboration.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_kWDGEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_kmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_k2DGEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_lWDGEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_lmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_l2DGEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_iVr_mGDGEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_mWDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_mmDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_iVr_m2DGEeOesvHnEWH_sQ" name="base_Collaboration" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_iVr_nWDGEeOesvHnEWH_sQ" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_nmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_iVr_n2DGEeOesvHnEWH_sQ" name="Wiredportsmustbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_oGDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_oWDGEeOesvHnEWH_sQ" key="body" value="isWired implies base_Port.isService"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_o2DGEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_pGDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_pWDGEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_p2DGEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_qGDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_qWDGEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_iVr_qmDGEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_q2DGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_rGDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_iVr_rWDGEeOesvHnEWH_sQ" name="UnwiredUnpublishedportscannotbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_rmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_r2DGEeOesvHnEWH_sQ" key="body" value="(not (isWired or isPublish)) implies (not base_Port.isService)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_sWDGEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_smDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_s2DGEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVr_tWDGEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVr_tmDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVr_t2DGEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_iVr_uGDGEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_uWDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVr_umDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_iVr_u2DGEeOesvHnEWH_sQ" name="isConjugate" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_iVsl0WDGEeOesvHnEWH_sQ" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_iVsl02DGEeOesvHnEWH_sQ" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_iVsl1WDGEeOesvHnEWH_sQ" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_iVsl12DGEeOesvHnEWH_sQ" name="registration" ordered="false" eType="_iVsl3WDGEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_iVsl2WDGEeOesvHnEWH_sQ" name="registrationOverride" 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="_iVsl22DGEeOesvHnEWH_sQ" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_iVsl3WDGEeOesvHnEWH_sQ" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVsl3mDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_iVsl32DGEeOesvHnEWH_sQ" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_iVsl4GDGEeOesvHnEWH_sQ" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_iVsl4WDGEeOesvHnEWH_sQ" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_iVsl4mDGEeOesvHnEWH_sQ" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVsl42DGEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_iVsl5GDGEeOesvHnEWH_sQ" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVsl5WDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVsl5mDGEeOesvHnEWH_sQ" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVsl6GDGEeOesvHnEWH_sQ" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVsl6WDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVsl6mDGEeOesvHnEWH_sQ" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_iVsl7GDGEeOesvHnEWH_sQ" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVsl7WDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVsl7mDGEeOesvHnEWH_sQ" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_iVsl72DGEeOesvHnEWH_sQ">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVsl8GDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_iVsl8WDGEeOesvHnEWH_sQ">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_iVsl8mDGEeOesvHnEWH_sQ" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_iVsl9GDGEeOesvHnEWH_sQ" name="ProtocolContainer">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVsl9WDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_iVsl9mDGEeOesvHnEWH_sQ" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_iVsl-GDGEeOesvHnEWH_sQ" name="RTRedefinableElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVsl-WDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_iVsl-mDGEeOesvHnEWH_sQ" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_iVsl_GDGEeOesvHnEWH_sQ" name="rootFragment" ordered="false">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_iVsl_mDGEeOesvHnEWH_sQ" name="isExcluded" ordered="false" lowerBound="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="_iVsmAGDGEeOesvHnEWH_sQ" name="InOutEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVsmAWDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_iVsmAmDGEeOesvHnEWH_sQ" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_iVsmBGDGEeOesvHnEWH_sQ" name="ProtocolRole">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVsmBWDGEeOesvHnEWH_sQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g6khEGDFEeOesvHnEWH_sQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_iVsmBmDGEeOesvHnEWH_sQ" name="base_Interface" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_v5uY8VEXEeOMYqaaVdNqwA" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_v5uY8FEXEeOMYqaaVdNqwA/9" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uY8lEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uY81EXEeOMYqaaVdNqwA" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v50fmlEXEeOMYqaaVdNqwA" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v50fm1EXEeOMYqaaVdNqwA" key="Version" value="0.0.10"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v50fnFEXEeOMYqaaVdNqwA" key="Comment" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v50fnVEXEeOMYqaaVdNqwA" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v50fnlEXEeOMYqaaVdNqwA" key="Date" value="2013-11-19"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v50fn1EXEeOMYqaaVdNqwA" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_v5uY9FEXEeOMYqaaVdNqwA" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uY9VEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_v5uY9lEXEeOMYqaaVdNqwA" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uY91EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uY-FEXEeOMYqaaVdNqwA" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uY-lEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uY-1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uY_FEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uY_lEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uY_1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZAFEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_v5uZAVEXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZAlEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZA1EXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_v5uZBFEXEeOMYqaaVdNqwA" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZBVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZBlEXEeOMYqaaVdNqwA" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZCFEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZCVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZClEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZDFEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZDVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZDlEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_v5uZD1EXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZEFEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZEVEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_v5uZElEXEeOMYqaaVdNqwA" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZE1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZFFEXEeOMYqaaVdNqwA" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZFlEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZF1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZGFEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZGlEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZG1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZHFEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_v5uZHVEXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZHlEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZH1EXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_v5uZIFEXEeOMYqaaVdNqwA" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZIVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZIlEXEeOMYqaaVdNqwA" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZJFEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZJVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZJlEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZKFEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZKVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZKlEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_v5uZK1EXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZLFEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZLVEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_v5uZLlEXEeOMYqaaVdNqwA" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZL1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZMFEXEeOMYqaaVdNqwA" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZMlEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZM1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZNFEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZNlEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZN1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZOFEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_v5uZOVEXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZOlEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZO1EXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_v5uZPFEXEeOMYqaaVdNqwA" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZPVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZPlEXEeOMYqaaVdNqwA" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZQFEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZQVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZQlEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZRFEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZRVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZRlEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_v5uZR1EXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZSFEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZSVEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_v5uZSlEXEeOMYqaaVdNqwA" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZS1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZTFEXEeOMYqaaVdNqwA" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZTlEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZT1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZUFEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZUlEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZU1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZVFEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_v5uZVVEXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZVlEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZV1EXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_v5uZWFEXEeOMYqaaVdNqwA" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZWVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZWlEXEeOMYqaaVdNqwA" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZXFEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZXVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZXlEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZYFEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZYVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZYlEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_v5uZY1EXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZZFEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZZVEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_v5uZZlEXEeOMYqaaVdNqwA" name="Capsulevariablescanonlyhaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZZ1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZaFEXEeOMYqaaVdNqwA" key="body" value="base_Class.ownedAttribute->forAll(at | not(at.oclIsKindOf(uml::Port)) implies (at.visibility = uml::VisibilityKind::protected))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZalEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZa1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZbFEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZblEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZb1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZcFEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_v5uZcVEXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZclEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZc1EXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_v5uZdFEXEeOMYqaaVdNqwA" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZdVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZdlEXEeOMYqaaVdNqwA" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZeFEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZeVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZelEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZfFEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZfVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZflEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_v5uZf1EXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZgFEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZgVEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_v5uZglEXEeOMYqaaVdNqwA" name="SAPsunwiredunpublishedportsmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZg1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZhFEXEeOMYqaaVdNqwA" key="body" value="let saps = base_Class.ownedPort->select(p | not p.isService) in&#xD;&#xA;   (saps->notEmpty()) implies&#xD;&#xA;      saps->forAll(s | s.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZhlEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZh1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZiFEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZilEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZi1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZjFEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_v5uZjVEXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZjlEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZj1EXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_v5uZkFEXEeOMYqaaVdNqwA" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZkVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZklEXEeOMYqaaVdNqwA" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZlFEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZlVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZllEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZmFEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZmVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZmlEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_v5uZm1EXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZnFEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZnVEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_v5uZnlEXEeOMYqaaVdNqwA" name="Acapsuleclassonlysupportsstatemachinebehaviors">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZn1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZoFEXEeOMYqaaVdNqwA" key="body" value="base_Class.classifierBehavior->notEmpty() implies&#xD;&#xA;      (base_Class.classifierBehavior.oclIsTypeOf(StateMachine))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZolEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZo1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZpFEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZplEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZp1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZqFEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_v5uZqVEXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZqlEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZq1EXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_v5uZrFEXEeOMYqaaVdNqwA" 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="_v5uZrlEXEeOMYqaaVdNqwA" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZr1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_v5uZsFEXEeOMYqaaVdNqwA" 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:EAttribute" xmi:id="_v5uZslEXEeOMYqaaVdNqwA" name="isSubstitutable" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_v5uZtFEXEeOMYqaaVdNqwA" name="InEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZtVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_v5uZtlEXEeOMYqaaVdNqwA" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_v5uZuFEXEeOMYqaaVdNqwA" name="OutEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZuVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_v5uZulEXEeOMYqaaVdNqwA" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_v5uZvFEXEeOMYqaaVdNqwA" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZvVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_v5uZvlEXEeOMYqaaVdNqwA" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZv1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZwFEXEeOMYqaaVdNqwA" key="body" value="base_Collaboration.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZwlEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZw1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZxFEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZxlEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZx1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZyFEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_v5uZyVEXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZylEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZy1EXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_v5uZzFEXEeOMYqaaVdNqwA" name="base_Collaboration" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_v5uZzlEXEeOMYqaaVdNqwA" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZz1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_v5uZ0FEXEeOMYqaaVdNqwA" name="Wiredportsmustbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZ0VEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZ0lEXEeOMYqaaVdNqwA" key="body" value="isWired implies base_Port.isService"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZ1FEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZ1VEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZ1lEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZ2FEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZ2VEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZ2lEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_v5uZ21EXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZ3FEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZ3VEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_v5uZ3lEXEeOMYqaaVdNqwA" name="UnwiredUnpublishedportscannotbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZ31EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZ4FEXEeOMYqaaVdNqwA" key="body" value="(not (isWired or isPublish)) implies (not base_Port.isService)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZ4lEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZ41EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZ5FEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uZ5lEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZ51EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uZ6FEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_v5uZ6VEXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZ6lEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uZ61EXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_v5uZ7FEXEeOMYqaaVdNqwA" name="isConjugate" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_v5uZ7lEXEeOMYqaaVdNqwA" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_v5uZ8FEXEeOMYqaaVdNqwA" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_v5uZ8lEXEeOMYqaaVdNqwA" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_v5uZ9FEXEeOMYqaaVdNqwA" name="registration" ordered="false" eType="_v5uZ-lEXEeOMYqaaVdNqwA"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_v5uZ9lEXEeOMYqaaVdNqwA" name="registrationOverride" 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="_v5uZ-FEXEeOMYqaaVdNqwA" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_v5uZ-lEXEeOMYqaaVdNqwA" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uZ-1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_v5uZ_FEXEeOMYqaaVdNqwA" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_v5uZ_VEXEeOMYqaaVdNqwA" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_v5uZ_lEXEeOMYqaaVdNqwA" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_v5uZ_1EXEeOMYqaaVdNqwA" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uaAFEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_v5uaAVEXEeOMYqaaVdNqwA" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uaAlEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uaA1EXEeOMYqaaVdNqwA" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uaBVEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uaBlEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uaB1EXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_v5uaCVEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uaClEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5uaC1EXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_v5uaDFEXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uaDVEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_v5uaDlEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_v5uaD1EXEeOMYqaaVdNqwA" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_v5uaEVEXEeOMYqaaVdNqwA" name="ProtocolContainer">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uaElEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_v5uaE1EXEeOMYqaaVdNqwA" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_v5uaFVEXEeOMYqaaVdNqwA" name="RTRedefinableElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5uaFlEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_v5uaF1EXEeOMYqaaVdNqwA" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_v5uaGVEXEeOMYqaaVdNqwA" name="rootFragment" ordered="false">

-            <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="_YiyuwVEXEeOMYqaaVdNqwA" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_YiyuwFEXEeOMYqaaVdNqwA/8" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyuwlEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yiyuw1EXEeOMYqaaVdNqwA" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi418VEXEeOMYqaaVdNqwA" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi418lEXEeOMYqaaVdNqwA" key="Version" value="0.0.9"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi4181EXEeOMYqaaVdNqwA" key="Comment" value="More fixes"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi419FEXEeOMYqaaVdNqwA" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi419VEXEeOMYqaaVdNqwA" key="Date" value="2013-11-19"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi419lEXEeOMYqaaVdNqwA" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_YiyuxFEXEeOMYqaaVdNqwA" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyuxVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YiyuxlEXEeOMYqaaVdNqwA" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yiyux1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyuyFEXEeOMYqaaVdNqwA" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YiyuylEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yiyuy1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyuzFEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YiyuzlEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yiyuz1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yiyu0FEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yiyu0VEXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yiyu0lEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yiyu01EXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yiyu1FEXEeOMYqaaVdNqwA" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yiyu1VEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yiyu1lEXEeOMYqaaVdNqwA" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yiyu2FEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yiyu2VEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yiyu2lEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yiyu3FEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yiyu3VEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yiyu3lEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yiyu31EXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yiyu4FEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yiyu4VEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yiyu4lEXEeOMYqaaVdNqwA" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yiyu41EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yiyu5FEXEeOMYqaaVdNqwA" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yiyu5lEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yiyu51EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yiyu6FEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yiyu6lEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yiyu61EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yiyu7FEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yiyu7VEXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yiyu7lEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yiyu71EXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yiyu8FEXEeOMYqaaVdNqwA" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yiyu8VEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yiyu8lEXEeOMYqaaVdNqwA" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yiyu9FEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yiyu9VEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yiyu9lEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yiyu-FEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yiyu-VEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yiyu-lEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yiyu-1EXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yiyu_FEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yiyu_VEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yiyu_lEXEeOMYqaaVdNqwA" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yiyu_1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvAFEXEeOMYqaaVdNqwA" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YiyvAlEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvA1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvBFEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YiyvBlEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvB1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvCFEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_YiyvCVEXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YiyvClEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YiyvC1EXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YiyvDFEXEeOMYqaaVdNqwA" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvDVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvDlEXEeOMYqaaVdNqwA" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YiyvEFEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvEVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvElEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YiyvFFEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvFVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvFlEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_YiyvF1EXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YiyvGFEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YiyvGVEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YiyvGlEXEeOMYqaaVdNqwA" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvG1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvHFEXEeOMYqaaVdNqwA" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YiyvHlEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvH1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvIFEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YiyvIlEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvI1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvJFEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_YiyvJVEXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YiyvJlEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YiyvJ1EXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YiyvKFEXEeOMYqaaVdNqwA" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvKVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvKlEXEeOMYqaaVdNqwA" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YiyvLFEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvLVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvLlEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YiyvMFEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvMVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvMlEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_YiyvM1EXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YiyvNFEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YiyvNVEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YiyvNlEXEeOMYqaaVdNqwA" name="Capsulevariablescanonlyhaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvN1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvOFEXEeOMYqaaVdNqwA" key="body" value="base_Class.ownedAttribute->forAll(at | not(at.oclIsKindOf(uml::Port)) implies (at.visibility = uml::VisibilityKind::protected))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YiyvOlEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvO1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvPFEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YiyvPlEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvP1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvQFEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_YiyvQVEXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YiyvQlEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YiyvQ1EXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YiyvRFEXEeOMYqaaVdNqwA" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvRVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvRlEXEeOMYqaaVdNqwA" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YiyvSFEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvSVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvSlEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YiyvTFEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvTVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvTlEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_YiyvT1EXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YiyvUFEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YiyvUVEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YiyvUlEXEeOMYqaaVdNqwA" name="SAPsunwiredunpublishedportsmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvU1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvVFEXEeOMYqaaVdNqwA" key="body" value="let saps = base_Class.ownedPort->select(p | not p.isService) in&#xD;&#xA;   (saps->notEmpty()) implies&#xD;&#xA;      saps->forAll(s | s.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YiyvVlEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvV1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvWFEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YiyvWlEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvW1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvXFEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_YiyvXVEXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YiyvXlEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YiyvX1EXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YiyvYFEXEeOMYqaaVdNqwA" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvYVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvYlEXEeOMYqaaVdNqwA" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YiyvZFEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvZVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvZlEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_YiyvaFEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YiyvaVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvalEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yiyva1EXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YiyvbFEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_YiyvbVEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_YiyvblEXEeOMYqaaVdNqwA" name="Acapsuleclassonlysupportsstatemachinebehaviors">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yiyvb1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiyvcFEXEeOMYqaaVdNqwA" key="body" value="base_Class.classifierBehavior->notEmpty() implies&#xD;&#xA;      (base_Class.classifierBehavior.oclIsTypeOf(StateMachine))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yi41YFEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41YVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi41YlEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yi41ZFEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41ZVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi41ZlEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yi41Z1EXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yi41aFEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yi41aVEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Yi41alEXEeOMYqaaVdNqwA" 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="_Yi41bFEXEeOMYqaaVdNqwA" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41bVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Yi41blEXEeOMYqaaVdNqwA" 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:EAttribute" xmi:id="_Yi41cFEXEeOMYqaaVdNqwA" name="isSubstitutable" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_Yi41clEXEeOMYqaaVdNqwA" name="InEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41c1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Yi41dFEXEeOMYqaaVdNqwA" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Yi41dlEXEeOMYqaaVdNqwA" name="OutEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41d1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Yi41eFEXEeOMYqaaVdNqwA" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Yi41elEXEeOMYqaaVdNqwA" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41e1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yi41fFEXEeOMYqaaVdNqwA" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41fVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi41flEXEeOMYqaaVdNqwA" key="body" value="base_Collaboration.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yi41gFEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41gVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi41glEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yi41hFEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41hVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi41hlEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yi41h1EXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yi41iFEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yi41iVEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Yi41ilEXEeOMYqaaVdNqwA" name="base_Collaboration" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Yi41jFEXEeOMYqaaVdNqwA" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41jVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yi41jlEXEeOMYqaaVdNqwA" name="Wiredportsmustbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41j1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi41kFEXEeOMYqaaVdNqwA" key="body" value="isWired implies base_Port.isService"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yi41klEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41k1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi41lFEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yi41llEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41l1EXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi41mFEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yi41mVEXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yi41mlEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yi41m1EXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yi41nFEXEeOMYqaaVdNqwA" name="UnwiredUnpublishedportscannotbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41nVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi41nlEXEeOMYqaaVdNqwA" key="body" value="(not (isWired or isPublish)) implies (not base_Port.isService)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yi41oFEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41oVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi41olEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yi41pFEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41pVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi41plEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yi41p1EXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yi41qFEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yi41qVEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Yi41qlEXEeOMYqaaVdNqwA" name="isConjugate" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Yi41rFEXEeOMYqaaVdNqwA" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Yi41rlEXEeOMYqaaVdNqwA" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Yi41sFEXEeOMYqaaVdNqwA" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Yi41slEXEeOMYqaaVdNqwA" name="registration" ordered="false" eType="_Yi41uFEXEeOMYqaaVdNqwA"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Yi41tFEXEeOMYqaaVdNqwA" name="registrationOverride" 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="_Yi41tlEXEeOMYqaaVdNqwA" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_Yi41uFEXEeOMYqaaVdNqwA" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41uVEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_Yi41ulEXEeOMYqaaVdNqwA" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_Yi41u1EXEeOMYqaaVdNqwA" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_Yi41vFEXEeOMYqaaVdNqwA" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Yi41vVEXEeOMYqaaVdNqwA" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41vlEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yi41v1EXEeOMYqaaVdNqwA" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41wFEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi41wVEXEeOMYqaaVdNqwA" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yi41w1EXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41xFEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi41xVEXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yi41x1EXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41yFEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi41yVEXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yi41ylEXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yi41y1EXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yi41zFEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Yi41zVEXEeOMYqaaVdNqwA" name="Connectorscanonlyconnecttwoports">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi41zlEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi41z1EXEeOMYqaaVdNqwA" key="body" value="base_Connector.end->forAll(e | &#xD;&#xA;   (e.role.oclIsTypeOf(Port) or &#xD;&#xA;    (e.partWithPort->notEmpty() and e.partWithPort.oclIsKindOf(Port))))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yi410VEXEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi410lEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi4101EXEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Yi411VEXEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi411lEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi4111EXEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Yi412FEXEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yi412VEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Yi412lEXEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Yi4121EXEeOMYqaaVdNqwA" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Yi413VEXEeOMYqaaVdNqwA" name="ProtocolContainer">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi413lEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Yi4131EXEeOMYqaaVdNqwA" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Yi414VEXEeOMYqaaVdNqwA" name="RTRedefinableElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yi414lEXEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Yi4141EXEeOMYqaaVdNqwA" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Yi415VEXEeOMYqaaVdNqwA" name="rootFragment" ordered="false">

-            <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="_pYSXIVEVEeOMYqaaVdNqwA" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_pYSXIFEVEeOMYqaaVdNqwA/7" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXIlEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXI1EVEeOMYqaaVdNqwA" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYYdylEVEeOMYqaaVdNqwA" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYYdy1EVEeOMYqaaVdNqwA" key="Version" value="0.0.8"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYYdzFEVEeOMYqaaVdNqwA" key="Comment" value="Removed composite state machine constraint from Capsule"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYYdzVEVEeOMYqaaVdNqwA" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYYdzlEVEeOMYqaaVdNqwA" key="Date" value="2013-11-19"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYYdz1EVEeOMYqaaVdNqwA" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_pYSXJFEVEeOMYqaaVdNqwA" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXJVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_pYSXJlEVEeOMYqaaVdNqwA" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXJ1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXKFEVEeOMYqaaVdNqwA" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXKlEVEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXK1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXLFEVEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXLlEVEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXL1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXMFEVEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_pYSXMVEVEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXMlEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXM1EVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_pYSXNFEVEeOMYqaaVdNqwA" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXNVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXNlEVEeOMYqaaVdNqwA" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXOFEVEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXOVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXOlEVEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXPFEVEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXPVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXPlEVEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_pYSXP1EVEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXQFEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXQVEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_pYSXQlEVEeOMYqaaVdNqwA" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXQ1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXRFEVEeOMYqaaVdNqwA" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXRlEVEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXR1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXSFEVEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXSlEVEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXS1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXTFEVEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_pYSXTVEVEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXTlEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXT1EVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_pYSXUFEVEeOMYqaaVdNqwA" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXUVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXUlEVEeOMYqaaVdNqwA" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXVFEVEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXVVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXVlEVEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXWFEVEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXWVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXWlEVEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_pYSXW1EVEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXXFEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXXVEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_pYSXXlEVEeOMYqaaVdNqwA" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXX1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXYFEVEeOMYqaaVdNqwA" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXYlEVEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXY1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXZFEVEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXZlEVEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXZ1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXaFEVEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_pYSXaVEVEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXalEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXa1EVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_pYSXbFEVEeOMYqaaVdNqwA" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXbVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXblEVEeOMYqaaVdNqwA" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXcFEVEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXcVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXclEVEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXdFEVEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXdVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXdlEVEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_pYSXd1EVEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXeFEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXeVEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_pYSXelEVEeOMYqaaVdNqwA" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXe1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXfFEVEeOMYqaaVdNqwA" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXflEVEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXf1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXgFEVEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXglEVEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXg1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXhFEVEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_pYSXhVEVEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXhlEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXh1EVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_pYSXiFEVEeOMYqaaVdNqwA" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXiVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXilEVEeOMYqaaVdNqwA" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXjFEVEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXjVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXjlEVEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXkFEVEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXkVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXklEVEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_pYSXk1EVEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXlFEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXlVEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_pYSXllEVEeOMYqaaVdNqwA" name="Capsulevariablescanonlyhaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXl1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXmFEVEeOMYqaaVdNqwA" key="body" value="base_Class.ownedAttribute->forAll(at | not(at.oclIsKindOf(uml::Port)) implies (at.visibility = uml::VisibilityKind::protected))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXmlEVEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXm1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXnFEVEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXnlEVEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXn1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXoFEVEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_pYSXoVEVEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXolEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXo1EVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_pYSXpFEVEeOMYqaaVdNqwA" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXpVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXplEVEeOMYqaaVdNqwA" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXqFEVEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXqVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXqlEVEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXrFEVEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXrVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXrlEVEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_pYSXr1EVEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXsFEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXsVEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_pYSXslEVEeOMYqaaVdNqwA" name="SAPsunwiredunpublishedportsmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXs1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXtFEVEeOMYqaaVdNqwA" key="body" value="let saps = base_Class.ownedPort->select(p | not p.isService) in&#xD;&#xA;   (saps->notEmpty()) implies&#xD;&#xA;      saps->forAll(s | s.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXtlEVEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXt1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXuFEVEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXulEVEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXu1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXvFEVEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_pYSXvVEVEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXvlEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXv1EVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_pYSXwFEVEeOMYqaaVdNqwA" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXwVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXwlEVEeOMYqaaVdNqwA" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXxFEVEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXxVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXxlEVEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSXyFEVEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXyVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSXylEVEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_pYSXy1EVEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXzFEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSXzVEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_pYSXzlEVEeOMYqaaVdNqwA" name="Acapsuleclassonlysupportsstatemachinebehaviors">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSXz1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSX0FEVEeOMYqaaVdNqwA" key="body" value="base_Class.classifierBehavior->notEmpty() implies&#xD;&#xA;      (base_Class.classifierBehavior.oclIsTypeOf(StateMachine))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSX0lEVEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSX01EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSX1FEVEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSX1lEVEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSX11EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSX2FEVEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_pYSX2VEVEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSX2lEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSX21EVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_pYSX3FEVEeOMYqaaVdNqwA" 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="_pYSX3lEVEeOMYqaaVdNqwA" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSX31EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_pYSX4FEVEeOMYqaaVdNqwA" 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:EAttribute" xmi:id="_pYSX4lEVEeOMYqaaVdNqwA" name="isSubstitutable" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_pYSX5FEVEeOMYqaaVdNqwA" name="InEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSX5VEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_pYSX5lEVEeOMYqaaVdNqwA" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_pYSX6FEVEeOMYqaaVdNqwA" name="OutEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSX6VEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_pYSX6lEVEeOMYqaaVdNqwA" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_pYSX7FEVEeOMYqaaVdNqwA" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSX7VEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_pYSX7lEVEeOMYqaaVdNqwA" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSX71EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSX8FEVEeOMYqaaVdNqwA" key="body" value="base_Collaboration.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSX8lEVEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSX81EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSX9FEVEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSX9lEVEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSX91EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSX-FEVEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_pYSX-VEVEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSX-lEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSX-1EVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_pYSX_FEVEeOMYqaaVdNqwA" name="base_Collaboration" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_pYSX_lEVEeOMYqaaVdNqwA" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSX_1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_pYSYAFEVEeOMYqaaVdNqwA" name="Wiredportsmustbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSYAVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSYAlEVEeOMYqaaVdNqwA" key="body" value="isWired implies base_Port.isService"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSYBFEVEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSYBVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSYBlEVEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSYCFEVEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSYCVEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSYClEVEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_pYSYC1EVEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSYDFEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSYDVEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_pYSYDlEVEeOMYqaaVdNqwA" name="UnwiredUnpublishedportscannotbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSYD1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSYEFEVEeOMYqaaVdNqwA" key="body" value="(not (isWired or isPublish)) implies (not base_Port.isService)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSYElEVEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSYE1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSYFFEVEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSYFlEVEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSYF1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSYGFEVEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_pYSYGVEVEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSYGlEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSYG1EVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_pYSYHFEVEeOMYqaaVdNqwA" name="isConjugate" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_pYSYHlEVEeOMYqaaVdNqwA" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_pYSYIFEVEeOMYqaaVdNqwA" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_pYSYIlEVEeOMYqaaVdNqwA" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_pYSYJFEVEeOMYqaaVdNqwA" name="registration" ordered="false" eType="_pYSYKlEVEeOMYqaaVdNqwA"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_pYSYJlEVEeOMYqaaVdNqwA" name="registrationOverride" 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="_pYSYKFEVEeOMYqaaVdNqwA" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_pYSYKlEVEeOMYqaaVdNqwA" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSYK1EVEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_pYSYLFEVEeOMYqaaVdNqwA" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_pYSYLVEVEeOMYqaaVdNqwA" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_pYSYLlEVEeOMYqaaVdNqwA" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_pYSYL1EVEeOMYqaaVdNqwA" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSYMFEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_pYSYMVEVEeOMYqaaVdNqwA" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSYMlEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSYM1EVEeOMYqaaVdNqwA" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSYNVEVEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSYNlEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSYN1EVEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSYOVEVEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSYOlEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSYO1EVEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_pYSYPFEVEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSYPVEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSYPlEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_pYSYP1EVEeOMYqaaVdNqwA" name="Connectorscanonlyconnecttwoports">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSYQFEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSYQVEVEeOMYqaaVdNqwA" key="body" value="base_Connector.end->forAll(e | e.role.oclIsTypeOf(Port))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSYQ1EVEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSYRFEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSYRVEVEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_pYSYR1EVEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSYSFEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYSYSVEVEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_pYSYSlEVEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSYS1EVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_pYSYTFEVEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_pYSYTVEVEeOMYqaaVdNqwA" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_pYSYT1EVEeOMYqaaVdNqwA" name="ProtocolContainer">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSYUFEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_pYSYUVEVEeOMYqaaVdNqwA" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_pYSYU1EVEeOMYqaaVdNqwA" name="RTRedefinableElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYSYVFEVEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_pYSYVVEVEeOMYqaaVdNqwA" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_pYSYV1EVEeOMYqaaVdNqwA" name="rootFragment" ordered="false">

-            <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="_1N3QQVEQEeOMYqaaVdNqwA" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_1N3QQFEQEeOMYqaaVdNqwA/6" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QQlEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QQ1EQEeOMYqaaVdNqwA" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1ODdgFEQEeOMYqaaVdNqwA" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1ODdgVEQEeOMYqaaVdNqwA" key="Version" value="0.0.7"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1ODdglEQEeOMYqaaVdNqwA" key="Comment" value="Revised after checks with alternate OCL editor"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1ODdg1EQEeOMYqaaVdNqwA" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1ODdhFEQEeOMYqaaVdNqwA" key="Date" value="2013-11-19"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1ODdhVEQEeOMYqaaVdNqwA" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_1N3QRFEQEeOMYqaaVdNqwA" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QRVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_1N3QRlEQEeOMYqaaVdNqwA" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QR1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QSFEQEeOMYqaaVdNqwA" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QSlEQEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QS1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QTFEQEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QTlEQEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QT1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QUFEQEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_1N3QUVEQEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3QUlEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3QU1EQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_1N3QVFEQEeOMYqaaVdNqwA" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QVVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QVlEQEeOMYqaaVdNqwA" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QWFEQEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QWVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QWlEQEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QXFEQEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QXVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QXlEQEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_1N3QX1EQEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3QYFEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3QYVEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_1N3QYlEQEeOMYqaaVdNqwA" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QY1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QZFEQEeOMYqaaVdNqwA" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QZlEQEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QZ1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QaFEQEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QalEQEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Qa1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QbFEQEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_1N3QbVEQEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3QblEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3Qb1EQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_1N3QcFEQEeOMYqaaVdNqwA" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QcVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QclEQEeOMYqaaVdNqwA" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QdFEQEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QdVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QdlEQEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QeFEQEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QeVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QelEQEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_1N3Qe1EQEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3QfFEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3QfVEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_1N3QflEQEeOMYqaaVdNqwA" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Qf1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QgFEQEeOMYqaaVdNqwA" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QglEQEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Qg1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QhFEQEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QhlEQEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Qh1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QiFEQEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_1N3QiVEQEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3QilEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3Qi1EQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_1N3QjFEQEeOMYqaaVdNqwA" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QjVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QjlEQEeOMYqaaVdNqwA" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QkFEQEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QkVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QklEQEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QlFEQEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QlVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QllEQEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_1N3Ql1EQEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3QmFEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3QmVEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_1N3QmlEQEeOMYqaaVdNqwA" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Qm1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QnFEQEeOMYqaaVdNqwA" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QnlEQEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Qn1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QoFEQEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QolEQEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Qo1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QpFEQEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_1N3QpVEQEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3QplEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3Qp1EQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_1N3QqFEQEeOMYqaaVdNqwA" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QqVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QqlEQEeOMYqaaVdNqwA" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QrFEQEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QrVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QrlEQEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QsFEQEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QsVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QslEQEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_1N3Qs1EQEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3QtFEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3QtVEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_1N3QtlEQEeOMYqaaVdNqwA" name="Capsulevariablescanonlyhaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Qt1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QuFEQEeOMYqaaVdNqwA" key="body" value="base_Class.ownedAttribute->forAll(at | not(at.oclIsKindOf(uml::Port)) implies (at.visibility = uml::VisibilityKind::protected))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QulEQEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Qu1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QvFEQEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QvlEQEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Qv1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QwFEQEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_1N3QwVEQEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3QwlEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3Qw1EQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_1N3QxFEQEeOMYqaaVdNqwA" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QxVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QxlEQEeOMYqaaVdNqwA" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QyFEQEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QyVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QylEQEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3QzFEQEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3QzVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3QzlEQEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_1N3Qz1EQEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3Q0FEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3Q0VEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_1N3Q0lEQEeOMYqaaVdNqwA" name="SAPsunwiredunpublishedportsmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Q01EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3Q1FEQEeOMYqaaVdNqwA" key="body" value="let saps = base_Class.ownedPort->select(p | not p.isService) in&#xD;&#xA;   (saps->notEmpty()) implies&#xD;&#xA;      saps->forAll(s | s.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3Q1lEQEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Q11EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3Q2FEQEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3Q2lEQEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Q21EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3Q3FEQEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_1N3Q3VEQEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3Q3lEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3Q31EQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_1N3Q4FEQEeOMYqaaVdNqwA" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Q4VEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3Q4lEQEeOMYqaaVdNqwA" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3Q5FEQEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Q5VEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3Q5lEQEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3Q6FEQEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Q6VEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3Q6lEQEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_1N3Q61EQEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3Q7FEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3Q7VEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_1N3Q7lEQEeOMYqaaVdNqwA" name="Acapsuleclassonlysupportsstatemachinebehaviors">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Q71EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3Q8FEQEeOMYqaaVdNqwA" key="body" value="base_Class.classifierBehavior->notEmpty() implies&#xD;&#xA;      (base_Class.classifierBehavior.oclIsTypeOf(StateMachine))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3Q8lEQEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Q81EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3Q9FEQEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3Q9lEQEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Q91EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3Q-FEQEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_1N3Q-VEQEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3Q-lEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3Q-1EQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1N3Q_FEQEeOMYqaaVdNqwA" 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="_1N3Q_lEQEeOMYqaaVdNqwA" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3Q_1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1N3RAFEQEeOMYqaaVdNqwA" 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:EAttribute" xmi:id="_1N3RAlEQEeOMYqaaVdNqwA" name="isSubstitutable" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_1N3RBFEQEeOMYqaaVdNqwA" name="InEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RBVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1N3RBlEQEeOMYqaaVdNqwA" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_1N3RCFEQEeOMYqaaVdNqwA" name="OutEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RCVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1N3RClEQEeOMYqaaVdNqwA" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_1N3RDFEQEeOMYqaaVdNqwA" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RDVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_1N3RDlEQEeOMYqaaVdNqwA" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RD1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3REFEQEeOMYqaaVdNqwA" key="body" value="base_Collaboration.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3RElEQEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RE1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3RFFEQEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3RFlEQEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RF1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3RGFEQEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_1N3RGVEQEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3RGlEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3RG1EQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1N3RHFEQEeOMYqaaVdNqwA" name="base_Collaboration" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_1N3RHlEQEeOMYqaaVdNqwA" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RH1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_1N3RIFEQEeOMYqaaVdNqwA" name="Wiredportsmustbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RIVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3RIlEQEeOMYqaaVdNqwA" key="body" value="isWired implies base_Port.isService"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3RJFEQEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RJVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3RJlEQEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3RKFEQEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RKVEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3RKlEQEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_1N3RK1EQEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3RLFEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3RLVEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_1N3RLlEQEeOMYqaaVdNqwA" name="UnwiredUnpublishedportscannotbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RL1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3RMFEQEeOMYqaaVdNqwA" key="body" value="(not (isWired or isPublish)) implies (not base_Port.isService)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3RMlEQEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RM1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3RNFEQEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3RNlEQEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RN1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3ROFEQEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_1N3ROVEQEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3ROlEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3RO1EQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_1N3RPFEQEeOMYqaaVdNqwA" name="isConjugate" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_1N3RPlEQEeOMYqaaVdNqwA" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_1N3RQFEQEeOMYqaaVdNqwA" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_1N3RQlEQEeOMYqaaVdNqwA" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_1N3RRFEQEeOMYqaaVdNqwA" name="registration" ordered="false" eType="_1N3RSlEQEeOMYqaaVdNqwA"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_1N3RRlEQEeOMYqaaVdNqwA" name="registrationOverride" 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="_1N3RSFEQEeOMYqaaVdNqwA" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_1N3RSlEQEeOMYqaaVdNqwA" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RS1EQEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_1N3RTFEQEeOMYqaaVdNqwA" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_1N3RTVEQEeOMYqaaVdNqwA" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_1N3RTlEQEeOMYqaaVdNqwA" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_1N3RT1EQEeOMYqaaVdNqwA" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RUFEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_1N3RUVEQEeOMYqaaVdNqwA" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RUlEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3RU1EQEeOMYqaaVdNqwA" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3RVVEQEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RVlEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3RV1EQEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3RWVEQEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RWlEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3RW1EQEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_1N3RXFEQEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3RXVEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3RXlEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_1N3RX1EQEeOMYqaaVdNqwA" name="Connectorscanonlyconnecttwoports">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RYFEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3RYVEQEeOMYqaaVdNqwA" key="body" value="base_Connector.end->forAll(e | e.role.oclIsTypeOf(Port))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3RY1EQEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RZFEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3RZVEQEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_1N3RZ1EQEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RaFEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1N3RaVEQEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_1N3RalEQEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3Ra1EQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_1N3RbFEQEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1N3RbVEQEeOMYqaaVdNqwA" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_1N3Rb1EQEeOMYqaaVdNqwA" name="ProtocolContainer">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RcFEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1N3RcVEQEeOMYqaaVdNqwA" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_1N3Rc1EQEeOMYqaaVdNqwA" name="RTRedefinableElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1N3RdFEQEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1N3RdVEQEeOMYqaaVdNqwA" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1N3Rd1EQEeOMYqaaVdNqwA" name="rootFragment" ordered="false">

-            <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="_Eg1FAVEGEeOMYqaaVdNqwA" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_Eg1FAFEGEeOMYqaaVdNqwA/5" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FAlEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FA1EGEeOMYqaaVdNqwA" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg7LqlEGEeOMYqaaVdNqwA" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg7Lq1EGEeOMYqaaVdNqwA" key="Version" value="0.0.6"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg7LrFEGEeOMYqaaVdNqwA" key="Comment" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg7LrVEGEeOMYqaaVdNqwA" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg7LrlEGEeOMYqaaVdNqwA" key="Date" value="2013-11-19"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg7Lr1EGEeOMYqaaVdNqwA" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Eg1FBFEGEeOMYqaaVdNqwA" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FBVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Eg1FBlEGEeOMYqaaVdNqwA" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FB1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FCFEGEeOMYqaaVdNqwA" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FClEGEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FC1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FDFEGEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FDlEGEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FD1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FEFEGEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Eg1FEVEGEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FElEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FE1EGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Eg1FFFEGEeOMYqaaVdNqwA" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FFVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FFlEGEeOMYqaaVdNqwA" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FGFEGEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FGVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FGlEGEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FHFEGEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FHVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FHlEGEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Eg1FH1EGEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FIFEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FIVEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Eg1FIlEGEeOMYqaaVdNqwA" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FI1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FJFEGEeOMYqaaVdNqwA" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FJlEGEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FJ1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FKFEGEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FKlEGEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FK1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FLFEGEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Eg1FLVEGEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FLlEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FL1EGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Eg1FMFEGEeOMYqaaVdNqwA" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FMVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FMlEGEeOMYqaaVdNqwA" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FNFEGEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FNVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FNlEGEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FOFEGEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FOVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FOlEGEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Eg1FO1EGEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FPFEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FPVEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Eg1FPlEGEeOMYqaaVdNqwA" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FP1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FQFEGEeOMYqaaVdNqwA" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FQlEGEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FQ1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FRFEGEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FRlEGEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FR1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FSFEGEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Eg1FSVEGEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FSlEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FS1EGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Eg1FTFEGEeOMYqaaVdNqwA" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FTVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FTlEGEeOMYqaaVdNqwA" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FUFEGEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FUVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FUlEGEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FVFEGEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FVVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FVlEGEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Eg1FV1EGEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FWFEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FWVEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Eg1FWlEGEeOMYqaaVdNqwA" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FW1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FXFEGEeOMYqaaVdNqwA" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FXlEGEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FX1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FYFEGEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FYlEGEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FY1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FZFEGEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Eg1FZVEGEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FZlEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FZ1EGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Eg1FaFEGEeOMYqaaVdNqwA" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FaVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FalEGEeOMYqaaVdNqwA" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FbFEGEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FbVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FblEGEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FcFEGEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FcVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FclEGEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Eg1Fc1EGEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FdFEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FdVEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Eg1FdlEGEeOMYqaaVdNqwA" name="Capsulevariablescanonlyhaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1Fd1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FeFEGEeOMYqaaVdNqwA" key="body" value="base_Class.ownedAttribute->forAll(at | not(at.oclIsKindOf(uml::Port)) implies (at.visibility = uml::VisibilityKind::protected))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FelEGEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1Fe1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FfFEGEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FflEGEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1Ff1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FgFEGEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Eg1FgVEGEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FglEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1Fg1EGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Eg1FhFEGEeOMYqaaVdNqwA" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FhVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FhlEGEeOMYqaaVdNqwA" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FiFEGEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FiVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FilEGEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FjFEGEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FjVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FjlEGEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Eg1Fj1EGEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FkFEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FkVEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Eg1FklEGEeOMYqaaVdNqwA" name="SAPsunwiredunpublishedportsmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1Fk1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FlFEGEeOMYqaaVdNqwA" key="body" value="let saps = base_Class.ownedPort->select(p | not p.isService) in&#xD;&#xA;   (saps->notEmpty()) implies&#xD;&#xA;      saps->forAll(s | s.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FllEGEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1Fl1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FmFEGEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FmlEGEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1Fm1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FnFEGEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Eg1FnVEGEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FnlEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1Fn1EGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Eg1FoFEGEeOMYqaaVdNqwA" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FoVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FolEGEeOMYqaaVdNqwA" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FpFEGEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FpVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FplEGEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FqFEGEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FqVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FqlEGEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Eg1Fq1EGEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FrFEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FrVEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Eg1FrlEGEeOMYqaaVdNqwA" name="Acapsuleclassonlysupportsstatemachinebehaviors">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1Fr1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FsFEGEeOMYqaaVdNqwA" key="body" value="base_Class.classifierBehavior->notEmpty() implies&#xD;&#xA;      (base_Class.classifierBehavior.oclIsTypeOf(StateMachine))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FslEGEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1Fs1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FtFEGEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1FtlEGEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1Ft1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1FuFEGEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Eg1FuVEGEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1FulEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1Fu1EGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Eg1FvFEGEeOMYqaaVdNqwA" 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="_Eg1FvlEGEeOMYqaaVdNqwA" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1Fv1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Eg1FwFEGEeOMYqaaVdNqwA" 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:EAttribute" xmi:id="_Eg1FwlEGEeOMYqaaVdNqwA" name="isSubstitutable" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_Eg1FxFEGEeOMYqaaVdNqwA" name="InEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FxVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Eg1FxlEGEeOMYqaaVdNqwA" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Eg1FyFEGEeOMYqaaVdNqwA" name="OutEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FyVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Eg1FylEGEeOMYqaaVdNqwA" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Eg1FzFEGEeOMYqaaVdNqwA" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1FzVEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Eg1FzlEGEeOMYqaaVdNqwA" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1Fz1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1F0FEGEeOMYqaaVdNqwA" key="body" value="base_Collaboration.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1F0lEGEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1F01EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1F1FEGEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1F1lEGEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1F11EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1F2FEGEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Eg1F2VEGEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1F2lEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1F21EGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Eg1F3FEGEeOMYqaaVdNqwA" name="base_Collaboration" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Eg1F3lEGEeOMYqaaVdNqwA" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1F31EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Eg1F4FEGEeOMYqaaVdNqwA" name="Wiredportsmustbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1F4VEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1F4lEGEeOMYqaaVdNqwA" key="body" value="isWired implies base_Port.isService"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1F5FEGEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1F5VEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1F5lEGEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1F6FEGEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1F6VEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1F6lEGEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Eg1F61EGEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1F7FEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1F7VEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Eg1F7lEGEeOMYqaaVdNqwA" name="UnwiredUnpublishedportscannotbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1F71EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1F8FEGEeOMYqaaVdNqwA" key="body" value="(not (isWired or isPublish)) implies (not base_Port.isService)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1F8lEGEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1F81EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1F9FEGEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1F9lEGEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1F91EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1F-FEGEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Eg1F-VEGEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1F-lEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1F-1EGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Eg1F_FEGEeOMYqaaVdNqwA" name="isConjugate" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Eg1F_lEGEeOMYqaaVdNqwA" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Eg1GAFEGEeOMYqaaVdNqwA" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Eg1GAlEGEeOMYqaaVdNqwA" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Eg1GBFEGEeOMYqaaVdNqwA" name="registration" ordered="false" eType="_Eg1GClEGEeOMYqaaVdNqwA"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Eg1GBlEGEeOMYqaaVdNqwA" name="registrationOverride" 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="_Eg1GCFEGEeOMYqaaVdNqwA" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_Eg1GClEGEeOMYqaaVdNqwA" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1GC1EGEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_Eg1GDFEGEeOMYqaaVdNqwA" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_Eg1GDVEGEeOMYqaaVdNqwA" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_Eg1GDlEGEeOMYqaaVdNqwA" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Eg1GD1EGEeOMYqaaVdNqwA" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1GEFEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Eg1GEVEGEeOMYqaaVdNqwA" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1GElEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1GE1EGEeOMYqaaVdNqwA" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1GFVEGEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1GFlEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1GF1EGEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1GGVEGEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1GGlEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1GG1EGEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Eg1GHFEGEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1GHVEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1GHlEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_Eg1GH1EGEeOMYqaaVdNqwA" name="Connectorscanonlyconnecttwoports">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1GIFEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1GIVEGEeOMYqaaVdNqwA" key="body" value="base_Connector.end->forAll(e | e.role.oclIsTypeOf(uml::Port))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1GI1EGEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1GJFEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1GJVEGEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Eg1GJ1EGEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1GKFEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1GKVEGEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_Eg1GKlEGEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1GK1EGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_Eg1GLFEGEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Eg1GLVEGEeOMYqaaVdNqwA" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Eg1GL1EGEeOMYqaaVdNqwA" name="ProtocolContainer">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1GMFEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Eg1GMVEGEeOMYqaaVdNqwA" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_Eg1GM1EGEeOMYqaaVdNqwA" name="RTRedefinableElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eg1GNFEGEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Eg1GNVEGEeOMYqaaVdNqwA" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Eg1GN1EGEeOMYqaaVdNqwA" name="rootFragment" ordered="false">

-            <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="_l3XBUVEFEeOMYqaaVdNqwA" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_l3XBUFEFEeOMYqaaVdNqwA/4" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBUlEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBU1EFEeOMYqaaVdNqwA" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCoVEFEeOMYqaaVdNqwA" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XColEFEeOMYqaaVdNqwA" key="Version" value="0.0.5"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCo1EFEeOMYqaaVdNqwA" key="Comment" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCpFEFEeOMYqaaVdNqwA" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCpVEFEeOMYqaaVdNqwA" key="Date" value="2013-11-19"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCplEFEeOMYqaaVdNqwA" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_l3XBVFEFEeOMYqaaVdNqwA" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBVVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_l3XBVlEFEeOMYqaaVdNqwA" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBV1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBWFEFEeOMYqaaVdNqwA" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XBWlEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBW1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBXFEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XBXlEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBX1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBYFEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_l3XBYVEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XBYlEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XBY1EFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_l3XBZFEFEeOMYqaaVdNqwA" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBZVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBZlEFEeOMYqaaVdNqwA" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XBaFEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBaVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBalEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XBbFEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBbVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBblEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_l3XBb1EFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XBcFEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XBcVEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_l3XBclEFEeOMYqaaVdNqwA" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBc1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBdFEFEeOMYqaaVdNqwA" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XBdlEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBd1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBeFEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XBelEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBe1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBfFEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_l3XBfVEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XBflEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XBf1EFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_l3XBgFEFEeOMYqaaVdNqwA" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBgVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBglEFEeOMYqaaVdNqwA" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XBhFEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBhVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBhlEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XBiFEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBiVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBilEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_l3XBi1EFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XBjFEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XBjVEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_l3XBjlEFEeOMYqaaVdNqwA" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBj1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBkFEFEeOMYqaaVdNqwA" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XBklEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBk1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBlFEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XBllEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBl1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBmFEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_l3XBmVEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XBmlEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XBm1EFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_l3XBnFEFEeOMYqaaVdNqwA" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBnVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBnlEFEeOMYqaaVdNqwA" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XBoFEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBoVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBolEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XBpFEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBpVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBplEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_l3XBp1EFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XBqFEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XBqVEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_l3XBqlEFEeOMYqaaVdNqwA" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBq1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBrFEFEeOMYqaaVdNqwA" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XBrlEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBr1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBsFEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XBslEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBs1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBtFEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_l3XBtVEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XBtlEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XBt1EFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_l3XBuFEFEeOMYqaaVdNqwA" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBuVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBulEFEeOMYqaaVdNqwA" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XBvFEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBvVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBvlEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XBwFEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBwVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBwlEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_l3XBw1EFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XBxFEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XBxVEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_l3XBxlEFEeOMYqaaVdNqwA" name="Capsulevariablescanonlyhaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBx1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XByFEFEeOMYqaaVdNqwA" key="body" value="base_Class.ownedAttribute->forAll(at | not(at.oclIsKindOf(uml::Port)) implies (at.visibility = VisibilityKind::protected))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XBylEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBy1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XBzFEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XBzlEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XBz1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XB0FEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_l3XB0VEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XB0lEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XB01EFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_l3XB1FEFEeOMYqaaVdNqwA" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XB1VEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XB1lEFEeOMYqaaVdNqwA" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XB2FEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XB2VEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XB2lEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XB3FEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XB3VEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XB3lEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_l3XB31EFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XB4FEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XB4VEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_l3XB4lEFEeOMYqaaVdNqwA" name="Combinedstatemachineconstraintsforcapsules">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XB41EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XB5FEFEeOMYqaaVdNqwA" key="body" value="let sm = base_Class.classifierBehavior in &#xD;&#xA;sm->notEmpty() implies&#xD;&#xA;   (sm.oclIsTypeOf(uml::StateMachine) -- only state machines allowed&#xD;&#xA;   and (not sm.isReentrant)                   -- no re-entrant behavior&#xD;&#xA;   and (not sm.ownedParameter->isEmpty()) -- no parameters&#xD;&#xA;   and (sm.region->size() = 1) )              -- only a single region allowed "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XB5lEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XB51EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XB6FEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XB6lEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XB61EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XB7FEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_l3XB7VEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XB7lEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XB71EFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_l3XB8FEFEeOMYqaaVdNqwA" name="SAPsunwiredunpublishedportsmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XB8VEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XB8lEFEeOMYqaaVdNqwA" key="body" value="let saps = base_Class.ownedPort->select(p | not p.isService) in&#xD;&#xA;   (saps->notEmpty()) implies&#xD;&#xA;      saps->forAll(s | s.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XB9FEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XB9VEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XB9lEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XB-FEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XB-VEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XB-lEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_l3XB-1EFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XB_FEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XB_VEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_l3XB_lEFEeOMYqaaVdNqwA" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XB_1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCAFEFEeOMYqaaVdNqwA" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XCAlEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCA1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCBFEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XCBlEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCB1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCCFEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_l3XCCVEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XCClEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XCC1EFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_l3XCDFEFEeOMYqaaVdNqwA" name="Acapsuleclassonlysupportsstatemachinebehaviors">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCDVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCDlEFEeOMYqaaVdNqwA" key="body" value="base_Class.classifierBehavior->notEmpty() implies&#xD;&#xA;      (base_Class.classifierBehavior.oclIsTypeOf(StateMachine))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XCEFEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCEVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCElEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XCFFEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCFVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCFlEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_l3XCF1EFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XCGFEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XCGVEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_l3XCGlEFEeOMYqaaVdNqwA" 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="_l3XCHFEFEeOMYqaaVdNqwA" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCHVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_l3XCHlEFEeOMYqaaVdNqwA" 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:EAttribute" xmi:id="_l3XCIFEFEeOMYqaaVdNqwA" name="isSubstitutable" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_l3XCIlEFEeOMYqaaVdNqwA" name="InEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCI1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_l3XCJFEFEeOMYqaaVdNqwA" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_l3XCJlEFEeOMYqaaVdNqwA" name="OutEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCJ1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_l3XCKFEFEeOMYqaaVdNqwA" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_l3XCKlEFEeOMYqaaVdNqwA" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCK1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_l3XCLFEFEeOMYqaaVdNqwA" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCLVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCLlEFEeOMYqaaVdNqwA" key="body" value="base_Collaboration.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XCMFEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCMVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCMlEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XCNFEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCNVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCNlEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_l3XCN1EFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XCOFEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XCOVEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_l3XCOlEFEeOMYqaaVdNqwA" name="base_Collaboration" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_l3XCPFEFEeOMYqaaVdNqwA" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCPVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_l3XCPlEFEeOMYqaaVdNqwA" name="Wiredportsmustbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCP1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCQFEFEeOMYqaaVdNqwA" key="body" value="isWired implies base_Port.isService"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XCQlEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCQ1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCRFEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XCRlEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCR1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCSFEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_l3XCSVEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XCSlEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XCS1EFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_l3XCTFEFEeOMYqaaVdNqwA" name="UnwiredUnpublishedportscannotbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCTVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCTlEFEeOMYqaaVdNqwA" key="body" value="(not (isWired or isPublish)) implies (not base_Port.isService)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XCUFEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCUVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCUlEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XCVFEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCVVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCVlEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_l3XCV1EFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XCWFEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XCWVEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_l3XCWlEFEeOMYqaaVdNqwA" name="isConjugate" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_l3XCXFEFEeOMYqaaVdNqwA" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_l3XCXlEFEeOMYqaaVdNqwA" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_l3XCYFEFEeOMYqaaVdNqwA" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_l3XCYlEFEeOMYqaaVdNqwA" name="registration" ordered="false" eType="_l3XCaFEFEeOMYqaaVdNqwA"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_l3XCZFEFEeOMYqaaVdNqwA" name="registrationOverride" 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="_l3XCZlEFEeOMYqaaVdNqwA" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_l3XCaFEFEeOMYqaaVdNqwA" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCaVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_l3XCalEFEeOMYqaaVdNqwA" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_l3XCa1EFEeOMYqaaVdNqwA" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_l3XCbFEFEeOMYqaaVdNqwA" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_l3XCbVEFEeOMYqaaVdNqwA" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCblEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_l3XCb1EFEeOMYqaaVdNqwA" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCcFEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCcVEFEeOMYqaaVdNqwA" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XCc1EFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCdFEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCdVEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XCd1EFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCeFEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCeVEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_l3XCelEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XCe1EFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XCfFEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_l3XCfVEFEeOMYqaaVdNqwA" name="Connectorscanonlyconnecttwoports">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCflEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCf1EFEeOMYqaaVdNqwA" key="body" value="base_Connector.end->forAll(e | e.role.oclIsTypeOf(uml::Port))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XCgVEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCglEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCg1EFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_l3XChVEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XChlEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l3XCh1EFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_l3XCiFEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XCiVEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_l3XCilEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_l3XCi1EFEeOMYqaaVdNqwA" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_l3XCjVEFEeOMYqaaVdNqwA" name="ProtocolContainer">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCjlEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_l3XCj1EFEeOMYqaaVdNqwA" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_l3XCkVEFEeOMYqaaVdNqwA" name="RTRedefinableElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l3XCklEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_l3XCk1EFEeOMYqaaVdNqwA" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_l3XClVEFEeOMYqaaVdNqwA" name="rootFragment" ordered="false">

-            <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="_PL-1kVEFEeOMYqaaVdNqwA" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_PL-1kFEFEeOMYqaaVdNqwA/3" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-1klEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-1k1EFEeOMYqaaVdNqwA" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PME8OlEFEeOMYqaaVdNqwA" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PME8O1EFEeOMYqaaVdNqwA" key="Version" value="0.0.4"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PME8PFEFEeOMYqaaVdNqwA" key="Comment" value="Playing with VisibilityKind"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PME8PVEFEeOMYqaaVdNqwA" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PME8PlEFEeOMYqaaVdNqwA" key="Date" value="2013-11-19"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PME8P1EFEeOMYqaaVdNqwA" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_PL-1lFEFEeOMYqaaVdNqwA" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-1lVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_PL-1llEFEeOMYqaaVdNqwA" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-1l1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-1mFEFEeOMYqaaVdNqwA" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-1mlEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-1m1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-1nFEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-1nlEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-1n1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-1oFEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_PL-1oVEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-1olEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-1o1EFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_PL-1pFEFEeOMYqaaVdNqwA" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-1pVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-1plEFEeOMYqaaVdNqwA" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-1qFEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-1qVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-1qlEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-1rFEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-1rVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-1rlEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_PL-1r1EFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-1sFEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-1sVEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_PL-1slEFEeOMYqaaVdNqwA" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-1s1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-1tFEFEeOMYqaaVdNqwA" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-1tlEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-1t1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-1uFEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-1ulEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-1u1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-1vFEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_PL-1vVEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-1vlEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-1v1EFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_PL-1wFEFEeOMYqaaVdNqwA" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-1wVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-1wlEFEeOMYqaaVdNqwA" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-1xFEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-1xVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-1xlEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-1yFEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-1yVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-1ylEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_PL-1y1EFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-1zFEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-1zVEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_PL-1zlEFEeOMYqaaVdNqwA" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-1z1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-10FEFEeOMYqaaVdNqwA" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-10lEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-101EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-11FEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-11lEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-111EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-12FEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_PL-12VEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-12lEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-121EFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_PL-13FEFEeOMYqaaVdNqwA" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-13VEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-13lEFEeOMYqaaVdNqwA" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-14FEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-14VEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-14lEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-15FEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-15VEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-15lEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_PL-151EFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-16FEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-16VEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_PL-16lEFEeOMYqaaVdNqwA" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-161EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-17FEFEeOMYqaaVdNqwA" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-17lEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-171EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-18FEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-18lEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-181EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-19FEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_PL-19VEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-19lEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-191EFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_PL-1-FEFEeOMYqaaVdNqwA" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-1-VEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-1-lEFEeOMYqaaVdNqwA" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-1_FEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-1_VEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-1_lEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2AFEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2AVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2AlEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_PL-2A1EFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2BFEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2BVEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_PL-2BlEFEeOMYqaaVdNqwA" name="Capsulevariablescanonlyhaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2B1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2CFEFEeOMYqaaVdNqwA" key="body" value="base_Class.ownedAttribute->forAll(at | not(at.oclIsKindOf(uml::Port)) implies (at.visibility = uml::VisibilityKind::protected))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2ClEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2C1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2DFEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2DlEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2D1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2EFEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_PL-2EVEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2ElEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2E1EFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_PL-2FFEFEeOMYqaaVdNqwA" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2FVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2FlEFEeOMYqaaVdNqwA" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2GFEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2GVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2GlEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2HFEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2HVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2HlEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_PL-2H1EFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2IFEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2IVEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_PL-2IlEFEeOMYqaaVdNqwA" name="Combinedstatemachineconstraintsforcapsules">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2I1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2JFEFEeOMYqaaVdNqwA" key="body" value="let sm = base_Class.classifierBehavior in &#xD;&#xA;sm->notEmpty() implies&#xD;&#xA;   (sm.oclIsTypeOf(uml::StateMachine) -- only state machines allowed&#xD;&#xA;   and (not sm.isReentrant)                   -- no re-entrant behavior&#xD;&#xA;   and (not sm.ownedParameter->isEmpty()) -- no parameters&#xD;&#xA;   and (sm.region->size() = 1) )              -- only a single region allowed "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2JlEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2J1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2KFEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2KlEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2K1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2LFEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_PL-2LVEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2LlEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2L1EFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_PL-2MFEFEeOMYqaaVdNqwA" name="SAPsunwiredunpublishedportsmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2MVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2MlEFEeOMYqaaVdNqwA" key="body" value="let saps = base_Class.ownedPort->select(p | not p.isService) in&#xD;&#xA;   (saps->notEmpty()) implies&#xD;&#xA;      saps->forAll(s | s.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2NFEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2NVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2NlEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2OFEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2OVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2OlEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_PL-2O1EFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2PFEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2PVEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_PL-2PlEFEeOMYqaaVdNqwA" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2P1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2QFEFEeOMYqaaVdNqwA" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2QlEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2Q1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2RFEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2RlEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2R1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2SFEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_PL-2SVEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2SlEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2S1EFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_PL-2TFEFEeOMYqaaVdNqwA" name="Acapsuleclassonlysupportsstatemachinebehaviors">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2TVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2TlEFEeOMYqaaVdNqwA" key="body" value="base_Class.classifierBehavior->notEmpty() implies&#xD;&#xA;      (base_Class.classifierBehavior.oclIsTypeOf(StateMachine))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2UFEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2UVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2UlEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2VFEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2VVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2VlEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_PL-2V1EFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2WFEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2WVEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PL-2WlEFEeOMYqaaVdNqwA" 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="_PL-2XFEFEeOMYqaaVdNqwA" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2XVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PL-2XlEFEeOMYqaaVdNqwA" 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:EAttribute" xmi:id="_PL-2YFEFEeOMYqaaVdNqwA" name="isSubstitutable" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_PL-2YlEFEeOMYqaaVdNqwA" name="InEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2Y1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PL-2ZFEFEeOMYqaaVdNqwA" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_PL-2ZlEFEeOMYqaaVdNqwA" name="OutEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2Z1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PL-2aFEFEeOMYqaaVdNqwA" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_PL-2alEFEeOMYqaaVdNqwA" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2a1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_PL-2bFEFEeOMYqaaVdNqwA" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2bVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2blEFEeOMYqaaVdNqwA" key="body" value="base_Collaboration.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2cFEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2cVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2clEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2dFEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2dVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2dlEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_PL-2d1EFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2eFEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2eVEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PL-2elEFEeOMYqaaVdNqwA" name="base_Collaboration" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_PL-2fFEFEeOMYqaaVdNqwA" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2fVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_PL-2flEFEeOMYqaaVdNqwA" name="Wiredportsmustbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2f1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2gFEFEeOMYqaaVdNqwA" key="body" value="isWired implies base_Port.isService"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2glEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2g1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2hFEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2hlEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2h1EFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2iFEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_PL-2iVEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2ilEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2i1EFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_PL-2jFEFEeOMYqaaVdNqwA" name="UnwiredUnpublishedportscannotbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2jVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2jlEFEeOMYqaaVdNqwA" key="body" value="(not (isWired or isPublish)) implies (not base_Port.isService)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2kFEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2kVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2klEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2lFEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2lVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2llEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_PL-2l1EFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2mFEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2mVEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_PL-2mlEFEeOMYqaaVdNqwA" name="isConjugate" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_PL-2nFEFEeOMYqaaVdNqwA" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_PL-2nlEFEeOMYqaaVdNqwA" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_PL-2oFEFEeOMYqaaVdNqwA" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_PL-2olEFEeOMYqaaVdNqwA" name="registration" ordered="false" eType="_PL-2qFEFEeOMYqaaVdNqwA"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_PL-2pFEFEeOMYqaaVdNqwA" name="registrationOverride" 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="_PL-2plEFEeOMYqaaVdNqwA" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_PL-2qFEFEeOMYqaaVdNqwA" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2qVEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_PL-2qlEFEeOMYqaaVdNqwA" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_PL-2q1EFEeOMYqaaVdNqwA" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_PL-2rFEFEeOMYqaaVdNqwA" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_PL-2rVEFEeOMYqaaVdNqwA" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2rlEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_PL-2r1EFEeOMYqaaVdNqwA" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2sFEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2sVEFEeOMYqaaVdNqwA" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2s1EFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2tFEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2tVEFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2t1EFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2uFEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2uVEFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_PL-2ulEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2u1EFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2vFEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_PL-2vVEFEeOMYqaaVdNqwA" name="Connectorscanonlyconnecttwoports">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2vlEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2v1EFEeOMYqaaVdNqwA" key="body" value="base_Connector.end->forAll(e | e.role.oclIsTypeOf(uml::Port))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2wVEFEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2wlEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2w1EFEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_PL-2xVEFEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2xlEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PL-2x1EFEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_PL-2yFEFEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2yVEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_PL-2ylEFEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PL-2y1EFEeOMYqaaVdNqwA" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_PL-2zVEFEeOMYqaaVdNqwA" name="ProtocolContainer">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-2zlEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PL-2z1EFEeOMYqaaVdNqwA" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_PL-20VEFEeOMYqaaVdNqwA" name="RTRedefinableElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PL-20lEFEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PL-201EFEeOMYqaaVdNqwA" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PL-21VEFEeOMYqaaVdNqwA" name="rootFragment" ordered="false">

-            <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="_czELwFEEEeOMYqaaVdNqwA" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_cy-FIFEEEeOMYqaaVdNqwA/2" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czELwVEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czELwlEEEeOMYqaaVdNqwA" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czENEFEEEeOMYqaaVdNqwA" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czENEVEEEeOMYqaaVdNqwA" key="Version" value="0.0.3"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czENElEEEeOMYqaaVdNqwA" key="Comment" value="Imported enumerations used in the constraints"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czENE1EEEeOMYqaaVdNqwA" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czENFFEEEeOMYqaaVdNqwA" key="Date" value="2013-11-19"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czENFVEEEeOMYqaaVdNqwA" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_czELw1EEEeOMYqaaVdNqwA" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czELxFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_czELxVEEEeOMYqaaVdNqwA" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czELxlEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czELx1EEEeOMYqaaVdNqwA" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czELyVEEEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czELylEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czELy1EEEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czELzVEEEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czELzlEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czELz1EEEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_czEL0FEEEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEL0VEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEL0lEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_czEL01EEEeOMYqaaVdNqwA" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEL1FEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEL1VEEEeOMYqaaVdNqwA" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEL11EEEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEL2FEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEL2VEEEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEL21EEEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEL3FEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEL3VEEEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_czEL3lEEEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEL31EEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEL4FEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_czEL4VEEEeOMYqaaVdNqwA" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEL4lEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEL41EEEeOMYqaaVdNqwA" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEL5VEEEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEL5lEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEL51EEEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEL6VEEEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEL6lEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEL61EEEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_czEL7FEEEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEL7VEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEL7lEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_czEL71EEEeOMYqaaVdNqwA" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEL8FEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEL8VEEEeOMYqaaVdNqwA" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEL81EEEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEL9FEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEL9VEEEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEL91EEEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEL-FEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEL-VEEEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_czEL-lEEEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEL-1EEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEL_FEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_czEL_VEEEeOMYqaaVdNqwA" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEL_lEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEL_1EEEeOMYqaaVdNqwA" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMAVEEEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMAlEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMA1EEEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMBVEEEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMBlEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMB1EEEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_czEMCFEEEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMCVEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMClEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_czEMC1EEEeOMYqaaVdNqwA" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMDFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMDVEEEeOMYqaaVdNqwA" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMD1EEEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMEFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMEVEEEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEME1EEEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMFFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMFVEEEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_czEMFlEEEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMF1EEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMGFEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_czEMGVEEEeOMYqaaVdNqwA" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMGlEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMG1EEEeOMYqaaVdNqwA" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMHVEEEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMHlEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMH1EEEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMIVEEEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMIlEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMI1EEEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_czEMJFEEEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMJVEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMJlEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_czEMJ1EEEeOMYqaaVdNqwA" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMKFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMKVEEEeOMYqaaVdNqwA" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMK1EEEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMLFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMLVEEEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEML1EEEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMMFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMMVEEEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_czEMMlEEEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMM1EEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMNFEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_czEMNVEEEeOMYqaaVdNqwA" name="Capsulevariablescanonlyhaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMNlEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMN1EEEeOMYqaaVdNqwA" key="body" value="base_Class.ownedAttribute->forAll(at | not(at.oclIsKindOf(uml::Port)) implies (at.visibility = uml::VisibilityKind::protected))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMOVEEEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMOlEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMO1EEEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMPVEEEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMPlEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMP1EEEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_czEMQFEEEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMQVEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMQlEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_czEMQ1EEEeOMYqaaVdNqwA" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMRFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMRVEEEeOMYqaaVdNqwA" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMR1EEEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMSFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMSVEEEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMS1EEEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMTFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMTVEEEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_czEMTlEEEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMT1EEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMUFEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_czEMUVEEEeOMYqaaVdNqwA" name="Combinedstatemachineconstraintsforcapsules">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMUlEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMU1EEEeOMYqaaVdNqwA" key="body" value="let sm = base_Class.classifierBehavior in &#xD;&#xA;sm->notEmpty() implies&#xD;&#xA;   (sm.oclIsTypeOf(uml::StateMachine) -- only state machines allowed&#xD;&#xA;   and (not sm.isReentrant)                   -- no re-entrant behavior&#xD;&#xA;   and (not sm.ownedParameter->isEmpty()) -- no parameters&#xD;&#xA;   and (sm.region->size() = 1) )              -- only a single region allowed "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMVVEEEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMVlEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMV1EEEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMWVEEEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMWlEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMW1EEEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_czEMXFEEEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMXVEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMXlEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_czEMX1EEEeOMYqaaVdNqwA" name="SAPsunwiredunpublishedportsmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMYFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMYVEEEeOMYqaaVdNqwA" key="body" value="let saps = base_Class.ownedPort->select(p | not p.isService) in&#xD;&#xA;   (saps->notEmpty()) implies&#xD;&#xA;      saps->forAll(s | s.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMY1EEEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMZFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMZVEEEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMZ1EEEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMaFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMaVEEEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_czEMalEEEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMa1EEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMbFEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_czEMbVEEEeOMYqaaVdNqwA" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMblEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMb1EEEeOMYqaaVdNqwA" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMcVEEEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMclEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMc1EEEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMdVEEEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMdlEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMd1EEEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_czEMeFEEEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMeVEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMelEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_czEMe1EEEeOMYqaaVdNqwA" name="Acapsuleclassonlysupportsstatemachinebehaviors">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMfFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMfVEEEeOMYqaaVdNqwA" key="body" value="base_Class.classifierBehavior->notEmpty() implies&#xD;&#xA;      (base_Class.classifierBehavior.oclIsTypeOf(StateMachine))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMf1EEEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMgFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMgVEEEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMg1EEEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMhFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMhVEEEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_czEMhlEEEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMh1EEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMiFEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_czEMiVEEEeOMYqaaVdNqwA" 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="_czEMi1EEEeOMYqaaVdNqwA" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMjFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_czEMjVEEEeOMYqaaVdNqwA" 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:EAttribute" xmi:id="_czEMj1EEEeOMYqaaVdNqwA" name="isSubstitutable" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_czEMkVEEEeOMYqaaVdNqwA" name="InEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMklEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_czEMk1EEEeOMYqaaVdNqwA" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_czEMlVEEEeOMYqaaVdNqwA" name="OutEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMllEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_czEMl1EEEeOMYqaaVdNqwA" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_czEMmVEEEeOMYqaaVdNqwA" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMmlEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_czEMm1EEEeOMYqaaVdNqwA" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMnFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMnVEEEeOMYqaaVdNqwA" key="body" value="base_Collaboration.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMn1EEEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMoFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMoVEEEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMo1EEEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMpFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMpVEEEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_czEMplEEEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMp1EEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMqFEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_czEMqVEEEeOMYqaaVdNqwA" name="base_Collaboration" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_czEMq1EEEeOMYqaaVdNqwA" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMrFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_czEMrVEEEeOMYqaaVdNqwA" name="Wiredportsmustbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMrlEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMr1EEEeOMYqaaVdNqwA" key="body" value="isWired implies base_Port.isService"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMsVEEEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMslEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMs1EEEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMtVEEEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMtlEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMt1EEEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_czEMuFEEEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMuVEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMulEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_czEMu1EEEeOMYqaaVdNqwA" name="UnwiredUnpublishedportscannotbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMvFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMvVEEEeOMYqaaVdNqwA" key="body" value="(not (isWired or isPublish)) implies (not base_Port.isService)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMv1EEEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMwFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMwVEEEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEMw1EEEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEMxFEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEMxVEEEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_czEMxlEEEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMx1EEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEMyFEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_czEMyVEEEeOMYqaaVdNqwA" name="isConjugate" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_czEMy1EEEeOMYqaaVdNqwA" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_czEMzVEEEeOMYqaaVdNqwA" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_czEMz1EEEeOMYqaaVdNqwA" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_czEM0VEEEeOMYqaaVdNqwA" name="registration" ordered="false" eType="_czEM11EEEeOMYqaaVdNqwA"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_czEM01EEEeOMYqaaVdNqwA" name="registrationOverride" 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="_czEM1VEEEeOMYqaaVdNqwA" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_czEM11EEEeOMYqaaVdNqwA" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEM2FEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_czEM2VEEEeOMYqaaVdNqwA" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_czEM2lEEEeOMYqaaVdNqwA" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_czEM21EEEeOMYqaaVdNqwA" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_czEM3FEEEeOMYqaaVdNqwA" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEM3VEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_czEM3lEEEeOMYqaaVdNqwA" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEM31EEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEM4FEEEeOMYqaaVdNqwA" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEM4lEEEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEM41EEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEM5FEEEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEM5lEEEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEM51EEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEM6FEEEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_czEM6VEEEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEM6lEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEM61EEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_czEM7FEEEeOMYqaaVdNqwA" name="Connectorscanonlyconnecttwoports">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEM7VEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEM7lEEEeOMYqaaVdNqwA" key="body" value="base_Connector.end->forAll(e | e.role.oclIsTypeOf(uml::Port))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEM8FEEEeOMYqaaVdNqwA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEM8VEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEM8lEEEeOMYqaaVdNqwA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_czEM9FEEEeOMYqaaVdNqwA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEM9VEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_czEM9lEEEeOMYqaaVdNqwA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_czEM91EEEeOMYqaaVdNqwA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEM-FEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_czEM-VEEEeOMYqaaVdNqwA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_czEM-lEEEeOMYqaaVdNqwA" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_czEM_FEEEeOMYqaaVdNqwA" name="ProtocolContainer">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czEM_VEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_czEM_lEEEeOMYqaaVdNqwA" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_czENAFEEEeOMYqaaVdNqwA" name="RTRedefinableElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_czENAVEEEeOMYqaaVdNqwA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_czENAlEEEeOMYqaaVdNqwA" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_czENBFEEEeOMYqaaVdNqwA" name="rootFragment" ordered="false">

-            <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="_ud3M0FD0EeOA4ecmvfqvaw" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_udxGMFD0EeOA4ecmvfqvaw/1" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud3M0VD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud3M0lD0EeOA4ecmvfqvaw" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ueDaGlD0EeOA4ecmvfqvaw" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ueDaG1D0EeOA4ecmvfqvaw" key="Version" value="0.0.2"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ueDaHFD0EeOA4ecmvfqvaw" key="Comment" value="Added state machine constraint"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ueDaHVD0EeOA4ecmvfqvaw" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ueDaHlD0EeOA4ecmvfqvaw" key="Date" value="2013-11-19"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ueDaH1D0EeOA4ecmvfqvaw" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_ud3M01D0EeOA4ecmvfqvaw" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud3M1FD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ud3M1VD0EeOA4ecmvfqvaw" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud3M1lD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud3M11D0EeOA4ecmvfqvaw" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud3M2VD0EeOA4ecmvfqvaw" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud3M2lD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud3M21D0EeOA4ecmvfqvaw" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud3M3VD0EeOA4ecmvfqvaw" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud3M3lD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud3M31D0EeOA4ecmvfqvaw" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ud3M4FD0EeOA4ecmvfqvaw">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud3M4VD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud3M4lD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ud3M41D0EeOA4ecmvfqvaw" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud3M5FD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud3M5VD0EeOA4ecmvfqvaw" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud3M51D0EeOA4ecmvfqvaw" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud3M6FD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud3M6VD0EeOA4ecmvfqvaw" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9TcVD0EeOA4ecmvfqvaw" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9TclD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9Tc1D0EeOA4ecmvfqvaw" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ud9TdFD0EeOA4ecmvfqvaw">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9TdVD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9TdlD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ud9Td1D0EeOA4ecmvfqvaw" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9TeFD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9TeVD0EeOA4ecmvfqvaw" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9Te1D0EeOA4ecmvfqvaw" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9TfFD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9TfVD0EeOA4ecmvfqvaw" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9Tf1D0EeOA4ecmvfqvaw" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9TgFD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9TgVD0EeOA4ecmvfqvaw" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ud9TglD0EeOA4ecmvfqvaw">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9Tg1D0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9ThFD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ud9ThVD0EeOA4ecmvfqvaw" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9ThlD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9Th1D0EeOA4ecmvfqvaw" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9TiVD0EeOA4ecmvfqvaw" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9TilD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9Ti1D0EeOA4ecmvfqvaw" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9TjVD0EeOA4ecmvfqvaw" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9TjlD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9Tj1D0EeOA4ecmvfqvaw" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ud9TkFD0EeOA4ecmvfqvaw">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9TkVD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9TklD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ud9Tk1D0EeOA4ecmvfqvaw" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9TlFD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9TlVD0EeOA4ecmvfqvaw" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9Tl1D0EeOA4ecmvfqvaw" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9TmFD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9TmVD0EeOA4ecmvfqvaw" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9Tm1D0EeOA4ecmvfqvaw" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9TnFD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9TnVD0EeOA4ecmvfqvaw" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ud9TnlD0EeOA4ecmvfqvaw">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9Tn1D0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9ToFD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ud9ToVD0EeOA4ecmvfqvaw" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9TolD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9To1D0EeOA4ecmvfqvaw" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9TpVD0EeOA4ecmvfqvaw" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9TplD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9Tp1D0EeOA4ecmvfqvaw" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9TqVD0EeOA4ecmvfqvaw" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9TqlD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9Tq1D0EeOA4ecmvfqvaw" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ud9TrFD0EeOA4ecmvfqvaw">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9TrVD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9TrlD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ud9Tr1D0EeOA4ecmvfqvaw" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9TsFD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9TsVD0EeOA4ecmvfqvaw" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9Ts1D0EeOA4ecmvfqvaw" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9TtFD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9TtVD0EeOA4ecmvfqvaw" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9Tt1D0EeOA4ecmvfqvaw" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9TuFD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9TuVD0EeOA4ecmvfqvaw" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ud9TulD0EeOA4ecmvfqvaw">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9Tu1D0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9TvFD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ud9TvVD0EeOA4ecmvfqvaw" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9TvlD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9Tv1D0EeOA4ecmvfqvaw" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9TwVD0EeOA4ecmvfqvaw" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9TwlD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9Tw1D0EeOA4ecmvfqvaw" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9TxVD0EeOA4ecmvfqvaw" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9TxlD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9Tx1D0EeOA4ecmvfqvaw" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ud9TyFD0EeOA4ecmvfqvaw">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9TyVD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9TylD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ud9Ty1D0EeOA4ecmvfqvaw" name="Capsulevariablescanonlyhaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9TzFD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9TzVD0EeOA4ecmvfqvaw" key="body" value="base_Class.ownedAttribute->forAll(at | not(at.oclIsKindOf(uml::Port)) implies (at.visibility = uml::VisibilityKind::protected))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9Tz1D0EeOA4ecmvfqvaw" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9T0FD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9T0VD0EeOA4ecmvfqvaw" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9T01D0EeOA4ecmvfqvaw" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9T1FD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9T1VD0EeOA4ecmvfqvaw" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ud9T1lD0EeOA4ecmvfqvaw">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9T11D0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9T2FD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ud9T2VD0EeOA4ecmvfqvaw" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9T2lD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9T21D0EeOA4ecmvfqvaw" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9T3VD0EeOA4ecmvfqvaw" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9T3lD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9T31D0EeOA4ecmvfqvaw" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9T4VD0EeOA4ecmvfqvaw" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9T4lD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9T41D0EeOA4ecmvfqvaw" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ud9T5FD0EeOA4ecmvfqvaw">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9T5VD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9T5lD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ud9T51D0EeOA4ecmvfqvaw" name="Combinedstatemachineconstraintsforcapsules">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9T6FD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9T6VD0EeOA4ecmvfqvaw" key="body" value="let sm = base_Class.classifierBehavior in &#xD;&#xA;sm->notEmpty() implies&#xD;&#xA;   (sm.oclIsTypeOf(uml::StateMachine) -- only state machines allowed&#xD;&#xA;   and (not sm.isReentrant)                   -- no re-entrant behavior&#xD;&#xA;   and (not sm.ownedParameter->isEmpty()) -- no parameters&#xD;&#xA;   and (sm.region->size() = 1) )              -- only a single region allowed "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9T61D0EeOA4ecmvfqvaw" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9T7FD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9T7VD0EeOA4ecmvfqvaw" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9T71D0EeOA4ecmvfqvaw" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9T8FD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9T8VD0EeOA4ecmvfqvaw" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ud9T8lD0EeOA4ecmvfqvaw">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9T81D0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9T9FD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ud9T9VD0EeOA4ecmvfqvaw" name="SAPsunwiredunpublishedportsmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9T9lD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9T91D0EeOA4ecmvfqvaw" key="body" value="let saps = base_Class.ownedPort->select(p | not p.isService) in&#xD;&#xA;   (saps->notEmpty()) implies&#xD;&#xA;      saps->forAll(s | s.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9T-VD0EeOA4ecmvfqvaw" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9T-lD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9T-1D0EeOA4ecmvfqvaw" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9T_VD0EeOA4ecmvfqvaw" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9T_lD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9T_1D0EeOA4ecmvfqvaw" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ud9UAFD0EeOA4ecmvfqvaw">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9UAVD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9UAlD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ud9UA1D0EeOA4ecmvfqvaw" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UBFD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9UBVD0EeOA4ecmvfqvaw" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9UB1D0EeOA4ecmvfqvaw" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UCFD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9UCVD0EeOA4ecmvfqvaw" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9UC1D0EeOA4ecmvfqvaw" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UDFD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9UDVD0EeOA4ecmvfqvaw" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ud9UDlD0EeOA4ecmvfqvaw">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9UD1D0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9UEFD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ud9UEVD0EeOA4ecmvfqvaw" name="Acapsuleclassonlysupportsstatemachinebehaviors">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UElD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9UE1D0EeOA4ecmvfqvaw" key="body" value="base_Class.classifierBehavior->notEmpty() implies&#xD;&#xA;      (base_Class.classifierBehavior.oclIsTypeOf(StateMachine))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9UFVD0EeOA4ecmvfqvaw" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UFlD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9UF1D0EeOA4ecmvfqvaw" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9UGVD0EeOA4ecmvfqvaw" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UGlD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9UG1D0EeOA4ecmvfqvaw" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ud9UHFD0EeOA4ecmvfqvaw">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9UHVD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9UHlD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ud9UH1D0EeOA4ecmvfqvaw" 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="_ud9UIVD0EeOA4ecmvfqvaw" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UIlD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ud9UI1D0EeOA4ecmvfqvaw" 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:EAttribute" xmi:id="_ud9UJVD0EeOA4ecmvfqvaw" name="isSubstitutable" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_ud9UJ1D0EeOA4ecmvfqvaw" name="InEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UKFD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ud9UKVD0EeOA4ecmvfqvaw" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_ud9UK1D0EeOA4ecmvfqvaw" name="OutEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9ULFD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ud9ULVD0EeOA4ecmvfqvaw" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_ud9UL1D0EeOA4ecmvfqvaw" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UMFD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ud9UMVD0EeOA4ecmvfqvaw" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UMlD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9UM1D0EeOA4ecmvfqvaw" key="body" value="base_Collaboration.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9UNVD0EeOA4ecmvfqvaw" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UNlD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9UN1D0EeOA4ecmvfqvaw" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9UOVD0EeOA4ecmvfqvaw" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UOlD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9UO1D0EeOA4ecmvfqvaw" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ud9UPFD0EeOA4ecmvfqvaw">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9UPVD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9UPlD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ud9UP1D0EeOA4ecmvfqvaw" name="base_Collaboration" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_ud9UQVD0EeOA4ecmvfqvaw" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UQlD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ud9UQ1D0EeOA4ecmvfqvaw" name="Wiredportsmustbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9URFD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9URVD0EeOA4ecmvfqvaw" key="body" value="isWired implies base_Port.isService"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9UR1D0EeOA4ecmvfqvaw" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9USFD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9USVD0EeOA4ecmvfqvaw" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9US1D0EeOA4ecmvfqvaw" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UTFD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9UTVD0EeOA4ecmvfqvaw" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ud9UTlD0EeOA4ecmvfqvaw">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9UT1D0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9UUFD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ud9UUVD0EeOA4ecmvfqvaw" name="UnwiredUnpublishedportscannotbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UUlD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9UU1D0EeOA4ecmvfqvaw" key="body" value="(not (isWired or isPublish)) implies (not base_Port.isService)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9UVVD0EeOA4ecmvfqvaw" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UVlD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9UV1D0EeOA4ecmvfqvaw" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9UWVD0EeOA4ecmvfqvaw" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UWlD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9UW1D0EeOA4ecmvfqvaw" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ud9UXFD0EeOA4ecmvfqvaw">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9UXVD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9UXlD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ud9UX1D0EeOA4ecmvfqvaw" name="isConjugate" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ud9UYVD0EeOA4ecmvfqvaw" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ud9UY1D0EeOA4ecmvfqvaw" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ud9UZVD0EeOA4ecmvfqvaw" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ud9UZ1D0EeOA4ecmvfqvaw" name="registration" ordered="false" eType="_ud9UbVD0EeOA4ecmvfqvaw"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ud9UaVD0EeOA4ecmvfqvaw" name="registrationOverride" 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="_ud9Ua1D0EeOA4ecmvfqvaw" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_ud9UbVD0EeOA4ecmvfqvaw" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UblD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_ud9Ub1D0EeOA4ecmvfqvaw" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_ud9UcFD0EeOA4ecmvfqvaw" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_ud9UcVD0EeOA4ecmvfqvaw" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_ud9UclD0EeOA4ecmvfqvaw" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9Uc1D0EeOA4ecmvfqvaw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ud9UdFD0EeOA4ecmvfqvaw" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UdVD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9UdlD0EeOA4ecmvfqvaw" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9UeFD0EeOA4ecmvfqvaw" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UeVD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9UelD0EeOA4ecmvfqvaw" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9UfFD0EeOA4ecmvfqvaw" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9UfVD0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9UflD0EeOA4ecmvfqvaw" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ud9Uf1D0EeOA4ecmvfqvaw">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9UgFD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9UgVD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_ud9UglD0EeOA4ecmvfqvaw" name="Connectorscanonlyconnecttwoports">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9Ug1D0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9UhFD0EeOA4ecmvfqvaw" key="body" value="base_Connector.end->forAll(e | e.role.oclIsTypeOf(uml::Port))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9UhlD0EeOA4ecmvfqvaw" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9Uh1D0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9UiFD0EeOA4ecmvfqvaw" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_ud9UilD0EeOA4ecmvfqvaw" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9Ui1D0EeOA4ecmvfqvaw" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ud9UjFD0EeOA4ecmvfqvaw" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_ud9UjVD0EeOA4ecmvfqvaw">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9UjlD0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_ud9Uj1D0EeOA4ecmvfqvaw">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ud9UkFD0EeOA4ecmvfqvaw" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_ud9UklD0EeOA4ecmvfqvaw" name="ProtocolContainer">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9Uk1D0EeOA4ecmvfqvaw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ud9UlFD0EeOA4ecmvfqvaw" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_ud9UllD0EeOA4ecmvfqvaw" name="RTRedefinableElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ud9Ul1D0EeOA4ecmvfqvaw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ud9UmFD0EeOA4ecmvfqvaw" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ud9UmlD0EeOA4ecmvfqvaw" name="rootFragment" ordered="false">

-            <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="_HnIDcU3YEeO2GMk50x9RWA" name="UMLRealTime" nsURI="http:///schemas/UMLRealTime/_HnB80E3YEeO2GMk50x9RWA/0" nsPrefix="UMLRealTime">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDck3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/Ecore">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDc03YEeO2GMk50x9RWA" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnOKGk3YEeO2GMk50x9RWA" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnOKG03YEeO2GMk50x9RWA" key="Version" value="0.0.1"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnOKHE3YEeO2GMk50x9RWA" key="Comment" value="This is the initial version of the profile in the Kepler version of Papyrus.&#xD;&#xA;&#xD;&#xA;Unfortunately, it is called &quot;model2.profile&quot; but the model, at least is called UMLRealTime&quot;"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnOKHU3YEeO2GMk50x9RWA" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnOKHk3YEeO2GMk50x9RWA" key="Date" value="2013-11-15"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnOKH03YEeO2GMk50x9RWA" key="Author" value="Bran Selic"/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_HnIDdE3YEeO2GMk50x9RWA" name="Capsule">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDdU3YEeO2GMk50x9RWA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hcMIwEhNEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_HnIDdk3YEeO2GMk50x9RWA" name="Capsulesarealwaysactive">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDd03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDeE3YEeO2GMk50x9RWA" key="body" value="base_Class.isActive"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIDek3YEeO2GMk50x9RWA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDe03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDfE3YEeO2GMk50x9RWA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIDfk3YEeO2GMk50x9RWA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDf03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDgE3YEeO2GMk50x9RWA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_HnIDgU3YEeO2GMk50x9RWA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIDgk3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIDg03YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_HnIDhE3YEeO2GMk50x9RWA" name="AcapsulecannothaveReceptionfeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDhU3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDhk3YEeO2GMk50x9RWA" key="body" value="base_Class.ownedReception->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIDiE3YEeO2GMk50x9RWA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDiU3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDik3YEeO2GMk50x9RWA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIDjE3YEeO2GMk50x9RWA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDjU3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDjk3YEeO2GMk50x9RWA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_HnIDj03YEeO2GMk50x9RWA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIDkE3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIDkU3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_HnIDkk3YEeO2GMk50x9RWA" name="Acapsuleclasscanalwaysbesubclassed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDk03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDlE3YEeO2GMk50x9RWA" key="body" value="not(base_Class.isFinalSpecialization)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIDlk3YEeO2GMk50x9RWA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDl03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDmE3YEeO2GMk50x9RWA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIDmk3YEeO2GMk50x9RWA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDm03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDnE3YEeO2GMk50x9RWA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_HnIDnU3YEeO2GMk50x9RWA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIDnk3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIDn03YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_HnIDoE3YEeO2GMk50x9RWA" name="Acapsulecanhaveatmostonesuperclass">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDoU3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDok3YEeO2GMk50x9RWA" key="body" value="(base_Class.generalization->size()) &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIDpE3YEeO2GMk50x9RWA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDpU3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDpk3YEeO2GMk50x9RWA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIDqE3YEeO2GMk50x9RWA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDqU3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDqk3YEeO2GMk50x9RWA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_HnIDq03YEeO2GMk50x9RWA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIDrE3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIDrU3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_HnIDrk3YEeO2GMk50x9RWA" name="Capsuleclassesarealwayssubstitutable">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDr03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDsE3YEeO2GMk50x9RWA" key="body" value="(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIDsk3YEeO2GMk50x9RWA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDs03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDtE3YEeO2GMk50x9RWA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIDtk3YEeO2GMk50x9RWA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDt03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDuE3YEeO2GMk50x9RWA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_HnIDuU3YEeO2GMk50x9RWA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIDuk3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIDu03YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_HnIDvE3YEeO2GMk50x9RWA" name="Allattributesofacapsuleclasshaveexactlyonetype">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDvU3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDvk3YEeO2GMk50x9RWA" key="body" value="base_Class.ownedAttribute->forAll(at | at.type->size() = 1)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIDwE3YEeO2GMk50x9RWA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDwU3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDwk3YEeO2GMk50x9RWA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIDxE3YEeO2GMk50x9RWA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDxU3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDxk3YEeO2GMk50x9RWA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_HnIDx03YEeO2GMk50x9RWA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIDyE3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIDyU3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_HnIDyk3YEeO2GMk50x9RWA" name="Privatevisibilityisnotsupportedoncapsulefeatures">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDy03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIDzE3YEeO2GMk50x9RWA" key="body" value="base_Class.feature->forAll (f | f.visibility &lt;> uml::VisibilityKind::private)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIDzk3YEeO2GMk50x9RWA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIDz03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnID0E3YEeO2GMk50x9RWA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnID0k3YEeO2GMk50x9RWA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnID003YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnID1E3YEeO2GMk50x9RWA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_HnID1U3YEeO2GMk50x9RWA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnID1k3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnID103YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_HnID2E3YEeO2GMk50x9RWA" name="Acapsuleclasswithbehaviormusthaveavariablenamedmsg">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnID2U3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnID2k3YEeO2GMk50x9RWA" key="body" value="(base_Class.classifierBehavior->notEmpty()) implies (base_Class.ownedAttribute->exists(at | at.name = 'msg'))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnID3E3YEeO2GMk50x9RWA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnID3U3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnID3k3YEeO2GMk50x9RWA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnID4E3YEeO2GMk50x9RWA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnID4U3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnID4k3YEeO2GMk50x9RWA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_HnID403YEeO2GMk50x9RWA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnID5E3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnID5U3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_HnID5k3YEeO2GMk50x9RWA" name="Capsulevariablescanonlyhaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnID503YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnID6E3YEeO2GMk50x9RWA" key="body" value="base_Class.ownedAttribute->forAll(at | not(at.oclIsKindOf(uml::Port)) implies (at.visibility = uml::VisibilityKind::protected))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnID6k3YEeO2GMk50x9RWA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnID603YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnID7E3YEeO2GMk50x9RWA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnID7k3YEeO2GMk50x9RWA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnID703YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnID8E3YEeO2GMk50x9RWA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_HnID8U3YEeO2GMk50x9RWA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnID8k3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnID803YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_HnID9E3YEeO2GMk50x9RWA" name="Acapsuleclasscannothavenestedclassifiers">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnID9U3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnID9k3YEeO2GMk50x9RWA" key="body" value="base_Class.nestedClassifier->isEmpty()"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnID-E3YEeO2GMk50x9RWA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnID-U3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnID-k3YEeO2GMk50x9RWA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnID_E3YEeO2GMk50x9RWA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnID_U3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnID_k3YEeO2GMk50x9RWA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_HnID_03YEeO2GMk50x9RWA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIEAE3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIEAU3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_HnIEAk3YEeO2GMk50x9RWA" name="Combinedstatemachineconstraintsforcapsules">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEA03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEBE3YEeO2GMk50x9RWA" key="body" value="let sm = base_Class.classifierBehavior in &#xD;&#xA;sm->notEmpty() implies&#xD;&#xA;   (sm.oclIsTypeOf(uml::StateMachine) -- only state machines allowed&#xD;&#xA;   and (not sm.isReentrant)                   -- no re-entrant behavior&#xD;&#xA;   and (not sm.ownedParameter->isEmpty()) -- no parameters&#xD;&#xA;   and (sm.region->size() = 1) )              -- only a single region allowed "/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIEBk3YEeO2GMk50x9RWA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEB03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIECE3YEeO2GMk50x9RWA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIECk3YEeO2GMk50x9RWA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEC03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEDE3YEeO2GMk50x9RWA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_HnIEDU3YEeO2GMk50x9RWA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIEDk3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIED03YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_HnIEEE3YEeO2GMk50x9RWA" name="SAPsunwiredunpublishedportsmusthaveprotectedvisibility">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEEU3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEEk3YEeO2GMk50x9RWA" key="body" value="let saps = base_Class.ownedPort->select(p | not p.isService) in&#xD;&#xA;   (saps->notEmpty()) implies&#xD;&#xA;      saps->forAll(s | s.visibility = uml::VisibilityKind::protected)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIEFE3YEeO2GMk50x9RWA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEFU3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEFk3YEeO2GMk50x9RWA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIEGE3YEeO2GMk50x9RWA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEGU3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEGk3YEeO2GMk50x9RWA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_HnIEG03YEeO2GMk50x9RWA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIEHE3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIEHU3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_HnIEHk3YEeO2GMk50x9RWA" name="Alloperationsofacapsulearesequential">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEH03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEIE3YEeO2GMk50x9RWA" key="body" value="base_Class.ownedOperation->notEmpty() implies &#xD;&#xA;   (base_Class.ownedOperation->forAll(op | op.concurrency = uml::CallConcurrencyKind::sequential))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIEIk3YEeO2GMk50x9RWA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEI03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEJE3YEeO2GMk50x9RWA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIEJk3YEeO2GMk50x9RWA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEJ03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEKE3YEeO2GMk50x9RWA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_HnIEKU3YEeO2GMk50x9RWA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIEKk3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIEK03YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_HnIELE3YEeO2GMk50x9RWA" 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="_HnIELk3YEeO2GMk50x9RWA" name="CapsulePart">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEL03YEeO2GMk50x9RWA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EQwT4EhOEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_HnIEME3YEeO2GMk50x9RWA" 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:EAttribute" xmi:id="_HnIEMk3YEeO2GMk50x9RWA" name="isSubstitutable" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <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="_HnIENE3YEeO2GMk50x9RWA" name="InEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIENU3YEeO2GMk50x9RWA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_HnIENk3YEeO2GMk50x9RWA" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_HnIEOE3YEeO2GMk50x9RWA" name="OutEvent">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEOU3YEeO2GMk50x9RWA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_HnIEOk3YEeO2GMk50x9RWA" name="base_CallEvent" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_HnIEPE3YEeO2GMk50x9RWA" name="Protocol">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEPU3YEeO2GMk50x9RWA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8GLpsEhOEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_HnIEPk3YEeO2GMk50x9RWA" name="Protocolclassescanhaveatmostonegeneralization">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEP03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEQE3YEeO2GMk50x9RWA" key="body" value="base_Collaboration.generalization->size() &lt;= 1"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIEQk3YEeO2GMk50x9RWA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEQ03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIERE3YEeO2GMk50x9RWA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIERk3YEeO2GMk50x9RWA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIER03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIESE3YEeO2GMk50x9RWA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_HnIESU3YEeO2GMk50x9RWA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIESk3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIES03YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_HnIETE3YEeO2GMk50x9RWA" name="base_Collaboration" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_HnIETk3YEeO2GMk50x9RWA" name="RTPort">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIET03YEeO2GMk50x9RWA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_GR86IEhPEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_HnIEUE3YEeO2GMk50x9RWA" name="Wiredportsmustbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEUU3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEUk3YEeO2GMk50x9RWA" key="body" value="isWired implies base_Port.isService"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIEVE3YEeO2GMk50x9RWA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEVU3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEVk3YEeO2GMk50x9RWA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIEWE3YEeO2GMk50x9RWA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEWU3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEWk3YEeO2GMk50x9RWA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_HnIEW03YEeO2GMk50x9RWA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIEXE3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIEXU3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_HnIEXk3YEeO2GMk50x9RWA" name="UnwiredUnpublishedportscannotbedeclaredservice">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEX03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEYE3YEeO2GMk50x9RWA" key="body" value="(not (isWired or isPublish)) implies (not base_Port.isService)"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIEYk3YEeO2GMk50x9RWA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEY03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEZE3YEeO2GMk50x9RWA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIEZk3YEeO2GMk50x9RWA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEZ03YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEaE3YEeO2GMk50x9RWA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_HnIEaU3YEeO2GMk50x9RWA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIEak3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIEa03YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_HnIEbE3YEeO2GMk50x9RWA" name="isConjugate" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_HnIEbk3YEeO2GMk50x9RWA" name="isNotification" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_HnIEcE3YEeO2GMk50x9RWA" name="isPublish" ordered="false" lowerBound="1" defaultValueLiteral="false">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_HnIEck3YEeO2GMk50x9RWA" name="isWired" ordered="false" lowerBound="1" defaultValueLiteral="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_HnIEdE3YEeO2GMk50x9RWA" name="registration" ordered="false" eType="_HnIEek3YEeO2GMk50x9RWA"/>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_HnIEdk3YEeO2GMk50x9RWA" name="registrationOverride" 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="_HnIEeE3YEeO2GMk50x9RWA" name="base_Port" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EEnum" xmi:id="_HnIEek3YEeO2GMk50x9RWA" name="PortRegistrationType">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEe03YEeO2GMk50x9RWA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8sxEEhPEeO0lv5O1DTHOQ"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_HnIEfE3YEeO2GMk50x9RWA" name="Automatic"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_HnIEfU3YEeO2GMk50x9RWA" name="Application" value="1"/>

-          <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_HnIEfk3YEeO2GMk50x9RWA" name="ApplicationLocked" value="2"/>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_HnIEf03YEeO2GMk50x9RWA" name="RTConnector">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEgE3YEeO2GMk50x9RWA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Tv_-MEhQEeO0lv5O1DTHOQ"/>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_HnIEgU3YEeO2GMk50x9RWA" name="Onlybinaryconnectorsareallowed">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEgk3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEg03YEeO2GMk50x9RWA" key="body" value="base_Connector.end->size() = 2"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIEhU3YEeO2GMk50x9RWA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEhk3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEh03YEeO2GMk50x9RWA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIEiU3YEeO2GMk50x9RWA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEik3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEi03YEeO2GMk50x9RWA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_HnIEjE3YEeO2GMk50x9RWA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIEjU3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIEjk3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eOperations xmi:type="ecore:EOperation" xmi:id="_HnIEj03YEeO2GMk50x9RWA" name="Connectorscanonlyconnecttwoports">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEkE3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/Ecore/OCL">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEkU3YEeO2GMk50x9RWA" key="body" value="base_Connector.end->forAll(e | e.role.oclIsTypeOf(uml::Port))"/>

-            </eAnnotations>

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIEk03YEeO2GMk50x9RWA" name="diagnostics">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIElE3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIElU3YEeO2GMk50x9RWA" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>

-              </eAnnotations>

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-            </eParameters>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_HnIEl03YEeO2GMk50x9RWA" name="context">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEmE3YEeO2GMk50x9RWA" source="http://www.eclipse.org/emf/2002/GenModel">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HnIEmU3YEeO2GMk50x9RWA" key="documentation" value="The cache of context-specific information."/>

-              </eAnnotations>

-              <eGenericType xmi:type="ecore:EGenericType" xmi:id="_HnIEmk3YEeO2GMk50x9RWA">

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIEm03YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eTypeArguments xmi:type="ecore:EGenericType" xmi:id="_HnIEnE3YEeO2GMk50x9RWA">

-                  <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-                </eTypeArguments>

-                <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-              </eGenericType>

-            </eParameters>

-          </eOperations>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_HnIEnU3YEeO2GMk50x9RWA" name="base_Connector" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_HnIEn03YEeO2GMk50x9RWA" name="ProtocolContainer">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEoE3YEeO2GMk50x9RWA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hSaaUEhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_HnIEoU3YEeO2GMk50x9RWA" name="base_Package" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_HnIEo03YEeO2GMk50x9RWA" name="RTRedefinableElement">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HnIEpE3YEeO2GMk50x9RWA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_qJOC8EhQEeO0lv5O1DTHOQ"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_HnIEpU3YEeO2GMk50x9RWA" name="base_RedefinableElement" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_HnIEp03YEeO2GMk50x9RWA" name="rootFragment" ordered="false">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-    </eAnnotations>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_0Mm20GDjEeOesvHnEWH_sQ" alias="Class">

+  <uml:Profile xmi:id="_1h74oEeVEeO0lv5O1DTHOQ" name="UMLRealTime" URI="http://www.eclipse.org/papyrus/umlrt" metaclassReference="_0Mm20GDjEeOesvHnEWH_sQ _922ukGDjEeOesvHnEWH_sQ _923VoGDjEeOesvHnEWH_sQ _923VoWDjEeOesvHnEWH_sQ _NoL5UGDkEeOesvHnEWH_sQ _bmzwUGDkEeOesvHnEWH_sQ _bmzwUWDkEeOesvHnEWH_sQ _ELos0GGIEeOesvHnEWH_sQ _w9v-0KN2EeOMJMavfflX6A _IJTCAAbYEeSFB8mUNT_s_w _vk_NoAb2EeSFB8mUNT_s_w">

+    <elementImport xmi:id="_0Mm20GDjEeOesvHnEWH_sQ" alias="Class">

       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

     </elementImport>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_922ukGDjEeOesvHnEWH_sQ" alias="Property">

+    <elementImport xmi:id="_922ukGDjEeOesvHnEWH_sQ" alias="Property">

       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

     </elementImport>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_923VoGDjEeOesvHnEWH_sQ" alias="Port">

+    <elementImport xmi:id="_923VoGDjEeOesvHnEWH_sQ" alias="Port">

       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>

     </elementImport>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_923VoWDjEeOesvHnEWH_sQ" alias="Connector">

+    <elementImport xmi:id="_923VoWDjEeOesvHnEWH_sQ" alias="Connector">

       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>

     </elementImport>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_NoL5UGDkEeOesvHnEWH_sQ" alias="RedefinableElement">

+    <elementImport xmi:id="_NoL5UGDkEeOesvHnEWH_sQ" alias="RedefinableElement">

       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#RedefinableElement"/>

     </elementImport>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_bmzwUGDkEeOesvHnEWH_sQ" alias="Package">

+    <elementImport xmi:id="_bmzwUGDkEeOesvHnEWH_sQ" alias="Package">

       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

     </elementImport>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_bmzwUWDkEeOesvHnEWH_sQ" alias="Interface">

+    <elementImport xmi:id="_bmzwUWDkEeOesvHnEWH_sQ" alias="Interface">

       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/>

     </elementImport>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_ELos0GGIEeOesvHnEWH_sQ" alias="SignalEvent">

+    <elementImport xmi:id="_ELos0GGIEeOesvHnEWH_sQ" alias="SignalEvent">

       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#SignalEvent"/>

     </elementImport>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_w9v-0KN2EeOMJMavfflX6A" alias="Signal">

+    <elementImport xmi:id="_w9v-0KN2EeOMJMavfflX6A" alias="Signal">

       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Signal"/>

     </elementImport>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_IJTCAAbYEeSFB8mUNT_s_w" alias="Collaboration">

+    <elementImport xmi:id="_IJTCAAbYEeSFB8mUNT_s_w" alias="Collaboration">

       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Collaboration"/>

     </elementImport>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_vk_NoAb2EeSFB8mUNT_s_w" alias="CallEvent">

+    <elementImport xmi:id="_vk_NoAb2EeSFB8mUNT_s_w" alias="CallEvent">

       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#CallEvent"/>

     </elementImport>

-    <packageImport xmi:type="uml:PackageImport" xmi:id="_1h74okeVEeO0lv5O1DTHOQ">

+    <packageImport xmi:id="_1h74okeVEeO0lv5O1DTHOQ">

       <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

     </packageImport>

     <packagedElement xmi:type="uml:Stereotype" xmi:id="_hcMIwEhNEeO0lv5O1DTHOQ" name="Capsule">

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_-g8psEhTEeO0lv5O1DTHOQ" name="Capsules are always active" constrainedElement="_hcMIwEhNEeO0lv5O1DTHOQ">

+      <ownedRule xmi:id="_-g8psEhTEeO0lv5O1DTHOQ" name="Capsules are always active" constrainedElement="_hcMIwEhNEeO0lv5O1DTHOQ">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_TF_bEEhUEeO0lv5O1DTHOQ">

           <language>OCL</language>

           <body>base_Class.isActive</body>

         </specification>

       </ownedRule>

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_t6v3AEhUEeO0lv5O1DTHOQ" name="A capsule cannot have Reception features" constrainedElement="_hcMIwEhNEeO0lv5O1DTHOQ">

+      <ownedRule xmi:id="_t6v3AEhUEeO0lv5O1DTHOQ" name="A capsule cannot have Reception features" constrainedElement="_hcMIwEhNEeO0lv5O1DTHOQ">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_4YNUYEhUEeO0lv5O1DTHOQ">

           <language>OCL</language>

           <body>base_Class.ownedReception->isEmpty()</body>

         </specification>

       </ownedRule>

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_8k0ewEhUEeO0lv5O1DTHOQ" name="A capsule class can always be subclassed" constrainedElement="_hcMIwEhNEeO0lv5O1DTHOQ">

+      <ownedRule xmi:id="_8k0ewEhUEeO0lv5O1DTHOQ" name="A capsule class can always be subclassed" constrainedElement="_hcMIwEhNEeO0lv5O1DTHOQ">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_GFmRcEhVEeO0lv5O1DTHOQ">

           <language>OCL</language>

           <body>not(base_Class.isFinalSpecialization)</body>

         </specification>

       </ownedRule>

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_I1oJEEhVEeO0lv5O1DTHOQ" name="A capsule can have at most one superclass" constrainedElement="_hcMIwEhNEeO0lv5O1DTHOQ">

+      <ownedRule xmi:id="_I1oJEEhVEeO0lv5O1DTHOQ" name="A capsule can have at most one superclass" constrainedElement="_hcMIwEhNEeO0lv5O1DTHOQ">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_U-Hk4EhVEeO0lv5O1DTHOQ">

           <language>OCL</language>

           <body>(base_Class.generalization->size()) &lt;= 1</body>

         </specification>

       </ownedRule>

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_fuuAsEhVEeO0lv5O1DTHOQ" name="Capsule classes are always substitutable" constrainedElement="_hcMIwEhNEeO0lv5O1DTHOQ">

+      <ownedRule xmi:id="_fuuAsEhVEeO0lv5O1DTHOQ" name="Capsule classes are always substitutable" constrainedElement="_hcMIwEhNEeO0lv5O1DTHOQ">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_zj-68EhVEeO0lv5O1DTHOQ">

           <language>OCL</language>

           <body>(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))</body>

         </specification>

       </ownedRule>

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_7I_kgEhVEeO0lv5O1DTHOQ" name="All attributes of a capsule class have exactly one type" constrainedElement="_hcMIwEhNEeO0lv5O1DTHOQ">

+      <ownedRule xmi:id="_7I_kgEhVEeO0lv5O1DTHOQ" name="All attributes of a capsule class have exactly one type" constrainedElement="_hcMIwEhNEeO0lv5O1DTHOQ">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_KrqoMEhWEeO0lv5O1DTHOQ">

           <language>OCL</language>

           <body>base_Class.ownedAttribute->forAll(at | at.type->size() = 1)</body>

         </specification>

       </ownedRule>

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_RXUA0EhWEeO0lv5O1DTHOQ" name="Private visibility is not supported on capsule features" constrainedElement="_hcMIwEhNEeO0lv5O1DTHOQ">

+      <ownedRule xmi:id="_RXUA0EhWEeO0lv5O1DTHOQ" name="Private visibility is not supported on capsule features" constrainedElement="_hcMIwEhNEeO0lv5O1DTHOQ">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_huBJgEhWEeO0lv5O1DTHOQ">

           <language>OCL</language>

           <body>base_Class.feature->forAll (f | f.visibility &lt;> UML::VisibilityKind::private)</body>

         </specification>

       </ownedRule>

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_DoUvAEhbEeO0lv5O1DTHOQ" name="A capsule class cannot have nested classifiers" constrainedElement="_hcMIwEhNEeO0lv5O1DTHOQ">

+      <ownedRule xmi:id="_DoUvAEhbEeO0lv5O1DTHOQ" name="A capsule class cannot have nested classifiers" constrainedElement="_hcMIwEhNEeO0lv5O1DTHOQ">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_OWWX8EhbEeO0lv5O1DTHOQ">

           <language>OCL</language>

           <body>base_Class.nestedClassifier->isEmpty()</body>

         </specification>

       </ownedRule>

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_EBz7IEhdEeO0lv5O1DTHOQ" name="All operations of a capsule are sequential" constrainedElement="_hcMIwEhNEeO0lv5O1DTHOQ">

+      <ownedRule xmi:id="_EBz7IEhdEeO0lv5O1DTHOQ" name="All operations of a capsule are sequential" constrainedElement="_hcMIwEhNEeO0lv5O1DTHOQ">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_YhzNYEhdEeO0lv5O1DTHOQ">

           <language>OCL</language>

           <body>base_Class.ownedOperation->notEmpty() implies &#xD;

    (base_Class.ownedOperation->forAll(op | op.concurrency = UML::CallConcurrencyKind::sequential))</body>

         </specification>

       </ownedRule>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_wWou0EhNEeO0lv5O1DTHOQ" name="base_Class" association="_wWu1cEhNEeO0lv5O1DTHOQ">

+      <ownedAttribute xmi:id="_wWou0EhNEeO0lv5O1DTHOQ" name="base_Class" association="_wWu1cEhNEeO0lv5O1DTHOQ">

         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

       </ownedAttribute>

     </packagedElement>

@@ -15143,7 +101,7 @@
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_wWu1cUhNEeO0lv5O1DTHOQ" name="extension_Capsule" type="_hcMIwEhNEeO0lv5O1DTHOQ" aggregation="composite" association="_wWu1cEhNEeO0lv5O1DTHOQ"/>

     </packagedElement>

     <packagedElement xmi:type="uml:Stereotype" xmi:id="_EQwT4EhOEeO0lv5O1DTHOQ" name="CapsulePart">

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_HcX7UEhOEeO0lv5O1DTHOQ" name="base_Property" association="_HcX7UUhOEeO0lv5O1DTHOQ">

+      <ownedAttribute xmi:id="_HcX7UEhOEeO0lv5O1DTHOQ" name="base_Property" association="_HcX7UUhOEeO0lv5O1DTHOQ">

         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

       </ownedAttribute>

     </packagedElement>

@@ -15151,68 +109,68 @@
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_HcX7UkhOEeO0lv5O1DTHOQ" name="extension_CapsulePart" type="_EQwT4EhOEeO0lv5O1DTHOQ" aggregation="composite" association="_HcX7UUhOEeO0lv5O1DTHOQ"/>

     </packagedElement>

     <packagedElement xmi:type="uml:Stereotype" xmi:id="_8GLpsEhOEeO0lv5O1DTHOQ" name="Protocol">

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_IQKCgAbZEeSFB8mUNT_s_w" name="Protocols can have at most one generalization" constrainedElement="_8GLpsEhOEeO0lv5O1DTHOQ">

+      <ownedRule xmi:id="_IQKCgAbZEeSFB8mUNT_s_w" name="Protocols can have at most one generalization" constrainedElement="_8GLpsEhOEeO0lv5O1DTHOQ">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_vPY3QAbZEeSFB8mUNT_s_w">

           <language>OCL</language>

           <body>base_Collaboration.generalization->size() &lt;= 1</body>

         </specification>

       </ownedRule>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_RQX6AGF-EeOesvHnEWH_sQ" name="base_Collaboration" association="_RQYhEGF-EeOesvHnEWH_sQ">

+      <ownedAttribute xmi:id="_RQX6AGF-EeOesvHnEWH_sQ" name="base_Collaboration" association="_RQYhEGF-EeOesvHnEWH_sQ">

         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Collaboration"/>

       </ownedAttribute>

     </packagedElement>

     <packagedElement xmi:type="uml:Stereotype" xmi:id="_GR86IEhPEeO0lv5O1DTHOQ" name="RTPort">

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_1UM30GfEEeO447LqwGjc0A" name="A wired port cannot publish its name" constrainedElement="_GR86IEhPEeO0lv5O1DTHOQ">

+      <ownedRule xmi:id="_1UM30GfEEeO447LqwGjc0A" name="A wired port cannot publish its name" constrainedElement="_GR86IEhPEeO0lv5O1DTHOQ">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_M-gxAGfFEeO447LqwGjc0A">

           <language>OCL</language>

           <body>isWired implies not isPublish</body>

         </specification>

       </ownedRule>

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_2UsEcGfEEeO447LqwGjc0A" name="A public port must be defined as a service port" constrainedElement="_GR86IEhPEeO0lv5O1DTHOQ">

+      <ownedRule xmi:id="_2UsEcGfEEeO447LqwGjc0A" name="A public port must be defined as a service port" constrainedElement="_GR86IEhPEeO0lv5O1DTHOQ">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_DVDG8GfGEeO447LqwGjc0A">

           <language>OCL</language>

           <body>(base_Port.visibility = UML::VisibilityKind::public) &#xD;

     implies base_Port.isService  </body>

         </specification>

       </ownedRule>

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_3Xp9UGfEEeO447LqwGjc0A" name="A SAP (unwired &amp; unpublished) must have protected visibility " constrainedElement="_GR86IEhPEeO0lv5O1DTHOQ">

+      <ownedRule xmi:id="_3Xp9UGfEEeO447LqwGjc0A" name="A SAP (unwired &amp; unpublished) must have protected visibility " constrainedElement="_GR86IEhPEeO0lv5O1DTHOQ">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_u6mmkGfGEeO447LqwGjc0A">

           <language>OCL</language>

           <body>(not isWired and not isPublish) &#xD;

    implies (base_Port.visibility = UML::VisibilityKind::protected)</body>

         </specification>

       </ownedRule>

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_QJC94GfGEeO447LqwGjc0A" name="An SPP (unwired and published) must have public visibility" constrainedElement="_GR86IEhPEeO0lv5O1DTHOQ">

+      <ownedRule xmi:id="_QJC94GfGEeO447LqwGjc0A" name="An SPP (unwired and published) must have public visibility" constrainedElement="_GR86IEhPEeO0lv5O1DTHOQ">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_K9NVsGfHEeO447LqwGjc0A">

           <language>OCL</language>

           <body>(not isWired and isPublish) implies &#xD;

    (base_Port.visibility = UML::VisibilityKind::public)</body>

         </specification>

       </ownedRule>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_PV8DIEhPEeO0lv5O1DTHOQ" name="isNotification">

+      <ownedAttribute xmi:id="_PV8DIEhPEeO0lv5O1DTHOQ" name="isNotification">

         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

         <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_S5T74EhSEeO0lv5O1DTHOQ"/>

       </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Q9f20EhPEeO0lv5O1DTHOQ" name="isPublish">

+      <ownedAttribute xmi:id="_Q9f20EhPEeO0lv5O1DTHOQ" name="isPublish">

         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

         <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_U3AXoEhSEeO0lv5O1DTHOQ"/>

       </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ScT-MEhPEeO0lv5O1DTHOQ" name="isWired">

+      <ownedAttribute xmi:id="_ScT-MEhPEeO0lv5O1DTHOQ" name="isWired">

         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

         <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_W-rOwEhSEeO0lv5O1DTHOQ" value="true"/>

       </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_T2bLwEhPEeO0lv5O1DTHOQ" name="registration" type="_t8sxEEhPEeO0lv5O1DTHOQ">

+      <ownedAttribute xmi:id="_T2bLwEhPEeO0lv5O1DTHOQ" name="registration" type="_t8sxEEhPEeO0lv5O1DTHOQ">

         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_I3PE4EhQEeO0lv5O1DTHOQ"/>

         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_I3VLgEhQEeO0lv5O1DTHOQ" value="1"/>

         <defaultValue xmi:type="uml:Expression" xmi:id="_wsXU8EhSEeO0lv5O1DTHOQ" type="_t8sxEEhPEeO0lv5O1DTHOQ">

           <operand xmi:type="uml:InstanceValue" xmi:id="_wsXU8UhSEeO0lv5O1DTHOQ" instance="_xZXFMEhPEeO0lv5O1DTHOQ"/>

         </defaultValue>

       </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_U-tpgEhPEeO0lv5O1DTHOQ" name="registrationOverride">

+      <ownedAttribute xmi:id="_U-tpgEhPEeO0lv5O1DTHOQ" name="registrationOverride">

         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

         <defaultValue xmi:type="uml:LiteralString" xmi:id="_iTD3oEhTEeO0lv5O1DTHOQ" value=""/>

       </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Vn6XgEhPEeO0lv5O1DTHOQ" name="base_Port" association="_Vn6XgUhPEeO0lv5O1DTHOQ">

+      <ownedAttribute xmi:id="_Vn6XgEhPEeO0lv5O1DTHOQ" name="base_Port" association="_Vn6XgUhPEeO0lv5O1DTHOQ">

         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>

       </ownedAttribute>

     </packagedElement>

@@ -15220,18 +178,18 @@
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Vn6XgkhPEeO0lv5O1DTHOQ" name="extension_RTPort" type="_GR86IEhPEeO0lv5O1DTHOQ" aggregation="composite" association="_Vn6XgUhPEeO0lv5O1DTHOQ"/>

     </packagedElement>

     <packagedElement xmi:type="uml:Enumeration" xmi:id="_t8sxEEhPEeO0lv5O1DTHOQ" name="PortRegistrationType">

-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_xZXFMEhPEeO0lv5O1DTHOQ" name="Automatic"/>

-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yiLHYEhPEeO0lv5O1DTHOQ" name="Application"/>

-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_0DSU0EhPEeO0lv5O1DTHOQ" name="ApplicationLocked"/>

+      <ownedLiteral xmi:id="_xZXFMEhPEeO0lv5O1DTHOQ" name="Automatic"/>

+      <ownedLiteral xmi:id="_yiLHYEhPEeO0lv5O1DTHOQ" name="Application"/>

+      <ownedLiteral xmi:id="_0DSU0EhPEeO0lv5O1DTHOQ" name="ApplicationLocked"/>

     </packagedElement>

     <packagedElement xmi:type="uml:Stereotype" xmi:id="_Tv_-MEhQEeO0lv5O1DTHOQ" name="RTConnector">

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_CIqywEheEeO0lv5O1DTHOQ" name="Only binary connectors are allowed" constrainedElement="_Tv_-MEhQEeO0lv5O1DTHOQ">

+      <ownedRule xmi:id="_CIqywEheEeO0lv5O1DTHOQ" name="Only binary connectors are allowed" constrainedElement="_Tv_-MEhQEeO0lv5O1DTHOQ">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_P3D1YEheEeO0lv5O1DTHOQ">

           <language>OCL</language>

           <body>base_Connector.end->size() = 2</body>

         </specification>

       </ownedRule>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_VSnAcEhQEeO0lv5O1DTHOQ" name="base_Connector" association="_VSnAcUhQEeO0lv5O1DTHOQ">

+      <ownedAttribute xmi:id="_VSnAcEhQEeO0lv5O1DTHOQ" name="base_Connector" association="_VSnAcUhQEeO0lv5O1DTHOQ">

         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>

       </ownedAttribute>

     </packagedElement>

@@ -15239,7 +197,7 @@
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_VSnAckhQEeO0lv5O1DTHOQ" name="extension_RTConnector" type="_Tv_-MEhQEeO0lv5O1DTHOQ" aggregation="composite" association="_VSnAcUhQEeO0lv5O1DTHOQ"/>

     </packagedElement>

     <packagedElement xmi:type="uml:Stereotype" xmi:id="_hSaaUEhQEeO0lv5O1DTHOQ" name="ProtocolContainer">

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_lAOv4EhQEeO0lv5O1DTHOQ" name="base_Package" association="_lAU2gEhQEeO0lv5O1DTHOQ">

+      <ownedAttribute xmi:id="_lAOv4EhQEeO0lv5O1DTHOQ" name="base_Package" association="_lAU2gEhQEeO0lv5O1DTHOQ">

         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

       </ownedAttribute>

     </packagedElement>

@@ -15247,7 +205,7 @@
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_lAU2gUhQEeO0lv5O1DTHOQ" name="extension_ProtocolContainer" type="_hSaaUEhQEeO0lv5O1DTHOQ" aggregation="composite" association="_lAU2gEhQEeO0lv5O1DTHOQ"/>

     </packagedElement>

     <packagedElement xmi:type="uml:Stereotype" xmi:id="_qJOC8EhQEeO0lv5O1DTHOQ" name="RTRExcludedElement">

-      <ownedRule xmi:type="uml:Constraint" xmi:id="_Cvp-EGfKEeO447LqwGjc0A" name="Exclusion can only be applied to some UML-RT model elements" constrainedElement="_qJOC8EhQEeO0lv5O1DTHOQ">

+      <ownedRule xmi:id="_Cvp-EGfKEeO447LqwGjc0A" name="Exclusion can only be applied to some UML-RT model elements" constrainedElement="_qJOC8EhQEeO0lv5O1DTHOQ">

         <specification xmi:type="uml:OpaqueExpression" xmi:id="_ufO8YGfKEeO447LqwGjc0A">

           <language>OCL</language>

           <body>let el = base_RedefinableElement in&#xD;

@@ -15259,7 +217,7 @@ el.oclIsKindOf(UML::State) or&#xD;
 el.oclIsKindOf(UML::Transition))</body>

         </specification>

       </ownedRule>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_tCAN8EhQEeO0lv5O1DTHOQ" name="base_RedefinableElement" association="_tCAN8UhQEeO0lv5O1DTHOQ">

+      <ownedAttribute xmi:id="_tCAN8EhQEeO0lv5O1DTHOQ" name="base_RedefinableElement" association="_tCAN8UhQEeO0lv5O1DTHOQ">

         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#RedefinableElement"/>

       </ownedAttribute>

     </packagedElement>

@@ -15267,29 +225,29 @@ el.oclIsKindOf(UML::Transition))</body>
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_tCAN8khQEeO0lv5O1DTHOQ" name="extension_RTRExcludedElement" type="_qJOC8EhQEeO0lv5O1DTHOQ" aggregation="composite" association="_tCAN8UhQEeO0lv5O1DTHOQ"/>

     </packagedElement>

     <packagedElement xmi:type="uml:Stereotype" xmi:id="_g6khEGDFEeOesvHnEWH_sQ" name="RTMessageSet">

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_iwFRMGDFEeOesvHnEWH_sQ" name="base_Interface" association="_iwFRMWDFEeOesvHnEWH_sQ">

+      <ownedAttribute xmi:id="_iwFRMGDFEeOesvHnEWH_sQ" name="base_Interface" association="_iwFRMWDFEeOesvHnEWH_sQ">

         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/>

       </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_qA0ykGDTEeOesvHnEWH_sQ" name="rtMsgKind" type="_UXMMIGDdEeOesvHnEWH_sQ">

-        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_0UwggGDTEeOesvHnEWH_sQ" value="true"/>

+      <ownedAttribute xmi:id="_qA0ykGDTEeOesvHnEWH_sQ" name="rtMsgKind" type="_UXMMIGDdEeOesvHnEWH_sQ">

+        <defaultValue xmi:type="uml:InstanceValue" xmi:id="_DKnSUDgsEeSIhOOQU6uyPw" type="_UXMMIGDdEeOesvHnEWH_sQ" instance="_W7oe0GDdEeOesvHnEWH_sQ"/>

       </ownedAttribute>

     </packagedElement>

     <packagedElement xmi:type="uml:Extension" xmi:id="_iwFRMWDFEeOesvHnEWH_sQ" name="E_RTMessageSet_Interface1" memberEnd="_iwFRMmDFEeOesvHnEWH_sQ _iwFRMGDFEeOesvHnEWH_sQ">

       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_iwFRMmDFEeOesvHnEWH_sQ" name="extension_RTMessageSet" type="_g6khEGDFEeOesvHnEWH_sQ" aggregation="composite" association="_iwFRMWDFEeOesvHnEWH_sQ"/>

     </packagedElement>

     <packagedElement xmi:type="uml:Enumeration" xmi:id="_UXMMIGDdEeOesvHnEWH_sQ" name="RTMessageKind">

-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_W7oe0GDdEeOesvHnEWH_sQ" name="in"/>

-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_X2AcYGDdEeOesvHnEWH_sQ" name="out"/>

-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_YcsB4GDdEeOesvHnEWH_sQ" name="inOut"/>

+      <ownedLiteral xmi:id="_W7oe0GDdEeOesvHnEWH_sQ" name="in"/>

+      <ownedLiteral xmi:id="_X2AcYGDdEeOesvHnEWH_sQ" name="out"/>

+      <ownedLiteral xmi:id="_YcsB4GDdEeOesvHnEWH_sQ" name="inOut"/>

     </packagedElement>

     <packagedElement xmi:type="uml:Extension" xmi:id="_RQYhEGF-EeOesvHnEWH_sQ" name="E_Protocol_Collaboration1" memberEnd="_RQYhEWF-EeOesvHnEWH_sQ _RQX6AGF-EeOesvHnEWH_sQ">

       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_RQYhEWF-EeOesvHnEWH_sQ" name="extension_Protocol" type="_8GLpsEhOEeO0lv5O1DTHOQ" aggregation="composite" association="_RQYhEGF-EeOesvHnEWH_sQ"/>

     </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_QU3d0BMkEeSz2qq_H0HScA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QV5YkBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

+    <profileApplication xmi:id="_QU3d0BMkEeSz2qq_H0HScA">

+      <eAnnotations xmi:id="_QV5YkBMkEeSz2qq_H0HScA" source="http://www.eclipse.org/uml2/2.0.0/UML">

         <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/dsmlvalidation#/"/>

       </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://DSMLValidation_PROFILES/PapyrusValidationRuleDSML.uml#__sUW0OhNEeCjcc2EgK3Uwg"/>

+      <appliedProfile href="pathmap://DSMLValidation_PROFILES/PapyrusValidationRuleDSML.uml#__sUW0OhNEeCjcc2EgK3Uwg"/>

     </profileApplication>

   </uml:Profile>

   <PapyrusDSMLValidationRule:ValidationRule xmi:id="_TaoU4BMkEeSz2qq_H0HScA" base_Constraint="_-g8psEhTEeO0lv5O1DTHOQ" message="Capsules are always active entities" id="isActiveEntity"/>

diff --git a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml
index c6aab311bd9..95b3ea2a156 100755
--- a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml
+++ b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.dev.feature" label="Papyrus Developer Tools (Incubation)" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.dev.feature" label="Papyrus Developer Tools (Incubation)" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2014 CEA LIST

diff --git a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/pom.xml b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/pom.xml
index ab7a6840aac..f84831c7865 100644
--- a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/pom.xml
+++ b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-dev.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.dev.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.build.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.build.feature/feature.xml
index 54677f4875e..4acf4948a01 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.build.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.build.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.build.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.build.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2008-2012 CEA LIST, Atos Origin, Conselleria de

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cdo.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.cdo.feature/feature.xml
index 7f96ff3e344..a2f2078c7cc 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cdo.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.cdo.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.cdo.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.cdo.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2013 CEA LIST.

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cdo.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.cdo.feature/pom.xml
index c123d450a51..94d63f1c9bd 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cdo.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.cdo.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.extra.cdo.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml
index 13f5251ca2a..4377ce63b39 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.cpp.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.cpp.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <description url="http://www.example.com/description">

       C++ code generation from Papyrus. The feature includes

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/pom.xml
index c3019b25dbd..7eed6fb4493 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.extra.cpp.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.diagramtemplate.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.diagramtemplate.feature/feature.xml
index 6eee8b856df..ccc288419a3 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.diagramtemplate.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.diagramtemplate.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.diagramtemplate.feature" label="Papyrus Diagram Template (Incubation)" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.diagramtemplate.feature" label="Papyrus Diagram Template (Incubation)" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2008-2012 CEA LIST, Atos Origin, Conselleria de

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.diagramtemplate.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.diagramtemplate.feature/pom.xml
index 02e559050e8..e039ba082ee 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.diagramtemplate.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.diagramtemplate.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.extra.diagramtemplate.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/feature.xml
index 0ddef55664d..912e372912c 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.dsml.validation.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.dsml.validation.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/pom.xml
index decb6f35f7a..ed36fab37d8 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.extra.dsml.validation.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.eastadl.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.eastadl.feature/feature.xml
index fa5f7ddceec..70543b23482 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.eastadl.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.eastadl.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.eastadl.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.eastadl.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2008-2012 CEA LIST, Atos Origin, Conselleria de

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.eastadl.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.eastadl.feature/pom.xml
index ee3d21d6798..07e99d6db12 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.eastadl.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.eastadl.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.extra.eastadl.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
index 0fb8aeaad6a..56f7d9e9e88 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2008-2013 CEA LIST, Atos Origin, Conselleria de

@@ -59,4 +59,6 @@ http://www.eclipse.org/legal/epl-v10.html
 

    <includes id="org.eclipse.papyrus.extra.moka.feature" version="0.0.0"/>

 

+   <includes id="org.eclipse.papyrus.migration.rsa.feature" version="0.0.0"/>

+

 </feature>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/pom.xml
index 8c4cf5221ff..3ad43fc5dfc 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.extra.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.layout.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.layout.feature/feature.xml
index 075b5797d99..6093f180266 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.layout.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.layout.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.layout.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.layout.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2008-2012 CEA LIST, Atos Origin, Conselleria de

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.feature/feature.xml
index 079eb05eb72..585cb7f9a11 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.marte.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.marte.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2008-2012 CEA LIST, Atos Origin, Conselleria de

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.feature/pom.xml
index 1d97b1fe720..df4357955df 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.extra.marte.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.properties.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.properties.feature/feature.xml
index 7b33b895502..27e2cdb1df7 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.properties.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.properties.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.marte.properties.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.marte.properties.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2008-2012 CEA LIST, Atos Origin, Conselleria de

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.properties.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.properties.feature/pom.xml
index 517cd21a195..bfa22c75323 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.properties.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.properties.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.extra.marte.properties.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.textedit.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.textedit.feature/feature.xml
index 0bb4baf7994..a71dc5b5631 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.textedit.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.textedit.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.marte.textedit.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.marte.textedit.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2008-2012 CEA LIST, Atos Origin, Conselleria de

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.textedit.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.textedit.feature/pom.xml
index 0729797c733..ec2d274024a 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.textedit.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.textedit.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.extra.marte.textedit.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.migration.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.migration.feature/feature.xml
index 9cb48d84a90..3bba839063a 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.migration.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.migration.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.migration.feature" label="Papyrus Migration Tools feature (Incubation)" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.migration.feature" label="Papyrus Migration Tools feature (Incubation)" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2008-2012 CEA LIST, Atos Origin, Conselleria de

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.migration.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.migration.feature/pom.xml
index d7f3947a16b..361dc93ee16 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.migration.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.migration.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.extra.migration.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.moka.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.moka.feature/feature.xml
index b97e5e12c9b..6f8e82a1325 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.moka.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.moka.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.moka.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.moka.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <description url="http://www.example.com/description">

       MOKA is a framework for executing/simulating debugging fUML models. 

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.moka.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.moka.feature/pom.xml
index 20dec72c1eb..4810a90c369 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.moka.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.moka.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.extra.moka.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/feature.xml
index 21f825527d6..3fd6395473d 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.qompass.designer.basic.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.qompass.designer.basic.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <description>

       The Qompass tool suite is a component based design methodology

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/pom.xml
index c4bc25bcccf..83bec4009c5 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.extra.qompass.designer.basic.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature/feature.xml
index 2fba2b45304..14dde508781 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.papyrus.extra.qompass.designer.tracing.feature"

       label="%featureName"

-      version="1.0.1.qualifier"

+      version="1.1.0.qualifier"

       provider-name="%providerName">

 

    <description>

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature/pom.xml
index a83136e7181..00885af02df 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.extra.qompass.designer.tracing.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/feature.xml
index ce6f1c526c3..ca9027fa2eb 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.robotml.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.robotml.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <description>

       RobotML Modelling Tools

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/pom.xml
index 1d52339647c..787be32eb08 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.extra.robotml.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml
index d6ad81db331..7f52a68919d 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.sources.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.sources.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2008-2013 CEA LIST, Atos Origin, Conselleria de

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.compare.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.compare.feature/feature.xml
index 6c9ff27a626..fc57cbecb28 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.compare.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.compare.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.uml.compare.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.uml.compare.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.compare.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.compare.feature/pom.xml
index f4654a57af6..857fc59c352 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.compare.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.compare.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.extra.uml.compare.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.umlrt.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.umlrt.feature/feature.xml
index 2a7d0105283..9957a742806 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.umlrt.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.umlrt.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.umlrt.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.umlrt.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2013 CEA LIST

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.umlrt.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.umlrt.feature/pom.xml
index ace6e61a2aa..115019f057a 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.umlrt.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.umlrt.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.extra.umlrt.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.java.generator.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.java.generator.feature/feature.xml
index a677bb3ee11..fb260418aa9 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.java.generator.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.java.generator.feature/feature.xml
@@ -1,34 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature

-      id="org.eclipse.papyrus.java.generator.feature"

-      label="%featureName"

-      version="1.0.1.qualifier"

-      provider-name="%providerName">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.java.generator.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <description url="http://www.example.com/description">

-      This feature allows to generate Java classes and packages from
-a UML model.
-It also allows to generate projects, with the help of the Java
+      This feature allows to generate Java classes and packages from

+a UML model.

+It also allows to generate projects, with the help of the Java

 profile.

    </description>

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      #################################################################################
-# Copyright (c) 2011 Nicolas Deblock &amp; Manuel Giles.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms 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 Deblock  nico.deblock@gmail.com  - Initial API and
-implementation
-#  Manuel Giles  giles.manu@live.fr   - Initial API and implementation
-#  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Idea of the java
-generator project &amp; help for the conception 
-#
+      #################################################################################

+# Copyright (c) 2011 Nicolas Deblock &amp; Manuel Giles.

+#

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms 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 Deblock  nico.deblock@gmail.com  - Initial API and

+implementation

+#  Manuel Giles  giles.manu@live.fr   - Initial API and implementation

+#  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Idea of the java

+generator project &amp; help for the conception 

+#

 #################################################################################

    </copyright>

 

@@ -41,68 +36,38 @@ generator project &amp; help for the conception
       <import plugin="org.eclipse.uml2.uml"/>

       <import plugin="org.eclipse.m2m.qvt.oml"/>

       <import plugin="org.eclipse.core.runtime"/>

-      <import plugin="org.eclipse.papyrus.java.generator.transfo.umltojdt" version="0.8.0" match="greaterOrEqual"/>

+      <import match="greaterOrEqual" plugin="org.eclipse.papyrus.java.generator.transfo.umltojdt" version="0.8.0"/>

       <import plugin="org.eclipse.jdt.core"/>

       <import plugin="org.eclipse.jface.text"/>

       <import plugin="org.eclipse.core.resources"/>

       <import plugin="org.eclipse.jdt.launching"/>

       <import plugin="org.eclipse.emf.ecore"/>

-      <import plugin="org.eclipse.uml2.common" version="1.5.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.jdt.core" version="3.6.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.emf.common" version="2.6.0" match="greaterOrEqual"/>

+      <import match="greaterOrEqual" plugin="org.eclipse.uml2.common" version="1.5.0"/>

+      <import match="greaterOrEqual" plugin="org.eclipse.jdt.core" version="3.6.0"/>

+      <import match="greaterOrEqual" plugin="org.eclipse.emf.common" version="2.6.0"/>

       <import plugin="org.eclipse.emf.edit"/>

       <import plugin="org.eclipse.uml2.common.edit"/>

       <import plugin="org.eclipse.emf.ecore.xmi"/>

       <import plugin="org.eclipse.emf.edit.ui"/>

       <import plugin="org.eclipse.ui.ide"/>

       <import plugin="org.eclipse.ui"/>

-      <import plugin="org.eclipse.core.resources" version="3.6.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.papyrus.java.generator.metamodel.jdt" version="0.8.0" match="greaterOrEqual"/>

+      <import match="greaterOrEqual" plugin="org.eclipse.core.resources" version="3.6.0"/>

+      <import match="greaterOrEqual" plugin="org.eclipse.papyrus.java.generator.metamodel.jdt" version="0.8.0"/>

       <import plugin="org.eclipse.jdt.ui"/>

-      <import plugin="org.eclipse.papyrus.java.generator.jdtsynchronizer" version="0.8.0" match="greaterOrEqual"/>

+      <import match="greaterOrEqual" plugin="org.eclipse.papyrus.java.generator.jdtsynchronizer" version="0.8.0"/>

       <import feature="org.eclipse.papyrus.java.profile.feature" version="0.8.0.qualifier"/>

    </requires>

 

-   <plugin

-         id="org.eclipse.papyrus.java.generator.jdtsynchronizer"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

+   <plugin download-size="0" id="org.eclipse.papyrus.java.generator.jdtsynchronizer" install-size="0" unpack="false" version="0.0.0"/>

 

-   <plugin

-         id="org.eclipse.papyrus.java.generator.metamodel.jdt"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

+   <plugin download-size="0" id="org.eclipse.papyrus.java.generator.metamodel.jdt" install-size="0" unpack="false" version="0.0.0"/>

 

-   <plugin

-         id="org.eclipse.papyrus.java.generator.metamodel.jdt.edit"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

+   <plugin download-size="0" id="org.eclipse.papyrus.java.generator.metamodel.jdt.edit" install-size="0" unpack="false" version="0.0.0"/>

 

-   <plugin

-         id="org.eclipse.papyrus.java.generator.metamodel.jdt.editor"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

+   <plugin download-size="0" id="org.eclipse.papyrus.java.generator.metamodel.jdt.editor" install-size="0" unpack="false" version="0.0.0"/>

 

-   <plugin

-         id="org.eclipse.papyrus.java.generator.transfo.umltojdt"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

+   <plugin download-size="0" id="org.eclipse.papyrus.java.generator.transfo.umltojdt" install-size="0" unpack="false" version="0.0.0"/>

 

-   <plugin

-         id="org.eclipse.papyrus.java.generator.ui"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

+   <plugin download-size="0" id="org.eclipse.papyrus.java.generator.ui" install-size="0" unpack="false" version="0.0.0"/>

 

-</feature>

+</feature>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.java.generator.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.java.generator.feature/pom.xml
index 9ace5d3099f..9f740805246 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.java.generator.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.java.generator.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.generator.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.java.profile.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.java.profile.feature/feature.xml
index 16b387377cf..18d8627c200 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.java.profile.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.java.profile.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.java.profile.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.java.profile.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <description url="http://www.example.com/description">

       Profile for the Java language.

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.java.profile.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.java.profile.feature/pom.xml
index e987462f939..1c47661cb07 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.java.profile.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.java.profile.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.profile.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.java.reverse.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.java.reverse.feature/feature.xml
index e4543644110..4b10da8a02c 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.java.reverse.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.java.reverse.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.java.reverse.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.java.reverse.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <description url="">

       Experimental Java Reverse Tool for Papyrus.

@@ -26,8 +26,13 @@ Contributors:
       <import match="greaterOrEqual" plugin="org.eclipse.emf.transaction" version="1.2.0"/>

       <import match="greaterOrEqual" plugin="org.eclipse.gef" version="3.4.0"/>

       <import match="greaterOrEqual" plugin="org.eclipse.jdt.core" version="3.4.0"/>

-      <import plugin="org.eclipse.papyrus.infra.core"/>

-      <import plugin="org.eclipse.papyrus.uml.tools"/>

+      <import match="greaterOrEqual" plugin="org.eclipse.papyrus.java.reverse" version="1.0.1"/>

+      <import match="greaterOrEqual" plugin="org.eclipse.papyrus.infra.core" version="1.0.1"/>

+      <import match="greaterOrEqual" plugin="org.eclipse.papyrus.uml.tools" version="1.0.1"/>

+      <import plugin="org.eclipse.gmf.runtime.diagram.core"/>

+      <import match="greaterOrEqual" plugin="org.eclipse.papyrus.infra.gmfdiag.dnd" version="1.0.1"/>

+      <import match="greaterOrEqual" plugin="org.eclipse.papyrus.infra.emf.diagram.common" version="1.0.1"/>

+      <import match="greaterOrEqual" plugin="org.eclipse.papyrus.uml.diagram.common" version="1.0.1"/>

    </requires>

 

    <plugin download-size="0" id="org.eclipse.papyrus.java.reverse" install-size="0" unpack="false" version="0.0.0"/>

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.java.reverse.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.java.reverse.feature/pom.xml
index afdcd30b152..b8efda2d4b4 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.java.reverse.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.java.reverse.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.java.reverse.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.layers.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.layers.feature/feature.xml
index 911a2d81625..34605d352da 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.layers.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.layers.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.layers.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.layers.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <description url="http://www.eclipse.com/papyrus">

       This plugins add Layers capapbilities to Papyrus diagrams.

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.layers.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.layers.feature/pom.xml
index 4d2b10bb6dc..e1709d9cc99 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.layers.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.layers.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.layers.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature/.project b/features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature/.project
new file mode 100644
index 00000000000..e8253e4c703
--- /dev/null
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.migration.rsa.feature</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.pde.FeatureBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.FeatureNature</nature>

+	</natures>

+</projectDescription>

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature/build.properties b/features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature/build.properties
new file mode 100644
index 00000000000..a22994c721f
--- /dev/null
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature/build.properties
@@ -0,0 +1,5 @@
+bin.includes = feature.xml,\

+               epl-v10.html,\

+               license.html

+src.includes = epl-v10.html,\

+               license.html

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature/epl-v10.html b/features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature/epl-v10.html
new file mode 100644
index 00000000000..cb1073a4bad
--- /dev/null
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature/epl-v10.html
@@ -0,0 +1,304 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<link rel=File-List
+href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<style>
+<!--
+ /* Font Definitions */
+@font-face
+	{
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	
+	}
+@page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head>
+
+<body lang="EN-US" style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal></p>
+
+</div>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature/feature.xml
new file mode 100644
index 00000000000..b47d084a18e
--- /dev/null
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature/feature.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.papyrus.migration.rsa.feature"

+      label="Papyrus RSA Import Feature"

+      version="1.1.0.qualifier"

+      provider-name="Eclipse Modeling Project">

+

+   <description>

+      This component allows importing UML models from RSA and RSA-RTE

+   </description>

+

+   <copyright>

+      Copyright (c) 2013 CEA LIST.

+     

+  All rights reserved.

+   </copyright>

+

+   <plugin

+         id="org.eclipse.papyrus.m2m.qvto"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.migration.rsa"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+</feature>

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature/license.html b/features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature/license.html
new file mode 100644
index 00000000000..0fd3dd13aac
--- /dev/null
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature/license.html
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

+<title>Eclipse Foundation Software User Agreement</title>

+</head>

+

+<body lang="EN-US">

+<h2>Eclipse Foundation Software User Agreement</h2>

+<p>April 9, 2014</p>

+

+<h3>Usage Of Content</h3>

+

+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

+

+<h3>Applicable Licenses</h3>

+

+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

+

+<ul>

+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

+      and/or Fragments associated with that Feature.</li>

+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

+</ul>

+

+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

+including, but not limited to the following locations:</p>

+

+<ul>

+       <li>The top-level (root) directory</li>

+       <li>Plug-in and Fragment directories</li>

+       <li>Inside Plug-ins and Fragments packaged as JARs</li>

+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

+       <li>Feature directories</li>

+</ul>

+

+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

+that directory.</p>

+

+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

+

+<ul>

+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

+</ul>

+

+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

+

+

+<h3>Use of Provisioning Technology</h3>

+

+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

+   (&quot;Specification&quot;).</p>

+

+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

+

+<ol>

+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

+       product.</li>

+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

+       accessed and copied to the Target Machine.</li>

+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

+</ol>

+

+<h3>Cryptography</h3>

+

+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

+

+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

+</body>

+</html>

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature/pom.xml
new file mode 100644
index 00000000000..c4ba096b5a5
--- /dev/null
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>1.1.0-SNAPSHOT</version>
+		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.migration.rsa.feature</artifactId>
+	<groupId>org.eclipse.papyrus</groupId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature/feature.xml
index 6fe20aed278..9163677520c 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <description>

       RTMaps generator for RobotML models.

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature/pom.xml
index c9968b487f8..218603ca146 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/feature.xml
index b63d460289c..0a5dbd72d66 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tablemigration.feature" label="Papyrus table (Incubation)" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tablemigration.feature" label="Papyrus table (Incubation)" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/pom.xml
index b0f0ee69595..906a046b19b 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.tablemigration.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.uml.export.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.uml.export.feature/feature.xml
index b7ea84ae12b..6aec2f7c5c0 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.uml.export.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.uml.export.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.export.feature" label="Papyrus Export Profiles Feature (Incubation)" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.export.feature" label="Papyrus Export Profiles Feature (Incubation)" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <description url="http://www.example.com/description">

       This feature enables expoting and installing applied profiles from worksapce

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.uml.export.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.uml.export.feature/pom.xml
index 6f8744e71cd..f13bb88bcfa 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.uml.export.feature/pom.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.uml.export.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.export.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.build.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.build.feature/feature.xml
index 26ae1c4f544..773ba1691d5 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.build.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.build.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.build.feature" label="Papyrus build feature" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.build.feature" label="Papyrus build feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/feature.xml
index 98f57332985..c900961adbb 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.customization.feature" label="Papyrus customization" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.customization.feature" label="Papyrus customization" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/pom.xml
index 2539506c543..f5299498b2f 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.customization.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.customization.fragment.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.customization.fragment.feature/feature.xml
index 06d0450e1f6..a8a7cf5c727 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.customization.fragment.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.customization.fragment.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.customization.fragment.feature" label="Papyrus Customization Fragment" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.customization.fragment.feature" label="Papyrus Customization Fragment" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

 <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml
index 2194c94b120..9abb93860ad 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.doc.feature" label="Papyrus Documentation Feature" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.doc.feature" label="Papyrus Documentation Feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2013 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/pom.xml
index 64d5d22d3c7..464b3423902 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.doc.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/feature.xml
index 716e221b7b8..92705051b52 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.editor.feature" label="Papyrus editor" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.editor.feature" label="Papyrus editor" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/pom.xml
index 4a756211b1c..bed3065dd38 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.editor.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/feature.xml
index c5f8db43348..9cc31f92823 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.emf.facet.feature" label="Papyrus Facet" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.emf.facet.feature" label="Papyrus Facet" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/pom.xml
index e0b20f2fb6d..d3e871dcbc3 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/feature.xml
index df408205ac5..92951bcca2c 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.core.feature" label="Papyrus core" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.core.feature" label="Papyrus core" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

 <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml
index bb604096db6..4eef6b04114 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.core.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/feature.xml
index 475e131bb69..ae354d229e9 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.discovery.feature" label="Papyrus Discovery Feature UI" plugin="org.eclipse.papyrus.infra.discovery" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.discovery.feature" label="Papyrus Discovery Feature UI" plugin="org.eclipse.papyrus.infra.discovery" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/pom.xml
index a7d653d0be3..48560c47229 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.discovery.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml
index 02778a6cec1..7857abe9fe5 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.emf.feature" label="Papyrus Infra EMF" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.emf.feature" label="Papyrus Infra EMF" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml
index 3e35c96c305..3418afdf28d 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.emf.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml
index ff55cbe9df1..203eecfc8d8 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.feature" label="Papyrus infra" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.feature" label="Papyrus infra" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml
index 863bec4d114..b4f6658146c 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml
index e93cf246628..de2a46d13cc 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.gmfdiag.css.feature" label="Papyrus CSS Feature" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.gmfdiag.css.feature" label="Papyrus CSS Feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/pom.xml
index eeeb1c5247a..ee8bcefd138 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml
index c181489c3bc..e44abaf4a2f 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.gmfdiag.feature" label="Papyrus GMF diagram" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.gmfdiag.feature" label="Papyrus GMF diagram" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/pom.xml
index 6cacc7d7a90..0721a321725 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml
index 7f3a7370f09..e539fa85f33 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.nattable.feature" label="Papyrus Table - New Version" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.nattable.feature" label="Papyrus Table - New Version" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="epl-v10.html">

       Copyright (c) 2013 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/pom.xml
index 5288d931246..df5253b8c68 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml
index 242d693467e..daaeb1ba7cf 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.services.feature" label="Papyrus services" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.services.feature" label="Papyrus services" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/pom.xml
index e7cebc32d8e..4a4d8857b59 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/feature.xml
index 2225e85cf17..e1862ba9f54 100755
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.viewpoints.feature" label="Papyrus Viewpoints" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.viewpoints.feature" label="Papyrus Viewpoints" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2013 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/pom.xml
index 649559308b4..e7442fae556 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.viewpoints.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml
index 89aeaf55300..d68be3e115e 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.widget.feature" label="Papyrus widgets" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.widget.feature" label="Papyrus widgets" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

 <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml
index 036b54e6d2e..c9309e984cf 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.widget.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
index 3378d6db4c0..5a01cd1d889 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sdk.feature" label="Papyrus UML" plugin="org.eclipse.papyrus.infra.core" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sdk.feature" label="Papyrus UML" plugin="org.eclipse.papyrus.infra.core" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012, 2013 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml
index 0f00ccb192b..ebbd3eaec4f 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sdk.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.sources.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.sources.feature/feature.xml
index c8b571f2941..f5efb6ad237 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.sources.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.sources.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sdk.sources.feature" label="Papyrus UML SDK" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sdk.sources.feature" label="Papyrus UML SDK" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012, 2013 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/feature.xml
index de923aab1c4..59c8b77bcd1 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sysml.diagram.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sysml.diagram.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST.

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/pom.xml
index 497a7c560cc..5875a82a035 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.diagram.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/feature.xml
index 2efa39a8537..a1e6bc6fb3b 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sysml.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sysml.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST.

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/pom.xml
index 8672930682c..9732a60897d 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/feature.xml
index 483f83003cb..60fe6b8a726 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sysml.modelexplorer.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sysml.modelexplorer.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST.

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/pom.xml
index cad15b6487f..da20c2ae4b3 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.modelexplorer.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/feature.xml
index 2ec0b95460d..2155f4abcc2 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sysml.nattable.feature" label="Papyrus SysML Table - New Version" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sysml.nattable.feature" label="Papyrus SysML Table - New Version" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/pom.xml
index ae3d3f1a926..eeee8da8d1a 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.nattable.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/feature.xml
index 5aeb0041db5..4a3bd61d66f 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sysml.properties.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sysml.properties.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST.

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/pom.xml
index 6e20632876a..3f596d1a632 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.properties.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.team.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.team.feature/feature.xml
index f243187bf3d..b50b639d079 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.team.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.team.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.team.feature" label="Papyrus Team Feature" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.team.feature" label="Papyrus Team Feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

 <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/feature.xml
index 871c025f453..dde1506f456 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.alf.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.alf.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST.

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/pom.xml
index 10bf999941d..095b604c2f2 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.alf.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/feature.xml
index b02e7678e07..4506ec1a23b 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.diagram.css.feature" label="Papyrus CSS UML Feature" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.diagram.css.feature" label="Papyrus CSS UML Feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2013 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/pom.xml
index 8f0a1edccd6..fbab1b3b346 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.css.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/feature.xml
index adf014c7484..c24d2ffe2c6 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.diagram.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.diagram.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST.

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/pom.xml
index 7980ac2f17b..15324109324 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml
index d2a88175794..b23a98f7a97 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST.

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml
index 189ef58beed..6661685e26c 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/feature.xml
index 24ffed5ff6d..90af65f8243 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.modelexplorer.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.modelexplorer.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST.

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/pom.xml
index ae1281bd92e..9cccd4717dd 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.modelexplorer.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/feature.xml
index 09a747c7cda..1e27e4d2eac 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.nattable.feature" label="Papyrus UML Table - New Version" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.nattable.feature" label="Papyrus UML Table - New Version" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/pom.xml
index 3c5c338386f..189d6febc24 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.nattable.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/feature.xml
index d0e55103877..0beeaf40c17 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.properties.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.properties.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST.

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/pom.xml
index b4862271021..3794ff5da84 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.properties.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/feature.xml
index fb6f09661fe..7b15a4d9023 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.search.feature" label="Papyrus UML Search Feature" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.search.feature" label="Papyrus UML Search Feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2013 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/pom.xml
index 450d02fc155..8e837060f32 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.search.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/feature.xml
index f7bd1de7326..8b1fc12c1d8 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.textedit.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.textedit.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST.

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/pom.xml
index fa9ea2e5939..637a3834fea 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/feature.xml
index d0bb6710be1..bc9a7c7f793 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.tools.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.tools.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST.

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/pom.xml
index ac96fc18c5b..fd776a2bc09 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.tools.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/feature.xml
index 1f3c9233c93..b3edcf7972f 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.xtext.integration.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.xtext.integration.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2013 CEA LIST.

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/pom.xml
index ff756965755..45c95030d94 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.xtext.integration.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/feature.xml
index a31bea912cf..e4b1c9e5160 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.views.modelexplorer.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.views.modelexplorer.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST.

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/pom.xml
index a67d9417e14..3044e0678d3 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.modelexplorer.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/feature.xml
index 33db69cb215..709eed6a90f 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.views.properties.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.views.properties.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST.

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/pom.xml
index d2736dc6752..a967b65bf17 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.properties.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/feature.xml
index 95acc9d4a43..a7c36930bc9 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.views.search.feature" label="Papyrus Search Feature" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.views.search.feature" label="Papyrus Search Feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2013 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/pom.xml
index 7ee8fd34929..08d42528524 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.search.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/feature.xml
index 8311e3e2466..0e3af8d23be 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.views.validation.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.views.validation.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2013 CEA LIST.

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/pom.xml
index 156de8b8d42..51094f0052c 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.validation.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.xwt.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.xwt.feature/feature.xml
index 2ce99113b38..0a2135c6a29 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.xwt.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.xwt.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.xwt.feature" label="Papyrus XWT Feature" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.xwt.feature" label="Papyrus XWT Feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2012 CEA LIST

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.xwt.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.xwt.feature/pom.xml
index 4317be9d306..16dbd1d8f8c 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.xwt.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.xwt.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.xwt.feature</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.build.feature/feature.xml b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.build.feature/feature.xml
index 00ae1f4df8e..343ffa59c97 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.build.feature/feature.xml
+++ b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.build.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.extra.build.feature" label="Papyrus extraplugins tests build Feature" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.extra.build.feature" label="Papyrus extraplugins tests build Feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

 <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2011 CEA LIST

diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.cdo.feature/feature.xml b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.cdo.feature/feature.xml
index fa026a750d7..6db138bd955 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.cdo.feature/feature.xml
+++ b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.cdo.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.extra.cdo.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.extra.cdo.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2013 CEA LIST.

diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.codegen.cpp.feature/feature.xml b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.codegen.cpp.feature/feature.xml
index 121fb9fb05d..d0895ff30cd 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.codegen.cpp.feature/feature.xml
+++ b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.codegen.cpp.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.extra.codegen.cpp.feature" label="Papyrus extra-plugins cpp codegen test feature" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.extra.codegen.cpp.feature" label="Papyrus extra-plugins cpp codegen test feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2011 CEA LIST

diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.feature/feature.xml b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.feature/feature.xml
index e5d92a5c754..35dd9472493 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.feature/feature.xml
+++ b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.extra.feature" label="Papyrus extra-plugins tests Feature" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.extra.feature" label="Papyrus extra-plugins tests Feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2011 CEA LIST

@@ -54,9 +54,7 @@ Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in t
 

    <includes id="org.eclipse.papyrus.tests.extra.codegen.cpp.feature" version="0.0.0"/>

 

-   <requires>

-      <import match="compatible" plugin="com.google.guava" version="12.0.0"/>

-   </requires>

+   <includes id="org.eclipse.papyrus.tests.extra.migration.rsa.featire" version="0.0.0"/>

 

    <plugin download-size="0" id="org.eclipse.papyrus.tests.extra" install-size="0" unpack="false" version="0.0.0"/>

 

diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.migration.rsa.featire/.project b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.migration.rsa.featire/.project
new file mode 100644
index 00000000000..40012aff036
--- /dev/null
+++ b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.migration.rsa.featire/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.tests.extra.migration.rsa.featire</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.pde.FeatureBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.FeatureNature</nature>

+	</natures>

+</projectDescription>

diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.migration.rsa.featire/build.properties b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.migration.rsa.featire/build.properties
new file mode 100644
index 00000000000..a22994c721f
--- /dev/null
+++ b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.migration.rsa.featire/build.properties
@@ -0,0 +1,5 @@
+bin.includes = feature.xml,\

+               epl-v10.html,\

+               license.html

+src.includes = epl-v10.html,\

+               license.html

diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.migration.rsa.featire/epl-v10.html b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.migration.rsa.featire/epl-v10.html
new file mode 100644
index 00000000000..cb1073a4bad
--- /dev/null
+++ b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.migration.rsa.featire/epl-v10.html
@@ -0,0 +1,304 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<link rel=File-List
+href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<style>
+<!--
+ /* Font Definitions */
+@font-face
+	{
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	
+	}
+@page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head>
+
+<body lang="EN-US" style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal></p>
+
+</div>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.migration.rsa.featire/feature.xml b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.migration.rsa.featire/feature.xml
new file mode 100644
index 00000000000..2a4a3f35710
--- /dev/null
+++ b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.migration.rsa.featire/feature.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.extra.migration.rsa.featire" label="Papyrus RSA Import Test Feature" version="1.1.0.qualifier">

+

+   <description url="http://www.example.com/description">

+      [Enter Feature Description here.]

+   </description>

+

+   <copyright url="http://www.example.com/copyright">

+      [Enter Copyright Description here.]

+   </copyright>

+

+   <license url="http://www.example.com/license">

+      [Enter License Description here.]

+   </license>

+

+</feature>
\ No newline at end of file
diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.migration.rsa.featire/license.html b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.migration.rsa.featire/license.html
new file mode 100644
index 00000000000..0fd3dd13aac
--- /dev/null
+++ b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.migration.rsa.featire/license.html
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

+<title>Eclipse Foundation Software User Agreement</title>

+</head>

+

+<body lang="EN-US">

+<h2>Eclipse Foundation Software User Agreement</h2>

+<p>April 9, 2014</p>

+

+<h3>Usage Of Content</h3>

+

+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

+

+<h3>Applicable Licenses</h3>

+

+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

+

+<ul>

+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

+      and/or Fragments associated with that Feature.</li>

+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

+</ul>

+

+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

+including, but not limited to the following locations:</p>

+

+<ul>

+       <li>The top-level (root) directory</li>

+       <li>Plug-in and Fragment directories</li>

+       <li>Inside Plug-ins and Fragments packaged as JARs</li>

+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

+       <li>Feature directories</li>

+</ul>

+

+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

+that directory.</p>

+

+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

+

+<ul>

+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

+</ul>

+

+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

+

+

+<h3>Use of Provisioning Technology</h3>

+

+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

+   (&quot;Specification&quot;).</p>

+

+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

+

+<ol>

+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

+       product.</li>

+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

+       accessed and copied to the Target Machine.</li>

+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

+</ol>

+

+<h3>Cryptography</h3>

+

+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

+

+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

+</body>

+</html>

diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.uml.compare.feature/feature.xml b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.uml.compare.feature/feature.xml
index 7daf7747e43..c55fa57a5df 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.uml.compare.feature/feature.xml
+++ b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.uml.compare.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.extra.uml.compare.feature" label="Test Feature for UML Compare" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.extra.uml.compare.feature" label="Test Feature for UML Compare" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <description url="http://www.example.com/description">

       [Enter Feature Description here.]

diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.build.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.build.feature/feature.xml
index 9fe1a97fb9b..b2d1b6f4d62 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.build.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.build.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.build.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.build.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2008-2012 CEA LIST, Atos Origin, Conselleria de

diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml
index 0df8eba3bd4..83c0c2baece 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2008-2014 CEA LIST, Atos Origin, Conselleria de

diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/pom.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/pom.xml
index 6bab7c59f46..eac3fabc162 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/pom.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.tests.feature</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.core.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.core.feature/feature.xml
index e7627e666bb..facf4f21927 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.core.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.core.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.infra.core.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.infra.core.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2008-2012 CEA LIST, Atos Origin, Conselleria de

diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.core.feature/pom.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.core.feature/pom.xml
index 5739eb250f0..4f76bb5f280 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.core.feature/pom.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.core.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.tests.infra.core.feature</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature/feature.xml
index fe5ba1dc564..75a9d81d2e8 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.infra.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.infra.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2008-2014 CEA LIST, Atos Origin, Conselleria de

diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature/pom.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature/pom.xml
index 4c8113b81a2..3068852f68f 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature/pom.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.tests.infra.feature</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.nattable.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.nattable.feature/feature.xml
index c36835f3058..98500289ed3 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.nattable.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.nattable.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.infra.nattable.feature" label="Infra Nattable Test Feature" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.infra.nattable.feature" label="Infra Nattable Test Feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2011 CEA LIST

diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.nattable.feature/pom.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.nattable.feature/pom.xml
index 94fe7163ad4..ddf18c35bae 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.nattable.feature/pom.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.nattable.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.tests.infra.nattable.feature</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.queries.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.queries.feature/feature.xml
index 7595e0aa02b..7ee4de3e468 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.queries.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.queries.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.infra.queries.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.infra.queries.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2008-2012 CEA LIST, Atos Origin, Conselleria de

diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.services.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.services.feature/feature.xml
index 69589fcef35..0c19ad14568 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.services.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.services.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.infra.services.feature" label="%featureName" provider-name="%providerName" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.infra.services.feature" label="%featureName" provider-name="%providerName" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2008-2012 CEA LIST, Atos Origin, Conselleria de

diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.services.feature/pom.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.services.feature/pom.xml
index 44224116542..84faff84b06 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.services.feature/pom.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.services.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.tests.infra.services.feature</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.diagram.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.diagram.feature/feature.xml
index 13f9144f66c..3f9421fde9e 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.diagram.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.diagram.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.sysml.diagram.feature" label="Tests SysML Diagram Feature" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.sysml.diagram.feature" label="Tests SysML Diagram Feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <description url="http://www.example.com/description">

       [Enter Feature Description here.]

diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.diagram.feature/pom.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.diagram.feature/pom.xml
index 89f91d0adc5..a55b50fa7cd 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.diagram.feature/pom.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.diagram.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.tests.sysml.diagram.feature</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.feature/feature.xml
index 25b1c5c611a..925cecac9df 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.sysml.feature" label="Tests SysML Feature" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.sysml.feature" label="Tests SysML Feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <description url="http://www.example.com/description">

       [Enter Feature Description here.]

diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.feature/pom.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.feature/pom.xml
index 557ecd06a2c..1d26e53d4b5 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.feature/pom.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.tests.sysml.feature</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.nattable.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.nattable.feature/feature.xml
index c87f0158ddb..f3df6273641 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.nattable.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.nattable.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.sysml.nattable.feature" label="SysML NatTable Feature Tests" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.sysml.nattable.feature" label="SysML NatTable Feature Tests" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2011 CEA LIST

diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.nattable.feature/pom.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.nattable.feature/pom.xml
index 01ea55cdfaf..9f215ce2d9b 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.nattable.feature/pom.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.nattable.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.tests.sysml.nattable.feature</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/feature.xml
index 42f55bd511f..a796805666d 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.uml.diagram.feature" label="Tests UML Diagram Feature" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.uml.diagram.feature" label="Tests UML Diagram Feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2011, 2014 CEA LIST and others

diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/pom.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/pom.xml
index 124785083a6..13a62ed538c 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/pom.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.tests.uml.diagram.feature</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.feature/feature.xml
index 312ee6ce5d2..c6f13e3d914 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.uml.feature" label="Tests UML Feature" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.uml.feature" label="Tests UML Feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <description url="http://www.example.com/description">

       [Enter Feature Description here.]

diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.feature/pom.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.feature/pom.xml
index 17b45af7d58..2549c181b6a 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.feature/pom.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.tests.uml.feature</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.nattable.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.nattable.feature/feature.xml
index a2e470fe284..a2e072b0963 100755
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.nattable.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.nattable.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.uml.nattable.feature" label="UML NatTable Test Feature" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.uml.nattable.feature" label="UML NatTable Test Feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2013 CEA LIST

diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.nattable.feature/pom.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.nattable.feature/pom.xml
index 2dfe9ae1078..e8a5f9da41b 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.nattable.feature/pom.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.nattable.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.tests.uml.nattable.feature</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.tools.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.tools.feature/feature.xml
index 2fdcd72c6ea..d59d2ca4f07 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.tools.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.tools.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.uml.tools.feature" label="Papyrus UML Tools tests feature" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.uml.tools.feature" label="Papyrus UML Tools tests feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

 <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2011 CEA LIST

diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.tools.feature/pom.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.tools.feature/pom.xml
index a58a8f4e688..e950c49d469 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.tools.feature/pom.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.tools.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.tests.uml.tools.feature</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.views.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.views.feature/feature.xml
index 8d828669b85..1a8a50adf4e 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.views.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.views.feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.views.feature" label="PapyrusView Modelexplorer Feature" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.views.feature" label="PapyrusView Modelexplorer Feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

       Copyright (c) 2011 CEA LIST

diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.views.feature/pom.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.views.feature/pom.xml
index 60b101af9b1..d7972a602f5 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.views.feature/pom.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.views.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.tests.views.feature</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF
index 310af15659f..89453f8ea68 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF
@@ -4,22 +4,22 @@ Export-Package: org.eclipse.papyrus.customization.palette,
  org.eclipse.papyrus.customization.palette.proxies

 Require-Bundle: org.eclipse.pde;bundle-version="3.6.0",

  org.eclipse.pde.ui;bundle-version="3.6.0",

- org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.1.0",

  org.eclipse.core.runtime;bundle-version="3.8.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.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.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/pom.xml b/plugins/customization/org.eclipse.papyrus.customization.palette/pom.xml
index 5d92f46d6a3..89bc97e54a3 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/pom.xml
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.customization.palette</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF
index 798572b4085..1d764056860 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF
@@ -3,15 +3,15 @@ Export-Package: org.eclipse.papyrus.customization.paletteconfiguration,
  org.eclipse.papyrus.customization.paletteconfiguration.queries

 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",

  org.eclipse.core.runtime;bundle-version="3.7.0",

- org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="3.2.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.customization.paletteconfigurati

diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/pom.xml b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/pom.xml
index ab684a75c2d..78fafd7c139 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/pom.xml
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.customization.paletteconfiguration</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF
index 656e11984fa..ff45dd142f3 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF
@@ -7,34 +7,34 @@ Export-Package: org.eclipse.papyrus.customization.properties.generation,
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.1",

  org.eclipse.osgi;bundle-version="3.6.1",

  org.eclipse.core.runtime;bundle-version="3.6.0",

- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",

  org.eclipse.m2m.qvt.oml;bundle-version="3.0.1",

  org.eclipse.m2m.qvt.oml.common;bundle-version="2.1.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties.model.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties.model.edit;bundle-version="1.1.0",

  org.eclipse.emf.common.ui;bundle-version="2.6.0",

  org.eclipse.core.resources;bundle-version="3.6.0",

  org.eclipse.uml2.uml;bundle-version="3.1.1",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

  org.eclipse.core.databinding;bundle-version="1.3.100",

  org.eclipse.emf.databinding;bundle-version="1.2.0",

  org.eclipse.core.databinding.property;bundle-version="1.3.0",

- org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.m2m.qvt.oml.project;bundle-version="3.1.0",

- org.eclipse.papyrus.customization.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.customization.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.jface.databinding;bundle-version="1.6.200",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .,

  bin

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Eclipse-BuddyPolicy: dependent

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/pom.xml b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/pom.xml
index 3330291ccda..3a0675e0f60 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/pom.xml
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.customization.properties.generation</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF
index 98f9eb0a8eb..d6f1a27bbd8 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF
@@ -7,9 +7,9 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

  org.eclipse.emf.ecore,

  org.eclipse.m2m.qvt.oml;bundle-version="3.1.0",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.wst.xml.core;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.7.0",

  org.eclipse.m2m.qvt.oml.project;bundle-version="3.1.0",

@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui,
 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.customization.properties.model.x

  wt.Activator

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/pom.xml b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/pom.xml
index 90cb577ec0f..231c84b2ecb 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/pom.xml
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.customization.properties.model.xwt</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF
index 1c262d172aa..1a31690e70f 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF
@@ -7,26 +7,26 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;bundle-version="3.6.0",

  org.eclipse.core.databinding.observable;bundle-version="1.3.0",

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1",

- org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="1.1.0",

  org.eclipse.emf.ecore.editor;bundle-version="2.6.0",

  org.eclipse.emf.databinding;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .,

  bin

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.customization.properties.Activat

  or

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/OSGI-INF/l10n/bundle.properties b/plugins/customization/org.eclipse.papyrus.customization.properties/OSGI-INF/l10n/bundle.properties
index 995f3e3f84d..969757d0342 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/OSGI-INF/l10n/bundle.properties
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/OSGI-INF/l10n/bundle.properties
@@ -2,16 +2,16 @@
 Bundle-Name = Papyrus properties customization

 Bundle-Vendor = Eclipse Modeling Project

 editor.name = Properties View Editor

-customize.command.label = Customize Property view

+customize.command.label = Customize Properties view

 customize.command.mnemonic = C

-customize.command.tooltip = Customize the content of the Property View

+customize.command.tooltip = Customize the content of the Properties View

 customize.command.description = This command allows customization of the content of the properties view

 customize.command.name = Customize properties view

-view.name = Customization preview

-perspective.name = Property view Customization

-page.name = Property view customization

-command.description = Customize the Property view

-command.name = Customize property view

+view.name = Customization Preview

+perspective.name = Properties View Customization

+page.name = Properties View Customization

+command.description = Customize the Properties view

+command.name = Customize properties view

 command.description.0 = Toggles the customization's Preview view

 command.name.0 = Toggle preview

 command.description.1 = Toggles the DataContext display

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/pom.xml b/plugins/customization/org.eclipse.papyrus.customization.properties/pom.xml
index b62ae876a6d..03c2af283cb 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/pom.xml
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.customization.properties</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java
index e9ec2377b75..3e0903fba4a 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java
@@ -12,9 +12,13 @@
  *****************************************************************************/

 package org.eclipse.papyrus.customization.properties.editor;

 

+import java.io.IOException;

+import java.io.OutputStream;

 import java.util.EventObject;

+import java.util.HashMap;

 import java.util.HashSet;

 import java.util.Iterator;

+import java.util.Map;

 import java.util.Set;

 

 import org.eclipse.core.resources.IFile;

@@ -32,6 +36,8 @@ import org.eclipse.emf.ecore.presentation.EcoreEditorPlugin;
 import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.ecore.resource.URIConverter;

+import org.eclipse.emf.ecore.resource.URIHandler;

 import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

@@ -245,7 +251,49 @@ public class UIEditor extends EcoreEditor implements ITabbedPropertySheetPageCon
 	}

 

 	@Override

+	protected void updateProblemIndication() {

+		super.updateProblemIndication();

+		// if (updateProblemIndication){

+		// for (Diagnostic diag : resourceToDiagnosticMap.values()){

+		// if (diag.getSeverity() != Diagnostic.OK)

+		// Activator.log.error(diag.getMessage(), diag.getException());

+		// }

+		// }

+	}

+

+	@Override

 	public void doSave(IProgressMonitor progressMonitor) {

+		if (editingDomain.getResourceToReadOnlyMap() == null) {

+			editingDomain.setResourceToReadOnlyMap(new HashMap<Resource, Boolean>());

+		}

+

+		Map<Resource, Boolean> readOnlyMap = editingDomain.getResourceToReadOnlyMap();

+		ResourceSet resourceSet = getEditingDomain().getResourceSet();

+

+		for (Resource resource : resourceSet.getResources()) {

+			if (readOnlyMap.containsKey(resource)) {

+				continue;

+			}

+

+			URIHandler handler = resourceSet.getURIConverter().getURIHandler(resource.getURI());

+			Map<String, Object> options = new HashMap<String, Object>();

+			options.put(URIConverter.OPTION_URI_CONVERTER, resourceSet.getURIConverter());

+			try {

+				OutputStream os = handler.createOutputStream(resource.getURI(), options);

+				readOnlyMap.put(resource, os == null);

+				if (os != null) {

+					os.close();

+				}

+			} catch (IOException ex) {

+				// Currently, createOutputStream() fails on a NPE if the resource is read-only.

+				// Only log a warning, since the editor is currently not able to properly check for

+				// read-only state without calling createOutputStream

+				// See Bug 351146 for potential options regarding a proper fix

+				Activator.log.warn("Trying to save a read-only resource: " + resource.getURI());

+				readOnlyMap.put(resource, true);

+			}

+		}

+

 		super.doSave(progressMonitor);

 		refreshContext();

 	}

diff --git a/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF
index f26e71711b4..48158cc1fbf 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF
@@ -5,19 +5,19 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.pde;bundle-version="3.6.100",

  org.eclipse.core.resources;bundle-version="3.7.100",

  org.eclipse.pde.core;bundle-version="3.7.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

  org.eclipse.pde.ui;bundle-version="3.6.100",

  org.eclipse.ui.ide;bundle-version="3.7.0",

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.eclipse.project.editors;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.eclipse.project.editors;bundle-version="1.1.0",

  org.eclipse.core.databinding;bundle-version="1.4.0",

  org.eclipse.emf.edit;bundle-version="2.7.0",

  org.eclipse.emf.databinding;bundle-version="1.2.0",

- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1"

+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.customization.factory,

  org.eclipse.papyrus.customization.generator,

  org.eclipse.papyrus.customization.model.customizationplugin,

@@ -27,7 +27,7 @@ Export-Package: org.eclipse.papyrus.customization.factory,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.customization.Activator

diff --git a/plugins/customization/org.eclipse.papyrus.customization/pom.xml b/plugins/customization/org.eclipse.papyrus.customization/pom.xml
index bdd4d12b079..407575c7a67 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/pom.xml
+++ b/plugins/customization/org.eclipse.papyrus.customization/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.customization</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF
index 52110f5454a..8e5de62ec2b 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF
@@ -8,10 +8,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.m2m.qvt.oml;bundle-version="2.0.0",

  org.eclipse.gmf.codegen.xtend;bundle-version="1.0.0",

  org.eclipse.gmf.codegen.xtend.ui;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.codegen.Activator

diff --git a/plugins/developer/org.eclipse.papyrus.codegen/pom.xml b/plugins/developer/org.eclipse.papyrus.codegen/pom.xml
index 9904916faea..22be0af9eb3 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/pom.xml
+++ b/plugins/developer/org.eclipse.papyrus.codegen/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-dev.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.codegen</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.def/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.def/META-INF/MANIFEST.MF
index 77d5884c4d8..6ba08e7d78c 100644
--- a/plugins/developer/org.eclipse.papyrus.def/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.def/META-INF/MANIFEST.MF
@@ -16,12 +16,12 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  com.google.guava;bundle-version="11.0.0",

  org.eclipse.xtext.xbase.lib,

  org.eclipse.gmf.codegen.xtend;bundle-version="1.0.0",

- org.eclipse.papyrus.gmfgenextension;bundle-version="1.0.1",

- org.eclipse.papyrus.codegen;bundle-version="1.0.1"

+ org.eclipse.papyrus.gmfgenextension;bundle-version="1.1.0",

+ org.eclipse.papyrus.codegen;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ClassPath: bin/,

  .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.gmf.codegen.util.DefaultActivator

diff --git a/plugins/developer/org.eclipse.papyrus.def/pom.xml b/plugins/developer/org.eclipse.papyrus.def/pom.xml
index 8bb0001c5cd..c3b832b0428 100644
--- a/plugins/developer/org.eclipse.papyrus.def/pom.xml
+++ b/plugins/developer/org.eclipse.papyrus.def/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-dev.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.def</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.dev.java.utils/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.java.utils/META-INF/MANIFEST.MF
index 4412fe42a42..f3f16b87121 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.java.utils/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.dev.java.utils/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jdt.core

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.dev.java.utils.Activator

diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF
index 2456dc9bf81..7607d16f19a 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.facet.common.ui

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.dev.view.services.edit.request.A

diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/pom.xml b/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/pom.xml
index 4fb9de376f8..d4a7e0889db 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/pom.xml
+++ b/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-dev.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.dev.view.services.edit.request</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.developer.profile/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.developer.profile/META-INF/MANIFEST.MF
index d7a137ed768..3457fd18d59 100644
--- a/plugins/developer/org.eclipse.papyrus.developer.profile/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.developer.profile/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.developer.profile.Activator

diff --git a/plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer/META-INF/MANIFEST.MF
index aa48615959d..bf437ede4bd 100644
--- a/plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer/META-INF/MANIFEST.MF
@@ -3,21 +3,21 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.navigator;bundle-version="3.4.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.uml2.uml.editor;bundle-version="3.1.0",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

  org.eclipse.emf.facet.infra.facet;bundle-version="0.1.0",

  org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0",

  org.eclipse.emf.ecore,

  org.eclipse.gmf.runtime.notation,

  org.eclipse.emf.facet.infra.query.core,

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .,

  bin

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.diagramdev.modelexplorer.Activat

diff --git a/plugins/developer/org.eclipse.papyrus.doc/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.doc/META-INF/MANIFEST.MF
index e8c37e83c6f..4f4d4297142 100644
--- a/plugins/developer/org.eclipse.papyrus.doc/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.doc/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.equinox.app,
  org.eclipse.ui.intro,

  org.eclipse.pde.ui;bundle-version="3.6.100"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/META-INF/MANIFEST.MF
index 61f9009d5ad..979e1be0128 100644
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.documentation.plugin;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.documentation.plugin;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.edit;visibility:=reexport,

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.emf.ecore.edit;visibility:=reexport

@@ -9,7 +9,7 @@ Export-Package: org.eclipse.papyrus.documentation.plugin.documentation
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.documentation.plugin.documentati

diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/pom.xml b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/pom.xml
index 8df5f35ea3a..59ccd0ad1cc 100644
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/pom.xml
+++ b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-dev.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.documentation.plugin.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/META-INF/MANIFEST.MF
index 7e1d51a5df1..79fdb5d9d9a 100644
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.documentation.plugin.edit;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.documentation.plugin.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport,

  org.eclipse.emf.edit.ui;visibility:=reexport,

  org.eclipse.ui.ide;visibility:=reexport,

@@ -11,7 +11,7 @@ Export-Package: org.eclipse.papyrus.documentation.plugin.documentation
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.documentation.plugin.documentati

diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.documentation.plugin/META-INF/MANIFEST.MF
index 59973800806..0b5837d656a 100644
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.documentation.plugin/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Export-Package: org.eclipse.papyrus.documentation.plugin.documentation,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/pom.xml b/plugins/developer/org.eclipse.papyrus.documentation.plugin/pom.xml
index 33aaa8ad6cd..7fff385e63f 100644
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/pom.xml
+++ b/plugins/developer/org.eclipse.papyrus.documentation.plugin/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-dev.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.documentation.plugin</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/META-INF/MANIFEST.MF
index 65d7d8cec55..6a5353030d6 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/META-INF/MANIFEST.MF
@@ -8,11 +8,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ocl.ecore,

  org.eclipse.acceleo.model,

  org.eclipse.acceleo.engine,

- org.eclipse.papyrus.domaincontextcodegen;bundle-version="1.0.1"

+ org.eclipse.papyrus.domaincontextcodegen;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.domaincodegen.ui.Activator

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/META-INF/MANIFEST.MF
index 6182e0bed23..34e5023e837 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.domaincontextcodegen;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.domaincontextcodegen;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.edit;visibility:=reexport,

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.emf.ecore.edit;visibility:=reexport

@@ -8,7 +8,7 @@ Export-Package: org.eclipse.papyrus.domaincontextcodegen.provider
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.domaincontextcodegen.provider.Do

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/pom.xml b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/pom.xml
index 6482a8c0eb1..cd14d964976 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/pom.xml
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-dev.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.domaincontextcodegen.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/META-INF/MANIFEST.MF
index e20e0555e08..013e6be217e 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.domaincontextcodegen.edit;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.domaincontextcodegen.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport,

  org.eclipse.emf.edit.ui;visibility:=reexport,

  org.eclipse.ui.ide;visibility:=reexport,

@@ -10,7 +10,7 @@ Export-Package: org.eclipse.papyrus.domaincontextcodegen.presentation
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.domaincontextcodegen.presentatio

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/pom.xml b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/pom.xml
index ba37bb0e4e5..22ae242e600 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/pom.xml
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-dev.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.domaincontextcodegen.editor</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/META-INF/MANIFEST.MF
index 3a637e2135d..9eaa9249e1a 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Export-Package: org.eclipse.papyrus.domaincontextcodegen,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/pom.xml b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/pom.xml
index dd642d1ae67..6e54cdb1e6b 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/pom.xml
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-dev.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.domaincontextcodegen</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF
index 10b8f43068d..6b3cbf31d07 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF
@@ -4,13 +4,13 @@ Export-Package: org.eclipse.papyrus.gmf.editpartview,
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.gmf.runtime.diagram.ui,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.1"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.gmf.editpartview.Activator

diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/pom.xml b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/pom.xml
index 5947942dfb3..22c7313a219 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/pom.xml
+++ b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-dev.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.gmf.editpartview</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF
index d4ba52a576c..6c1b46a41d8 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.gmf.editpoliciesstates.Activator

diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/pom.xml b/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/pom.xml
index a860be1cd40..dd95b0ed7bc 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/pom.xml
+++ b/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-dev.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.gmf.editpoliciesstates</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF
index 631a15ff6c6..6ea14bbfc87 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF
@@ -3,14 +3,14 @@ Export-Package: org.eclipse.papyrus.gmf.figureview,
  org.eclipse.papyrus.gmf.figureview.view

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.gmf.figureview.Activator

diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/pom.xml b/plugins/developer/org.eclipse.papyrus.gmf.figureview/pom.xml
index 4b88216a597..d1262fbe433 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/pom.xml
+++ b/plugins/developer/org.eclipse.papyrus.gmf.figureview/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-dev.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.gmf.figureview</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF
index 8f684de4628..d5bb01d1bae 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;bundle-version="2.10.0";visibility:=reexport,

- org.eclipse.papyrus.domaincontextcodegen;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.domaincontextcodegen;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.codegen.ecore;bundle-version="2.10.0";visibility:=reexport,

  org.eclipse.gmf.codegen;bundle-version="2.11.0";visibility:=reexport,

  org.eclipse.ui;bundle-version="3.5.0",

@@ -15,7 +15,7 @@ Export-Package: org.eclipse.papyrus.papyrusgmfgenextension,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/pom.xml b/plugins/developer/org.eclipse.papyrus.gmfgenextension/pom.xml
index 510533040ad..aed6643b942 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/pom.xml
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-dev.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.gmfgenextension</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview/META-INF/MANIFEST.MF
index 5941e3bd17f..01f57d5da60 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview/META-INF/MANIFEST.MF
@@ -5,14 +5,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

  org.eclipse.emf.facet.common.ui,

  org.eclipse.gmf.runtime.diagram.ui,

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.elementtypev

diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF
index abb1f62d6a2..a80b7bb0837 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Export-Package: org.eclipse.papyrus.mwe2.utils,
  org.eclipse.papyrus.mwe2.utils.messages

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.mwe2.utils.Activator

diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/.classpath b/plugins/developer/org.eclipse.papyrus.releng.tools/.classpath
new file mode 100644
index 00000000000..8a8f1668cdc
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/.project b/plugins/developer/org.eclipse.papyrus.releng.tools/.project
new file mode 100644
index 00000000000..b85bc70e191
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.releng.tools</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

+	</natures>

+</projectDescription>

diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.jdt.core.prefs b/plugins/developer/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..410244d65a6
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

+org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.6

+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_assignment=0

+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

+org.eclipse.jdt.core.formatter.blank_lines_after_package=1

+org.eclipse.jdt.core.formatter.blank_lines_before_field=0

+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

+org.eclipse.jdt.core.formatter.blank_lines_before_method=1

+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

+org.eclipse.jdt.core.formatter.blank_lines_before_package=0

+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

+org.eclipse.jdt.core.formatter.comment.format_block_comments=true

+org.eclipse.jdt.core.formatter.comment.format_header=false

+org.eclipse.jdt.core.formatter.comment.format_html=true

+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

+org.eclipse.jdt.core.formatter.comment.format_line_comments=true

+org.eclipse.jdt.core.formatter.comment.format_source_code=true

+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

+org.eclipse.jdt.core.formatter.comment.line_length=260

+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

+org.eclipse.jdt.core.formatter.compact_else_if=true

+org.eclipse.jdt.core.formatter.continuation_indentation=2

+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

+org.eclipse.jdt.core.formatter.indent_empty_lines=false

+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

+org.eclipse.jdt.core.formatter.indentation.size=4

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.join_lines_in_comments=false

+org.eclipse.jdt.core.formatter.join_wrapped_lines=false

+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

+org.eclipse.jdt.core.formatter.lineSplit=260

+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

+org.eclipse.jdt.core.formatter.tabulation.char=tab

+org.eclipse.jdt.core.formatter.tabulation.size=4

+org.eclipse.jdt.core.formatter.use_on_off_tags=false

+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.jdt.ui.prefs b/plugins/developer/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..c8b75420b7a
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.core.runtime,

+ org.eclipse.emf.ecore;bundle-version="2.6.0",

+ org.eclipse.ui,

+ org.eclipse.core.resources,

+ org.eclipse.b3.aggregator;bundle-version="0.2.0",

+ org.eclipse.b3.aggregator.legacy;bundle-version="0.2.0",

+ org.eclipse.oomph.setup.targlets;bundle-version="1.0.0";resolution:=optional,

+ org.eclipse.emf.edit;bundle-version="2.10.0";resolution:=optional

+Bundle-Vendor: %Bundle-Vendor

+Bundle-ActivationPolicy: lazy

+Bundle-Version: 1.1.0.qualifier

+Bundle-Name: %Bundle-Name

+Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.releng.tools.internal.Activator

+Bundle-SymbolicName: org.eclipse.papyrus.releng.tools;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+

diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/OSGI-INF/l10n/bundle.properties b/plugins/developer/org.eclipse.papyrus.releng.tools/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 00000000000..c1cf5900b73
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,14 @@
+###############################################################################

+# Copyright (c) 2011 Mia-Software.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#     Nicolas Bros (Mia-Software) - Bug 366567 - [Releng] Tool to update rmaps

+###############################################################################

+#Properties file for org.eclipse.papyrus.releng.tools

+Bundle-Vendor = Eclipse Modeling Project

+Bundle-Name = Papyrus Releng Tools

+action.label = Update RMap From Aggregation Build Model
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/README.TXT b/plugins/developer/org.eclipse.papyrus.releng.tools/README.TXT
new file mode 100644
index 00000000000..502229bb09f
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/README.TXT
@@ -0,0 +1,18 @@
+This plug-in contains a tool to update a Buckminster rmap (XML file) from a B3 build model.
+The rmap is updated using comments in the XML that reference the model elements from which 
+the update sites must be copied.
+These comments must appear before each "rm:uri" element which must be updated automatically, like this:
+  <!-- updateFrom("Eclipse", 0) -->
+  <rm:uri format="http://download.eclipse.org/eclipse/updates/4.2milestones/S-4.2M3-201110281100"/>
+
+The first parameter in updateFrom is the label of a contribution, which you can find in the b3aggrcon files:
+ <aggregator:Contribution ... label="xxx">
+
+The second parameter is the index of the "repositories" element that must be used 
+(in case there are several update sites defined on one contribution).
+
+To update the map once these comments are written, right-click on an rmap file 
+and choose "Update RMap From Aggregation Build Model".
+Then choose from which b3aggr file (aggregation build model) the map must be updated.
+The b3aggr file must be at the root of a project in your workspace : 
+checkout one of the "org.eclipse.<releaseName>.build" projects from CVS "dev.eclipse.org:/cvsroot/callisto".
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/about.html b/plugins/developer/org.eclipse.papyrus.releng.tools/about.html
new file mode 100644
index 00000000000..3019b95b9cf
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>December 22, 2008</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/build.properties b/plugins/developer/org.eclipse.papyrus.releng.tools/build.properties
new file mode 100644
index 00000000000..7e749beeb33
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/build.properties
@@ -0,0 +1,19 @@
+###############################################################################

+# Copyright (c) 2011 Mia-Software.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#     Nicolas Bros (Mia-Software) - initial API and implementation

+###############################################################################

+source.. = src/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               about.html,\

+               OSGI-INF/,\

+               plugin.xml,\

+               OSGI-INF/l10n/bundle.properties

+src.includes = about.html

diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/plugin.xml b/plugins/developer/org.eclipse.papyrus.releng.tools/plugin.xml
new file mode 100644
index 00000000000..76894f6ecb2
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/plugin.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>
<!--

+    Copyright (c) 2011, 2014 Mia-Software, CEA LIST and others.

+    All rights reserved. This program and the accompanying materials

+    are made available under the terms of the Eclipse Public License v1.0

+    which accompanies this distribution, and is available at

+    http://www.eclipse.org/legal/epl-v10.html

+   

+    Contributors:

+        Nicolas Bros (Mia-Software) - initial API and implementation

+        Camille Letavernier (CEA LIST) - Reimplement with Eclipse Menu/Handlers

+        Christian W. Damus (CEA) - Add support for updating Oomph setup models

+ -->

+
+<plugin>

+   <extension

+         point="org.eclipse.ui.menus">

+      <menuContribution

+            allPopups="false"

+            locationURI="popup:org.eclipse.ui.popup.any?after=additions">

+         <command

+               commandId="org.eclipse.papyrus.releng.tools.updateRmap"

+               style="push">

+            <visibleWhen

+                  checkEnabled="false">

+                  <iterate

+                        operator="or">

+               <adapt

+                     type="org.eclipse.core.resources.IFile">

+                  <or>

+                     <test

+                           property="org.eclipse.core.resources.extension"

+                           value="rmap">

+                     </test>

+                  </or>

+               </adapt>

+               </iterate>

+            </visibleWhen>

+         </command>

+         <command

+               commandId="org.eclipse.papyrus.releng.tools.updatePom"

+               style="push">

+            <visibleWhen

+                  checkEnabled="false">

+               <iterate

+                     operator="or">

+                  <adapt

+                        type="org.eclipse.core.resources.IFile">

+                     <or>

+                        <test

+                              property="org.eclipse.core.resources.name"

+                              value="*pom*.xml">

+                        </test>

+                     </or>

+                  </adapt>

+               </iterate>

+            </visibleWhen>

+         </command>

+         <command

+               commandId="org.eclipse.papyrus.releng.tools.updateOomphSetup"

+               style="push">

+            <visibleWhen

+                  checkEnabled="false">

+               <iterate

+                     operator="or">

+                  <adapt

+                        type="org.eclipse.core.resources.IFile">

+                     <or>

+                        <test

+                              property="org.eclipse.core.resources.extension"

+                              value="setup">

+                        </test>

+                     </or>

+                  </adapt>

+               </iterate>

+            </visibleWhen>

+         </command>

+         <command

+               commandId="org.eclipse.papyrus.releng.tools.addSetupRepositoryUpdateAnnotation"

+               style="push">

+            <visibleWhen

+                  checkEnabled="true">

+               <iterate

+                     operator="or">

+                  <instanceof

+                        value="org.eclipse.oomph.p2.Repository"/>

+               </iterate>

+            </visibleWhen>

+         </command>

+      </menuContribution>

+   </extension>

+   <extension

+         point="org.eclipse.ui.commands">

+      <command

+            defaultHandler="org.eclipse.papyrus.releng.tools.internal.handler.UpdateMapHandler"

+            id="org.eclipse.papyrus.releng.tools.updateRmap"

+            name="Update RMap from Aggregation Build Model">

+      </command>

+      <command

+            defaultHandler="org.eclipse.papyrus.releng.tools.internal.handler.UpdatePOMHandler"

+            id="org.eclipse.papyrus.releng.tools.updatePom"

+            name="Update POM from Aggregation Build Model">

+      </command>

+      <command

+            defaultHandler="org.eclipse.papyrus.releng.tools.internal.handler.UpdateOomphSetupHandler"

+            id="org.eclipse.papyrus.releng.tools.updateOomphSetup"

+            name="Update Setup from Aggregation Build Model">

+      </command>

+      <command

+            defaultHandler="org.eclipse.papyrus.releng.tools.internal.handler.AddSetupRepositoryUpdateAnnotationHandler"

+            id="org.eclipse.papyrus.releng.tools.addSetupRepositoryUpdateAnnotation"

+            name="Configure Update from Aggregation Build Model">

+      </command>

+   </extension>

+

+</plugin>

diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/Activator.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/Activator.java
new file mode 100644
index 00000000000..211c9bf642f
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/Activator.java
@@ -0,0 +1,47 @@
+/*******************************************************************************

+ * Copyright (c) 2011, 2014 Mia-Software, 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:

+ *     Nicolas Bros (Mia-Software) - Bug 366567 - [Releng] Tool to update rmaps

+ *     Christian W. Damus (CEA) - Add support for updating Oomph setup models

+ *     

+ *******************************************************************************/

+package org.eclipse.papyrus.releng.tools.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.releng.tools"; //$NON-NLS-1$

+

+	// The shared instance

+	private static Activator plugin;

+

+	@Override

+	public void start(final BundleContext context) throws Exception {

+		super.start(context);

+		Activator.plugin = this;

+	}

+

+	@Override

+	public void stop(final BundleContext context) throws Exception {

+		Activator.plugin = null;

+		super.stop(context);

+	}

+

+	/**

+	 * Returns the shared instance

+	 * 

+	 * @return the shared instance

+	 */

+	public static Activator getDefault() {

+		return Activator.plugin;

+	}

+}

diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/Messages.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/Messages.java
new file mode 100644
index 00000000000..9f61873c45e
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/Messages.java
@@ -0,0 +1,31 @@
+/*******************************************************************************

+ * Copyright (c) 2011 Mia-Software.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     Nicolas Bros (Mia-Software) - Bug 366567 - [Releng] Tool to update rmaps

+ *******************************************************************************/

+package org.eclipse.papyrus.releng.tools.internal;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.releng.tools.internal.messages"; //$NON-NLS-1$
+	public static String UpdateRMapAction_mapWasUpdatedTitle;
+	public static String UpdateRMapAction_chooseBuildModel;
+	public static String UpdateRMapAction_chooseBuildModelLong;
+	public static String UpdateRMapAction_error;
+	public static String UpdateRMapAction_mapWasUpdated;
+	public static String UpdateRMapAction_noBuildModelFound;
+	public static String UpdateRMapAction_noBuildModelFoundLong;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/AbstractDependencyHandler.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/AbstractDependencyHandler.java
new file mode 100644
index 00000000000..8ad5ca7d72e
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/AbstractDependencyHandler.java
@@ -0,0 +1,111 @@
+/*******************************************************************************

+ * Copyright (c) 2011, 2014 Mia-Software, CEA LIST and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     Nicolas Bros (Mia-Software) - Bug 366567 - [Releng] Tool to update rmaps

+ *     Camille Letavernier (CEA LIST) - camille.letavernier@cea.fr - Generalize to handle POMs

+ *     Christian W. Damus (CEA) - Add support for updating Oomph setup models

+ *     

+ *******************************************************************************/

+package org.eclipse.papyrus.releng.tools.internal.handler;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.core.commands.AbstractHandler;

+import org.eclipse.core.commands.ExecutionEvent;

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.resources.IFile;

+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.IStatus;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.viewers.LabelProvider;

+import org.eclipse.papyrus.releng.tools.internal.Activator;

+import org.eclipse.papyrus.releng.tools.internal.Messages;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.dialogs.ElementListSelectionDialog;

+import org.eclipse.ui.handlers.HandlerUtil;

+

+

+public abstract class AbstractDependencyHandler extends AbstractHandler {

+

+	@Override

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+		ISelection selection = HandlerUtil.getCurrentSelection(event);

+		Shell activeShell = HandlerUtil.getActiveShell(event);

+		try {

+			if(selection instanceof IStructuredSelection) {

+				IStructuredSelection structuredSelection = (IStructuredSelection)selection;

+				Object selected = structuredSelection.getFirstElement();

+				if(selected instanceof IFile) {

+					IFile file = (IFile)selected;

+					List<IFile> aggregationBuildFiles = findAggregationBuildFiles();

+					IFile aggregationBuildFile = chooseAggregationBuildFile(aggregationBuildFiles, activeShell);

+					if(aggregationBuildFile != null) {

+						updateFile(file, aggregationBuildFile, activeShell);

+					}

+				}

+			}

+		} catch (Exception e) {

+			Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error", e)); //$NON-NLS-1$

+			MessageDialog.openError(activeShell, Messages.UpdateRMapAction_error, e.getLocalizedMessage());

+		}

+

+		return null;

+	}

+

+	protected static List<IFile> findAggregationBuildFiles() throws CoreException {

+		List<IFile> aggregationBuildFiles = new ArrayList<IFile>();

+		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();

+		for(IProject project : projects) {

+			if(!project.isOpen()) {

+				continue;

+			}

+			IResource[] members = project.members();

+			for(IResource resource : members) {

+				if(resource.getType() == IResource.FILE && resource.getName().endsWith(".b3aggr")) { //$NON-NLS-1$

+					aggregationBuildFiles.add((IFile)resource);

+				}

+			}

+		}

+		return aggregationBuildFiles;

+	}

+

+	protected static IFile chooseAggregationBuildFile(final List<IFile> aggregationBuildFiles, Shell activeShell) {

+		if(aggregationBuildFiles.size() == 0) {

+			MessageDialog.openWarning(activeShell, Messages.UpdateRMapAction_noBuildModelFound, Messages.UpdateRMapAction_noBuildModelFoundLong);

+			return null;

+		}

+		LabelProvider labelProvider = new LabelProvider() {

+

+			@Override

+			public String getText(final Object element) {

+				if(element instanceof IFile) {

+					IFile file = (IFile)element;

+					return file.getProject().getName() + "/" + file.getName(); //$NON-NLS-1$

+				}

+				return super.getText(element);

+			}

+		};

+

+		ElementListSelectionDialog dialog = new ElementListSelectionDialog(activeShell, labelProvider);

+		dialog.setTitle(Messages.UpdateRMapAction_chooseBuildModel);

+		dialog.setMessage(Messages.UpdateRMapAction_chooseBuildModelLong);

+		dialog.setElements(aggregationBuildFiles.toArray());

+		dialog.open();

+		return (IFile)dialog.getFirstResult();

+	}

+

+	protected abstract void updateFile(IFile selectedFile, IFile aggregationBuildFile, Shell activeShell) throws CoreException;

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/AddSetupRepositoryUpdateAnnotationHandler.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/AddSetupRepositoryUpdateAnnotationHandler.java
new file mode 100644
index 00000000000..11c8fe2c32a
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/AddSetupRepositoryUpdateAnnotationHandler.java
@@ -0,0 +1,417 @@
+/*****************************************************************************
+ * 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.releng.tools.internal.handler;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.b3.aggregator.Aggregation;
+import org.eclipse.b3.aggregator.AggregatorPackage;
+import org.eclipse.b3.aggregator.Contribution;
+import org.eclipse.b3.aggregator.MappedRepository;
+import org.eclipse.b3.aggregator.transformer.TransformationManager;
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+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.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.ChangeCommand;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.dialogs.DialogSettings;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.window.Window;
+import org.eclipse.oomph.base.Annotation;
+import org.eclipse.oomph.base.BaseFactory;
+import org.eclipse.oomph.p2.Repository;
+import org.eclipse.oomph.p2.RepositoryList;
+import org.eclipse.oomph.targlets.Targlet;
+import org.eclipse.papyrus.releng.tools.internal.Activator;
+import org.eclipse.papyrus.releng.tools.internal.popup.actions.OomphSetupUpdater;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.ISources;
+import org.eclipse.ui.dialogs.FilteredItemsSelectionDialog;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * @author damus
+ *
+ */
+public class AddSetupRepositoryUpdateAnnotationHandler extends AbstractHandler {
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		Collection<? extends Repository> repositories = getSelectedRepositories(event);
+
+		if (!repositories.isEmpty()) {
+			Shell activeShell = HandlerUtil.getActiveShell(event);
+
+			try {
+				IFile aggrFile = AbstractDependencyHandler.chooseAggregationBuildFile(AbstractDependencyHandler.findAggregationBuildFiles(), activeShell);
+				if (aggrFile != null) {
+					ResourceSet rset = new ResourceSetImpl();
+
+					List<IAggregationElementProxy> elements = loadContributionsAndRepositories(rset, URI.createPlatformResourceURI(aggrFile.getFullPath().toString(), true));
+
+					Map<Repository, IAggregationElementProxy> updates = new HashMap<Repository, AddSetupRepositoryUpdateAnnotationHandler.IAggregationElementProxy>();
+					for (Repository repo : repositories) {
+						FilteredItemsSelectionDialog dlg = createSelectionDialog(activeShell, repo, elements);
+						if (dlg.open() == Window.OK) {
+							IAggregationElementProxy selected = (IAggregationElementProxy) dlg.getFirstResult();
+							if (selected != null) {
+								updates.put(repo, selected);
+							}
+						}
+					}
+
+					if (!updates.isEmpty()) {
+						createOrUpdateAnnotations(updates);
+					}
+				}
+			} catch (CoreException e) {
+				throw new ExecutionException("Failed to set the repository update annotation.", e);
+			}
+		}
+
+		return null;
+	}
+
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		setBaseEnabled(!getSelectedRepositories(evaluationContext).isEmpty());
+	}
+
+	private Collection<Repository> getSelectedRepositories(Object context) {
+		List<Repository> result = new ArrayList<Repository>();
+
+		Object variable = null;
+		if (context instanceof ExecutionEvent) {
+			variable = HandlerUtil.getCurrentSelection((ExecutionEvent) context);
+		} else {
+			variable = HandlerUtil.getVariable(context, ISources.ACTIVE_CURRENT_SELECTION_NAME);
+		}
+
+		if (variable instanceof IStructuredSelection) {
+			for (Iterator<?> iter = ((IStructuredSelection) variable).iterator(); iter.hasNext();) {
+				Object selected = iter.next();
+				if (selected instanceof Repository) {
+					Repository repo = (Repository) selected;
+					if ((repo.eContainer() instanceof RepositoryList) && (repo.eContainer().eContainer() instanceof Targlet)) {
+						result.add(repo);
+					}
+				}
+			}
+		}
+
+		return result;
+	}
+
+	protected List<IAggregationElementProxy> loadContributionsAndRepositories(ResourceSet rset, URI uri) throws CoreException {
+		// Ensure that the Aggregator model is loaded because the model plug-in doesn't register it
+		AggregatorPackage.eINSTANCE.eClass();
+
+		List<IAggregationElementProxy> result = new ArrayList<AddSetupRepositoryUpdateAnnotationHandler.IAggregationElementProxy>();
+		Resource resource;
+
+		try {
+			resource = rset.getResource(uri, true);
+		} catch (Exception e) {
+			try {
+				TransformationManager transformationManager = new TransformationManager(uri);
+				resource = transformationManager.transformResource(true);
+			} catch (Exception e1) {
+				throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error loading b3aggr. Make sure you have the latest version of B3 installed: " + e.getLocalizedMessage(), e1)); //$NON-NLS-1$
+			}
+		}
+
+		if (resource.getContents().size() == 0) {
+			throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The b3aggr resource is empty")); //$NON-NLS-1$
+		}
+
+		Aggregation aggregation = (Aggregation) EcoreUtil.getObjectByType(resource.getContents(), AggregatorPackage.Literals.AGGREGATION);
+		if (aggregation != null) {
+			List<Contribution> contributions = aggregation.getAllContributions(true);
+			for (Contribution next : contributions) {
+				List<MappedRepository> repositories = next.getRepositories(true);
+				switch (repositories.size()) {
+				case 0:
+					break;
+				case 1:
+					result.add(new ContributionProxy(next)); // Add the contribution, itself
+					break;
+				default:
+					// User must select a specific repository
+					int index = 0;
+					for (MappedRepository repo : repositories) {
+						result.add(new RepositoryProxy(next, repo, index++));
+					}
+					break;
+				}
+			}
+		}
+
+		return result;
+	}
+
+	protected void createOrUpdateAnnotations(final Map<Repository, IAggregationElementProxy> selection) {
+		EObject context = EcoreUtil.getRootContainer(selection.keySet().iterator().next());
+		EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(context);
+		if (domain == null) {
+			doCreateOrUpdateAnnotation(selection);
+		} else {
+			domain.getCommandStack().execute(new ChangeCommand(context) {
+				{
+					setLabel("Set Update Annotation"); //$NON-NLS-1$
+				}
+
+				@Override
+				protected void doExecute() {
+					doCreateOrUpdateAnnotation(selection);
+				}
+			});
+		}
+	}
+
+	protected void doCreateOrUpdateAnnotation(Map<Repository, IAggregationElementProxy> selection) {
+		for (Map.Entry<Repository, IAggregationElementProxy> next : selection.entrySet()) {
+			Repository repo = next.getKey();
+			IAggregationElementProxy aggr = next.getValue();
+
+			Annotation annotation = repo.getAnnotation(OomphSetupUpdater.ANNOTATION_SOURCE);
+			if (annotation == null) {
+				annotation = BaseFactory.eINSTANCE.createAnnotation(OomphSetupUpdater.ANNOTATION_SOURCE);
+				repo.getAnnotations().add(annotation);
+			}
+
+			annotation.getDetails().put(OomphSetupUpdater.UPDATE_KEY, aggr.getUpdateSpec());
+
+			// And, while we're at it, update the repository
+			repo.setURL(aggr.getRepositoryURL());
+		}
+	}
+
+	protected FilteredItemsSelectionDialog createSelectionDialog(Shell parentShell, Repository repo, final Collection<? extends IAggregationElementProxy> contents) {
+		FilteredItemsSelectionDialog result = new FilteredItemsSelectionDialog(parentShell) {
+
+			@Override
+			protected IStatus validateItem(Object item) {
+				return Status.OK_STATUS;
+			}
+
+			@SuppressWarnings("rawtypes")
+			@Override
+			protected Comparator getItemsComparator() {
+				return new Comparator() {
+					@Override
+					public int compare(Object o1, Object o2) {
+						if ((o1.getClass() != o2.getClass()) || (o1 instanceof ContributionProxy)) {
+							String label1 = ((IAggregationElementProxy) o1).getLabel();
+							String label2 = ((IAggregationElementProxy) o2).getLabel();
+							return label1.compareTo(label2);
+						} else {
+							RepositoryProxy repo1 = (RepositoryProxy) o1;
+							RepositoryProxy repo2 = (RepositoryProxy) o2;
+							if (repo1.getContribution() == repo2.getContribution()) {
+								// Use the ordered in which they are defined in the contribution
+								return repo1.getIndex() - repo2.getIndex();
+							} else {
+								// Sort by contribution
+								String label1 = repo1.getContribution().getLabel();
+								String label2 = repo2.getContribution().getLabel();
+								return label1.compareTo(label2);
+							}
+						}
+					}
+				};
+			}
+
+			@Override
+			public String getElementName(Object item) {
+				return ((IAggregationElementProxy) item).getContribution().getLabel();
+			}
+
+			@Override
+			protected IDialogSettings getDialogSettings() {
+				return DialogSettings.getOrCreateSection(Activator.getDefault().getDialogSettings(), "AddSetupRepositoryUpdateAnnotation"); //$NON-NLS-1$
+			}
+
+			@Override
+			protected void fillContentProvider(AbstractContentProvider contentProvider, ItemsFilter itemsFilter, IProgressMonitor progressMonitor) throws CoreException {
+				for (Object next : contents) {
+					contentProvider.add(next, itemsFilter);
+				}
+				if (progressMonitor != null) {
+					progressMonitor.done();
+				}
+			}
+
+			@Override
+			protected ItemsFilter createFilter() {
+				return new ItemsFilter() {
+
+					@Override
+					public boolean matchItem(Object item) {
+						return matches(((IAggregationElementProxy) item).getLabel());
+					}
+
+					@Override
+					public boolean isConsistentItem(Object item) {
+						return true; // The aggregation model is not editable in this context
+					}
+				};
+			}
+
+			@Override
+			protected Control createExtendedContentArea(Composite parent) {
+				return null;
+			}
+		};
+
+
+		result.setTitle("Select Aggregation Component");
+		result.setMessage(String.format("Select an aggregation component or repository for \"%s\".", repo.getURL()));
+
+		result.setListLabelProvider(new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				return (element == null) ? "" : ((IAggregationElementProxy) element).getLabel(); //$NON-NLS-1$
+			}
+		});
+
+		result.setDetailsLabelProvider(new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				return ((IAggregationElementProxy) element).getDetails();
+			}
+		});
+
+		result.setInitialPattern("**", FilteredItemsSelectionDialog.FULL_SELECTION); //$NON-NLS-1$
+
+		return result;
+	}
+
+	protected interface IAggregationElementProxy {
+		Contribution getContribution();
+
+		String getLabel();
+
+		String getDetails();
+
+		String getUpdateSpec();
+
+		String getRepositoryURL();
+	}
+
+	protected static final class ContributionProxy implements IAggregationElementProxy {
+		private final Contribution contribution;
+
+		public ContributionProxy(Contribution contribution) {
+			this.contribution = contribution;
+		}
+
+		@Override
+		public Contribution getContribution() {
+			return contribution;
+		}
+
+		@Override
+		public String getLabel() {
+			String result = contribution.getLabel();
+			return (result == null) ? "" : result;
+		}
+
+		@Override
+		public String getDetails() {
+			if ((contribution.getDescription() != null) && (contribution.getDescription().length() > 0)) {
+				return String.format("%s - %s", contribution.getLabel(), contribution.getDescription());
+			} else {
+				return contribution.getLabel();
+			}
+		}
+
+		@Override
+		public String getUpdateSpec() {
+			return contribution.getLabel();
+		}
+
+		@Override
+		public String getRepositoryURL() {
+			return contribution.getRepositories(true).get(0).getLocation();
+		}
+	}
+
+	protected static final class RepositoryProxy implements IAggregationElementProxy {
+		private final Contribution contribution;
+		private final MappedRepository repository;
+		private final int index;
+
+		public RepositoryProxy(Contribution contribution, MappedRepository repository, int index) {
+			this.contribution = contribution;
+			this.repository = repository;
+			this.index = index;
+		}
+
+		public Contribution getContribution() {
+			return contribution;
+		}
+
+		public MappedRepository getRepository() {
+			return repository;
+		}
+
+		public int getIndex() {
+			return index;
+		}
+
+		public String getLabel() {
+			return String.format("%s - %s", contribution.getLabel(), repository.getLocation());
+		}
+
+		public String getDetails() {
+			if ((contribution.getDescription() != null) && (contribution.getDescription().length() > 0)) {
+				return String.format("%s (%s) - %s", contribution.getLabel(), contribution.getDescription(), repository.getLocation());
+			} else {
+				return getLabel();
+			}
+		}
+
+		@Override
+		public String getUpdateSpec() {
+			return String.format("%s:%s", contribution.getLabel(), index);
+		}
+
+		@Override
+		public String getRepositoryURL() {
+			return repository.getLocation();
+		}
+	}
+}
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/UpdateMapHandler.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/UpdateMapHandler.java
new file mode 100644
index 00000000000..3b3f437f73e
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/UpdateMapHandler.java
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2014 Mia-Software, CEA LIST.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Nicolas Bros (Mia-Software) - Bug 366567 - [Releng] Tool to update rmaps
+ *     Camille Letavernier (CEA LIST) - camille.letavernier@cea.fr - Reimplement as a Handler
+ *******************************************************************************/
+package org.eclipse.papyrus.releng.tools.internal.handler;
+
+import org.eclipse.b3.aggregator.Aggregation;
+import org.eclipse.b3.aggregator.AggregatorPackage;
+import org.eclipse.b3.aggregator.Contribution;
+import org.eclipse.b3.aggregator.transformer.TransformationManager;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.EList;
+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.jface.dialogs.MessageDialog;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.releng.tools.internal.Activator;
+import org.eclipse.papyrus.releng.tools.internal.Messages;
+import org.eclipse.papyrus.releng.tools.internal.popup.actions.MapUpdater;
+import org.eclipse.swt.widgets.Shell;
+
+
+/* Reimplemented from org.eclipse.papyrus.releng.tools.internal.popup.actions.UpdateRMapAction */
+public class UpdateMapHandler extends AbstractDependencyHandler {
+
+	@Override
+	protected void updateFile(final IFile mapFile, final IFile aggregationBuildFile, Shell activeShell) throws CoreException {
+
+		// make sure the EPackage is initialized
+		AggregatorPackage.eINSTANCE.getEFactoryInstance();
+		URI uri = URI.createPlatformResourceURI(aggregationBuildFile.getFullPath().toString(), true);
+
+		final ResourceSet resourceSet = new ResourceSetImpl();
+		Resource resource = null;
+		try {
+			// with the latest version of the metamodel
+			resource = resourceSet.getResource(uri, true);
+			resource.load(null);
+		} catch (Exception e) {
+			// with an older version of the metamodel
+			try {
+				TransformationManager transformationManager = new TransformationManager(uri);
+				resource = transformationManager.transformResource(true);
+			} catch (Exception e1) {
+				throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error loading b3aggr. Make sure you have the latest version of B3 installed. : " + e.getLocalizedMessage(), e1)); //$NON-NLS-1$
+			}
+		}
+
+		if(resource.getContents().size() == 0) {
+			throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The b3aggr resource is empty")); //$NON-NLS-1$
+		}
+
+		EObject root = resource.getContents().get(0);
+		if(root instanceof Aggregation) {
+			Aggregation aggregation = (Aggregation)root;
+			EList<Contribution> allContributions = aggregation.getAllContributions(true);
+			MapUpdater mapUpdater = new MapUpdater(mapFile, allContributions);
+			mapUpdater.updateDocument();
+		}
+
+		MessageDialog.openInformation(activeShell, Messages.UpdateRMapAction_mapWasUpdatedTitle, NLS.bind(Messages.UpdateRMapAction_mapWasUpdated, mapFile.getFullPath().toString(), aggregationBuildFile.getFullPath().toString()));
+	}
+
+}
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/UpdateOomphSetupHandler.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/UpdateOomphSetupHandler.java
new file mode 100644
index 00000000000..865c844c43f
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/UpdateOomphSetupHandler.java
@@ -0,0 +1,77 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - Add support for updating Oomph setup models
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.releng.tools.internal.handler;
+
+import org.eclipse.b3.aggregator.Aggregation;
+import org.eclipse.b3.aggregator.AggregatorPackage;
+import org.eclipse.b3.aggregator.Contribution;
+import org.eclipse.b3.aggregator.transformer.TransformationManager;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.EList;
+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.jface.dialogs.MessageDialog;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.releng.tools.internal.Activator;
+import org.eclipse.papyrus.releng.tools.internal.Messages;
+import org.eclipse.papyrus.releng.tools.internal.popup.actions.OomphSetupUpdater;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class UpdateOomphSetupHandler extends AbstractDependencyHandler {
+
+	@Override
+	protected void updateFile(IFile setupFile, IFile aggregationBuildFile, Shell activeShell) throws CoreException {
+
+		// make sure the EPackage is initialized
+		AggregatorPackage.eINSTANCE.getEFactoryInstance();
+		URI uri = URI.createPlatformResourceURI(aggregationBuildFile.getFullPath().toString(), true);
+
+		final ResourceSet resourceSet = new ResourceSetImpl();
+		Resource resource = null;
+		try {
+			// with the latest version of the metamodel
+			resource = resourceSet.getResource(uri, true);
+			resource.load(null);
+		} catch (Exception e) {
+			// with an older version of the metamodel
+			try {
+				TransformationManager transformationManager = new TransformationManager(uri);
+				resource = transformationManager.transformResource(true);
+			} catch (Exception e1) {
+				throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error loading b3aggr. Make sure you have the latest version of B3 installed. : " + e.getLocalizedMessage(), e1)); //$NON-NLS-1$
+			}
+		}
+
+		if (resource.getContents().size() == 0) {
+			throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The b3aggr resource is empty")); //$NON-NLS-1$
+		}
+
+		EObject root = resource.getContents().get(0);
+		if (root instanceof Aggregation) {
+			Aggregation aggregation = (Aggregation) root;
+			EList<Contribution> allContributions = aggregation.getAllContributions(true);
+			OomphSetupUpdater setupUpdater = new OomphSetupUpdater(setupFile, allContributions);
+			setupUpdater.updateDocument();
+		}
+
+		MessageDialog.openInformation(activeShell, Messages.UpdateRMapAction_mapWasUpdatedTitle, NLS.bind(Messages.UpdateRMapAction_mapWasUpdated, setupFile.getFullPath().toString(), aggregationBuildFile.getFullPath().toString()));
+	}
+}
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/UpdatePOMHandler.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/UpdatePOMHandler.java
new file mode 100644
index 00000000000..1906482eb52
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/UpdatePOMHandler.java
@@ -0,0 +1,76 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.releng.tools.internal.handler;

+

+import org.eclipse.b3.aggregator.Aggregation;

+import org.eclipse.b3.aggregator.AggregatorPackage;

+import org.eclipse.b3.aggregator.Contribution;

+import org.eclipse.b3.aggregator.transformer.TransformationManager;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.emf.common.util.EList;

+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.jface.dialogs.MessageDialog;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.papyrus.releng.tools.internal.Activator;

+import org.eclipse.papyrus.releng.tools.internal.Messages;

+import org.eclipse.papyrus.releng.tools.internal.popup.actions.PomUpdater;

+import org.eclipse.swt.widgets.Shell;

+

+

+public class UpdatePOMHandler extends AbstractDependencyHandler {

+

+	@Override

+	protected void updateFile(IFile pomFile, IFile aggregationBuildFile, Shell activeShell) throws CoreException {

+

+		// make sure the EPackage is initialized

+		AggregatorPackage.eINSTANCE.getEFactoryInstance();

+		URI uri = URI.createPlatformResourceURI(aggregationBuildFile.getFullPath().toString(), true);

+

+		final ResourceSet resourceSet = new ResourceSetImpl();

+		Resource resource = null;

+		try {

+			// with the latest version of the metamodel

+			resource = resourceSet.getResource(uri, true);

+			resource.load(null);

+		} catch (Exception e) {

+			// with an older version of the metamodel

+			try {

+				TransformationManager transformationManager = new TransformationManager(uri);

+				resource = transformationManager.transformResource(true);

+			} catch (Exception e1) {

+				throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error loading b3aggr. Make sure you have the latest version of B3 installed. : " + e.getLocalizedMessage(), e1)); //$NON-NLS-1$

+			}

+		}

+

+		if(resource.getContents().size() == 0) {

+			throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The b3aggr resource is empty")); //$NON-NLS-1$

+		}

+

+		EObject root = resource.getContents().get(0);

+		if(root instanceof Aggregation) {

+			Aggregation aggregation = (Aggregation)root;

+			EList<Contribution> allContributions = aggregation.getAllContributions(true);

+			PomUpdater pomUpdater = new PomUpdater(pomFile, allContributions);

+			pomUpdater.updateDocument();

+		}

+

+		MessageDialog.openInformation(activeShell, Messages.UpdateRMapAction_mapWasUpdatedTitle, NLS.bind(Messages.UpdateRMapAction_mapWasUpdated, pomFile.getFullPath().toString(), aggregationBuildFile.getFullPath().toString()));

+	}

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/messages.properties b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/messages.properties
new file mode 100644
index 00000000000..c6ddaf9a805
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/messages.properties
@@ -0,0 +1,17 @@
+###############################################################################

+# Copyright (c) 2011 Mia-Software.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#     Nicolas Bros (Mia-Software) - Bug 366567 - [Releng] Tool to update rmaps

+###############################################################################

+UpdateRMapAction_mapWasUpdatedTitle=Papyrus Releng Tools
+UpdateRMapAction_chooseBuildModel=Choose build model
+UpdateRMapAction_chooseBuildModelLong=Select the build model with which to update the map:
+UpdateRMapAction_error=Error
+UpdateRMapAction_mapWasUpdated=The dependencies in {0}\nwere updated from {1}.
+UpdateRMapAction_noBuildModelFound=No build model found
+UpdateRMapAction_noBuildModelFoundLong=No build model was found in your workspace.\nPlease checkout a build project from git://git.eclipse.org/gitroot/simrel/org.eclipse.simrel.build.git
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java
new file mode 100644
index 00000000000..9020eb3c20e
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java
@@ -0,0 +1,162 @@
+/*******************************************************************************

+ * Copyright (c) 2011, 2014 Mia-Software, CEA LIST.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     Nicolas Bros (Mia-Software) - Bug 366567 - [Releng] Tool to update rmaps

+ *     Camille Letavernier (CEA LIST) - Generalize to support POMs

+ *     Christian W. Damus (CEA) - Add support for updating Oomph setup models

+ *      

+ *******************************************************************************/

+package org.eclipse.papyrus.releng.tools.internal.popup.actions;

+

+import java.io.File;

+import java.util.regex.Matcher;

+import java.util.regex.Pattern;

+

+import javax.xml.parsers.DocumentBuilder;

+import javax.xml.parsers.DocumentBuilderFactory;

+import javax.xml.transform.OutputKeys;

+import javax.xml.transform.Transformer;

+import javax.xml.transform.TransformerFactory;

+import javax.xml.transform.dom.DOMSource;

+import javax.xml.transform.stream.StreamResult;

+import javax.xml.xpath.XPath;

+import javax.xml.xpath.XPathConstants;

+import javax.xml.xpath.XPathFactory;

+

+import org.eclipse.b3.aggregator.Contribution;

+import org.eclipse.b3.aggregator.MappedRepository;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.papyrus.releng.tools.internal.Activator;

+import org.w3c.dom.Comment;

+import org.w3c.dom.Document;

+import org.w3c.dom.Element;

+import org.w3c.dom.Node;

+import org.w3c.dom.NodeList;

+

+

+public abstract class DependencyUpdater {

+

+	private final Pattern commentPattern = Pattern.compile("updateFrom\\s*\\(\\s*\"(.*?)\"\\s*,\\s*(\\d+)\\s*\\)"); //$NON-NLS-1$

+

+	protected final IFile fMapFile;

+

+	protected final EList<Contribution> contributions;

+

+	public DependencyUpdater(final IFile mapFile, final EList<Contribution> contributions) {

+		this.fMapFile = mapFile;

+		this.contributions = contributions;

+	}

+

+	protected static final String PREFIX = "http://download.eclipse.org/"; //$NON-NLS-1$

+

+	public void updateDocument() throws CoreException {

+		try {

+			File mapFile = this.fMapFile.getLocation().toFile();

+

+			DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();

+			DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();

+			Document doc = docBuilder.parse(mapFile);

+			doc.normalize();

+			Element documentElement = doc.getDocumentElement();

+

+			XPath xpath = XPathFactory.newInstance().newXPath();

+			NodeList uris = (NodeList) xpath.evaluate(getXpath(), documentElement, XPathConstants.NODESET);

+

+			for (int i = 0; i < uris.getLength(); i++) {

+				Node uri = uris.item(i);

+				Node precedingComment = getPrecedingComment(uri);

+				if (precedingComment != null) {

+					String comment = getCommentContent(precedingComment);

+					Matcher matcher = getCommentPattern().matcher(comment);

+					if (matcher.find()) {

+						String contributionName = matcher.group(1);

+						int repositoryIndex = Integer.parseInt(matcher.group(2));

+						updateWithContribution(uri, contributionName, repositoryIndex);

+					} else if (comment.contains("updateFrom")) { //$NON-NLS-1$

+						throw new Exception("Wrong syntax for 'updateFrom' : should be " + getCommentSyntax()); //$NON-NLS-1$

+					}

+				}

+			}

+

+			Transformer transformer = TransformerFactory.newInstance().newTransformer();

+			transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$

+

+			StreamResult result = new StreamResult(mapFile);

+			DOMSource source = new DOMSource(doc);

+			transformer.transform(source, result);

+

+			this.fMapFile.refreshLocal(IResource.DEPTH_ZERO, new NullProgressMonitor());

+

+		} catch (Exception e) {

+			throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error updating map: " + e.getLocalizedMessage(), e)); //$NON-NLS-1$

+		}

+	}

+

+	protected void updateWithContribution(final Node uri, final String contributionName, final int repositoryIndex) {

+		Contribution contribution = findContribution(contributionName);

+		if (contribution == null) {

+			throw new RuntimeException("'updateFrom' failed: cannot find contribution with label \"" + contributionName + "\""); //$NON-NLS-1$ //$NON-NLS-2$

+		}

+		EList<MappedRepository> repositories = contribution.getRepositories();

+		if (repositoryIndex >= repositories.size()) {

+			throw new RuntimeException("wrong index in updateFrom(\"" + contributionName + "\"" + repositoryIndex //$NON-NLS-1$ //$NON-NLS-2$

+					+ ") : there are " + repositories.size() + " contributions"); //$NON-NLS-1$ //$NON-NLS-2$

+		}

+		String location = repositories.get(repositoryIndex).getLocation();

+

+		updateUri(uri, location);

+	}

+

+	protected abstract void updateUri(Node uri, String location);

+

+	protected Contribution findContribution(final String contributionName) {

+		Contribution matchingContribution = null;

+		for (Contribution contribution : this.contributions) {

+			if (contributionName.equalsIgnoreCase(contribution.getLabel())) {

+				matchingContribution = contribution;

+			}

+		}

+		return matchingContribution;

+	}

+

+	protected Node getPrecedingComment(final Node node) {

+		Comment comment = null;

+		Node previous = node.getPreviousSibling();

+		while (previous != null) {

+			if (previous.getNodeType() == Node.COMMENT_NODE) {

+				comment = (Comment) previous;

+				break;

+			} else if (previous.getNodeType() != Node.TEXT_NODE) {

+				break;

+			}

+			previous = previous.getPreviousSibling();

+		}

+		return comment;

+	}

+

+	protected Pattern getCommentPattern() {

+		return commentPattern;

+	}

+

+	protected String getCommentContent(Node comment) {

+		return comment.getTextContent();

+	}

+

+	protected String getCommentSyntax() {

+		return "updateFrom(\"<contributionName>\",<index>)"; //$NON-NLS-1$

+	}

+

+	protected abstract String getXpath();

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/MapUpdater.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/MapUpdater.java
new file mode 100644
index 00000000000..f43b3f2bee2
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/MapUpdater.java
@@ -0,0 +1,58 @@
+/*******************************************************************************

+ * Copyright (c) 2011 - 2014 Mia-Software, CEA LIST.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     Nicolas Bros (Mia-Software) - Bug 366567 - [Releng] Tool to update rmaps

+ *     Camille Letavernier (CEA LIST) - Generalize to support POMs

+ *******************************************************************************/

+package org.eclipse.papyrus.releng.tools.internal.popup.actions;

+

+import org.eclipse.b3.aggregator.Contribution;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.emf.common.util.EList;

+import org.w3c.dom.Node;

+

+/**

+ * Updates a Buckminster rmap (XML file) from a B3 build model. The rmap is updated using

+ * comments in the XML that reference the model elements from which the update sites must be copied.

+ * <p>

+ * These comments must appear before each "rm:uri" element which must be updated automatically, like this:

+ *

+ * <pre>

+ * 	&lt;!-- updateFrom("Eclipse", 0) --&gt;
+ * 	&lt;rm:uri format="http://download.eclipse.org/eclipse/updates/4.2milestones/S-4.2M3-201110281100"/&gt;

+ * </pre>

+ *

+ * The first parameter in updateFrom is the label of a contribution, which you can find in the b3aggrcon files:

+ *

+ * <pre>

+ * &lt;aggregator:Contribution ... label="xxx"&gt;

+ * </pre>

+ *

+ * The second parameter is the index of the "repositories" element that must be used (in case there are several update sites defined on one

+ * contribution).

+ */

+public class MapUpdater extends DependencyUpdater {

+

+	public MapUpdater(final IFile mapFile, final EList<Contribution> contributions) {

+		super(mapFile, contributions);

+	}

+

+	@Override

+	protected String getXpath() {

+		return "/rmap/searchPath/provider[@readerType='p2']/uri";

+	}

+

+	@Override

+	protected void updateUri(Node uri, String location) {

+		if(location.startsWith(PREFIX)) {

+			location = "{0}/" + location.substring(PREFIX.length()); //$NON-NLS-1$

+		}

+		uri.getAttributes().getNamedItem("format").setTextContent(location); //$NON-NLS-1$

+	}

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/OomphSetupUpdater.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/OomphSetupUpdater.java
new file mode 100644
index 00000000000..4b4e90f9089
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/OomphSetupUpdater.java
@@ -0,0 +1,111 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - Add support for updating Oomph setup models
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.releng.tools.internal.popup.actions;
+
+import java.util.regex.Pattern;
+
+import org.eclipse.b3.aggregator.Contribution;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.common.util.EList;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+
+public class OomphSetupUpdater extends DependencyUpdater {
+
+	public static final String ANNOTATION_SOURCE = "http://www.eclipse.org/Papyrus/2014/releng/dependencytools";//$NON-NLS-1$
+
+	public static final String UPDATE_KEY = "updateFrom";//$NON-NLS-1$
+
+	private final Pattern annotationPattern = Pattern.compile("updateFrom:([^:]+):(\\d+)"); //$NON-NLS-1$
+
+	private final Pattern indexPattern = Pattern.compile(":\\d+$"); //$NON-NLS-1$
+
+	public OomphSetupUpdater(final IFile mapFile, final EList<Contribution> contributions) {
+		super(mapFile, contributions);
+	}
+
+	@Override
+	protected Pattern getCommentPattern() {
+		return annotationPattern;
+	}
+
+	@Override
+	protected String getCommentContent(Node comment) {
+		StringBuilder result = new StringBuilder("updateFrom:"); //$NON-NLS-1$
+
+		Element annotation = (Element) comment;
+		NodeList details = annotation.getElementsByTagName("detail"); //$NON-NLS-1$
+		for (int i = 0; i < details.getLength(); i++) {
+			Element next = (Element) details.item(i);
+			if (UPDATE_KEY.equals(next.getAttribute("key"))) { //$NON-NLS-1$ //$NON-NLS-2$
+				String repoSpec = null;
+				if (next.hasAttribute("value")) { //$NON-NLS-1$
+					repoSpec = next.getAttribute("value"); //$NON-NLS-1$
+				} else {
+					NodeList values = next.getElementsByTagName("value"); //$NON-NLS-1$
+					if (values.getLength() > 0) {
+						repoSpec = values.item(0).getTextContent().trim();
+					}
+				}
+				if (repoSpec != null) {
+					result.append(repoSpec);
+					if (!indexPattern.matcher(repoSpec).find()) {
+						// default index
+						result.append(":0"); //$NON-NLS-1$
+						break;
+					}
+				}
+			}
+		}
+
+		return result.toString();
+	}
+
+	@Override
+	protected String getCommentSyntax() {
+		return String.format("Annotation with source %s and detail 'updateFrom=<contributionName>[:<index>]?'", ANNOTATION_SOURCE); //$NON-NLS-1$
+	}
+
+	@Override
+	protected Node getPrecedingComment(Node node) {
+		Element result = null;
+
+		for (Node next = node.getFirstChild(); next != null; next = next.getNextSibling()) {
+			if (next.getNodeType() == Node.ELEMENT_NODE) {
+				if ("annotation".equals(next.getNodeName())) { //$NON-NLS-1$
+					Element annotation = (Element) next;
+					if (ANNOTATION_SOURCE.equals(annotation.getAttribute("source"))) { //$NON-NLS-1$
+						result = annotation;
+						break;
+					}
+				}
+			}
+		}
+
+		return result;
+	}
+
+	@Override
+	protected String getXpath() {
+		return "//setupTask[@type='setup.targlets:TargletTask']/targlet/repositoryList/repository";
+	}
+
+	@Override
+	protected void updateUri(Node uri, String location) {
+		uri.getAttributes().getNamedItem("url").setTextContent(location); //$NON-NLS-1$
+	}
+
+}
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/PomUpdater.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/PomUpdater.java
new file mode 100644
index 00000000000..0b3fc7d0105
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/PomUpdater.java
@@ -0,0 +1,36 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.releng.tools.internal.popup.actions;

+

+import org.eclipse.b3.aggregator.Contribution;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.emf.common.util.EList;

+import org.w3c.dom.Node;

+

+

+public class PomUpdater extends DependencyUpdater {

+

+	public PomUpdater(final IFile mapFile, final EList<Contribution> contributions) {

+		super(mapFile, contributions);

+	}

+

+	@Override

+	protected String getXpath() {

+		return "/project/repositories/repository/url";

+	}

+

+	@Override

+	protected void updateUri(Node uri, String location) {

+		uri.setTextContent(location);

+	}

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/META-INF/MANIFEST.MF
index c1e21f98b5c..f89877df59e 100644
--- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.codegen.ecore;bundle-version="2.8.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.sysml.sysmloveruml.codegen.SysML

  OverUMLGeneratorPlugin$Implementation

diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
index 4a6256c6925..d296da8fb9c 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
@@ -1,23 +1,23 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

  org.eclipse.emf;bundle-version="2.6.0",

- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.0",

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation.edit,

  org.eclipse.gmf.runtime.diagram.ui,

  org.eclipse.gmf.runtime.diagram.ui.render,

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.core.resources,

- org.eclipse.papyrus.infra.hyperlink;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.hyperlink;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
index 67f91bc0f6e..487f457657b 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.help;bundle-version="3.6.0",

- org.eclipse.papyrus.infra.doc;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.doc;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/pom.xml
index b4cedfa15ec..c7d4088b716 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.cdo.ui.doc</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF
index 1c107e304b0..6cdbd169fb0 100644
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.help

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/pom.xml
index 8cd14858c36..a278a3482b2 100644
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.copypaste.ui.doc</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF
index 37b4f99f597..eb76d24b9c8 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.doc;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common.doc;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.doc;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common.doc;bundle-version="1.1.0",

  org.eclipse.help;bundle-version="3.6.0"

 Bundle-Vendor: %vendorName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.dsml.validation.doc.Activator

diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/pom.xml
index a9e979f5b20..bae2d6df262 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.dsml.validation.doc</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.core.resources.prefs
index 102f4b5a001..ea6425826c4 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,6 @@
 eclipse.preferences.version=1

+encoding//resource/alignmentTool-toc.xml=utf-8

+encoding//resource/alignmentTool.html=utf-8

 encoding//resource/marqueeSelectionTool-toc.xml=utf-8

 encoding//resource/marqueeSelectionTool.html=utf-8

 encoding//resource/tools-toc.xml=utf-8

diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/META-INF/MANIFEST.MF
index 13021f1cb45..aa47f65088d 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.help;bundle-version="3.6.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.xml
index 5743a03b994..b41b2f54846 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.xml
@@ -10,6 +10,10 @@
       <toc
             file="resource/tools-toc.xml"
             primary="false">
+      </toc>
+      <toc
+            file="resource/alignmentTool-toc.xml"
+            primary="false">
       </toc>      
    </extension>
 </plugin>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/pom.xml
index 65c47f05c01..f8829d95201 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.common.doc</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/alignmentTool-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/alignmentTool-toc.xml
new file mode 100644
index 00000000000..46bc9aa3b5c
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/alignmentTool-toc.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<toc topic="resource/alignmentTool.html" label="Tool">
+	<topic href="resource/alignmentTool.html" label="Alignment Tool">
+		<topic href="resource/alignmentTool.html#Introduction" label="Introduction"></topic>
+		<topic href="resource/alignmentTool.html#General_Rules" label="General Rules"></topic>
+		<topic href="resource/alignmentTool.html#Using_of_Alignment_Tool" label="Using of Alignment Tool">
+			<topic href="resource/alignmentTool.html#General_Case" label="General Case"></topic>
+			<topic href="resource/alignmentTool.html#Hierarchy" label="Hierarchy"></topic>
+			<topic href="resource/alignmentTool.html#Labels" label="Labels"></topic>
+			<topic href="resource/alignmentTool.html#Edges" label="Edges"></topic>
+		</topic>
+		<topic href="resource/alignmentTool.html#Limitation" label="Limitation">
+			<topic href="resource/alignmentTool.html#Hierarchy_2" label="Hierarchy"></topic>
+			<topic href="resource/alignmentTool.html#Label" label="Label"></topic>
+			<topic href="resource/alignmentTool.html#Edge" label="Edge"></topic>
+		</topic>
+	</topic>
+</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/alignmentTool.html b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/alignmentTool.html
new file mode 100644
index 00000000000..42e415216de
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/alignmentTool.html
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Alignment_Tool">Alignment Tool</h1><h2 id="Introduction">Introduction</h2><p>Alignment Tool is available in the Papyrus toolbar:<br/>
+<img border="0" src="images/Alignment/Alignment_Toolbar.JPG"/><br/>
+Alignment allows to align the different objects of the model based on a reference object.
+The reference object is basically the last object selected (primary selection) and can be identified with the handles color:<br/></p><table style="margin: auto;"><tr><td><img title="Normal Selection" alt="Normal Selection" border="1" src="images/Alignment/normal_Align_selection.JPG"/>   </td><td><img title="Primary Selection" alt="Primary Selection" border="1" src="images/Alignment/Reference_Align_selection.JPG"/>   </td></tr></table><p><br/>
+To implement Alignment, some rules have been defined. </p><h2 id="General_Rules">General Rules</h2><p>The Alignment Tools allows 6 types of alignment:
+<img align="right" title="Alignment Types" alt="Alignment Types" border="0" src="images/Alignment/Alignment_Toolbar.JPG"/></p><ul><li>Horizontally<ul><li>Left</li><li>Center</li><li>Right</li></ul></li><li>Vertically<ul><li>Top</li><li>Middle</li><li>Bottom</li></ul></li></ul><p>These types can be disable if the alignment is not possible.
+Here is the different rules on which the alignment is based:</p><ol><li>The alignment is available only if the selected object can be moved on the reference</li><li>When an object and one or several children should be aligned on a third object, only the parent is aligned</li><li>An object can only be aligned inside of its container's bounds.(In order to avoid scrollbar and invisible objects) </li><li>An object cannot be aligned on one of its children.</li></ol><h2 id="Using_of_Alignment_Tool">Using of Alignment Tool</h2><p>Here under, some examples of using of alignment tool. <br/></p><h3 id="General_Case">General Case</h3><p>Basically, alignment is used in order to make the model easier to be read and more aesthetic.
+To align objects:</p><ul><li>Select the object to be aligned</li><li>Click on the align tool button <img border="0" src="images/Alignment/Align_button.JPG"/>  </li><li>Choose the proper type of alignment </li></ul><p><br/></p><ol><li>Example A: Standard alignment<dl><dd><img border="0" src="images/Alignment/General_Align1_before.JPG"/> </dd><dd><img border="0" src="images/Alignment/General_Align1_after.JPG"/></dd><dd>In this case the reference object is the right one. <br/></dd></dl></li><li>Example B: Parent alignment<dl><dd>In this second example, the object (the Class ) is aligned on his parent (the Package),  the unauthorized alignment appears disable (in grey)</dd><dd><img border="0" src="images/Alignment/General_Align2_before.JPG"/> </dd><dd><img border="0" src="images/Alignment/General_Align2_after.JPG"/></dd></dl></li></ol><h3 id="Hierarchy">Hierarchy</h3><p>In this section, some examples of alignment in case of hierarchy between objects (parent / children).</p><ol><li>Example A: Only the parent is aligned <dl><dd><img border="0" src="images/Alignment/Hierarchy_Align1_before.JPG"/> </dd><dd>As shown in the result screenshot below , only the parent (the Package) has been aligned. </dd><dd><img border="0" src="images/Alignment/Hierarchy_Align1_after.JPG"/></dd></dl></li><li>Example B: Alignment inside the Container bounds is available<dl><dd><img border="0" src="images/Alignment/Hierarchy_Align2_before.JPG"/> </dd><dd>In the align options list, only the ones that keep the objects inside his container are enable.</dd><dd><img border="0" src="images/Alignment/Hierarchy_Align2_after.JPG"/></dd></dl></li></ol><h3 id="Labels">Labels</h3><p>In this section, some examples of labels alignments.</p><ol><li>Example A: Standard label alignment<dl><dd><img border="0" src="images/Alignment/Label_Align1_before.JPG"/> </dd><dd><img border="0" src="images/Alignment/Label_Align1_after.JPG"/></dd></dl></li><li>Example B: Dependency with another selected object<dl><dd><img border="0" src="images/Alignment/Label_Align2_before.JPG"/> </dd><dd>As shown in the result screenshot below, only the class is aligned. The label moves according to the connection move.</dd><dd><img border="0" src="images/Alignment/Label_Align2_after.JPG"/></dd></dl></li></ol><h3 id="Edges">Edges</h3><p>Edges alignment could sound not realistic. Actually, edge alignment is an alignment between the extremities of the edge, to make the edge horizontal or vertical. 
+Example: Standard edge alignment</p><dl><dd><img border="0" src="images/Alignment/Link_Align1_before.JPG"/> </dd></dl><p>The extremities are alignment in order to have an horizontal connection. The connection handles remained at the same place on the object</p><dl><dd><img border="0" src="images/Alignment/Link_Align1_after.JPG"/></dd></dl><h2 id="Limitation">Limitation</h2><p>This section will describe some limitations of the alignment tool.</p><h3 id="Hierarchy_2">Hierarchy</h3><p>A parent cannot be aligned on one of his child:
+<img border="0" src="images/Alignment/Hierarchy_Align3_limitation.JPG"/></p><h3 id="Label">Label</h3><p>The extremities (source or target )of a connection cannot be aligned on any Labels of this connection.
+<img border="0" src="images/Alignment/Label_Align3_limitation.JPG"/></p><h3 id="Edge">Edge</h3><p>To make the edge alignment available, the edge handles should correspond to the same direction (horizontal or vertical).
+In the following case, source handle is on TOP and target handle is on LEFT. it is then impossible to align the edge.
+<img border="0" src="images/Alignment/Link_Align2_Limitation.JPG"/></p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/alignmentTool.mediawiki b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/alignmentTool.mediawiki
new file mode 100644
index 00000000000..83efab7fa99
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/alignmentTool.mediawiki
@@ -0,0 +1,92 @@
+= Alignment Tool =

+== Introduction ==

+Alignment Tool is available in the Papyrus toolbar:<br/>

+[[File:images/Alignment/Alignment_Toolbar.JPG]]<br/>

+Alignment allows to align the different objects of the model based on a reference object.

+The reference object is basically the last object selected (primary selection) and can be identified with the handles color:<br/>

+{|style="margin: auto;"

+|   [[File:images/Alignment/normal_Align_selection.JPG|frame|Normal Selection]]   

+|   [[File:images/Alignment/Reference_Align_selection.JPG|frame|Primary Selection]]   

+|}

+<br/>

+To implement Alignment, some rules have been defined. 

+

+== General Rules ==

+The Alignment Tools allows 6 types of alignment:

+[[File:images/Alignment/Alignment_Toolbar.JPG|right|Alignment Types]]

+*Horizontally

+**Left

+**Center

+**Right

+*Vertically

+**Top

+**Middle

+**Bottom

+

+

+These types can be disable if the alignment is not possible.

+Here is the different rules on which the alignment is based:

+#The alignment is available only if the selected object can be moved on the reference

+#When an object and one or several children should be aligned on a third object, only the parent is aligned

+#An object can only be aligned inside of its container's bounds.(In order to avoid scrollbar and invisible objects) 

+#An object cannot be aligned on one of its children.

+

+ 

+== Using of Alignment Tool ==

+Here under, some examples of using of alignment tool. <br/>

+=== General Case ===

+Basically, alignment is used in order to make the model easier to be read and more aesthetic.

+To align objects:

+* Select the object to be aligned

+* Click on the align tool button [[File:images/Alignment/Align_button.JPG]]  

+* Choose the proper type of alignment 

+<br/>

+#Example A: Standard alignment

+#:[[File:images/Alignment/General_Align1_before.JPG]] 

+#:[[File:images/Alignment/General_Align1_after.JPG]]

+#:In this case the reference object is the right one. <br/>

+#Example B: Parent alignment

+#:In this second example, the object (the Class ) is aligned on his parent (the Package),  the unauthorized alignment appears disable (in grey)

+#:[[File:images/Alignment/General_Align2_before.JPG]] 

+#:[[File:images/Alignment/General_Align2_after.JPG]]

+

+=== Hierarchy ===

+In this section, some examples of alignment in case of hierarchy between objects (parent / children).

+#Example A: Only the parent is aligned 

+#:[[File:images/Alignment/Hierarchy_Align1_before.JPG]] 

+#:As shown in the result screenshot below , only the parent (the Package) has been aligned. 

+#:[[File:images/Alignment/Hierarchy_Align1_after.JPG]]

+#Example B: Alignment inside the Container bounds is available

+#:[[File:images/Alignment/Hierarchy_Align2_before.JPG]] 

+#:In the align options list, only the ones that keep the objects inside his container are enable.

+#:[[File:images/Alignment/Hierarchy_Align2_after.JPG]]

+

+=== Labels ===

+In this section, some examples of labels alignments.

+#Example A: Standard label alignment

+#:[[File:images/Alignment/Label_Align1_before.JPG]] 

+#:[[File:images/Alignment/Label_Align1_after.JPG]]

+#Example B: Dependency with another selected object

+#:[[File:images/Alignment/Label_Align2_before.JPG]] 

+#:As shown in the result screenshot below, only the class is aligned. The label moves according to the connection move.

+#:[[File:images/Alignment/Label_Align2_after.JPG]]

+

+=== Edges ===

+Edges alignment could sound not realistic. Actually, edge alignment is an alignment between the extremities of the edge, to make the edge horizontal or vertical. 

+Example: Standard edge alignment

+:[[File:images/Alignment/Link_Align1_before.JPG]] 

+The extremities are alignment in order to have an horizontal connection. The connection handles remained at the same place on the object

+:[[File:images/Alignment/Link_Align1_after.JPG]]

+

+== Limitation ==

+This section will describe some limitations of the alignment tool.

+=== Hierarchy ===

+A parent cannot be aligned on one of his child:

+[[File:images/Alignment/Hierarchy_Align3_limitation.JPG]]

+=== Label ===

+The extremities (source or target )of a connection cannot be aligned on any Labels of this connection.

+[[File:images/Alignment/Label_Align3_limitation.JPG]]

+=== Edge ===

+To make the edge alignment available, the edge handles should correspond to the same direction (horizontal or vertical).

+In the following case, source handle is on TOP and target handle is on LEFT. it is then impossible to align the edge.

+[[File:images/Alignment/Link_Align2_Limitation.JPG]]

diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Align_button.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Align_button.JPG
new file mode 100644
index 00000000000..d511301b2d7
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Align_button.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Alignment_Toolbar.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Alignment_Toolbar.JPG
new file mode 100644
index 00000000000..d624f6e52c3
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Alignment_Toolbar.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Customize_Perspective.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Customize_Perspective.JPG
new file mode 100644
index 00000000000..3df975dd835
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Customize_Perspective.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/General_Align1_after.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/General_Align1_after.JPG
new file mode 100644
index 00000000000..009635143cf
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/General_Align1_after.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/General_Align1_before.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/General_Align1_before.JPG
new file mode 100644
index 00000000000..c33c4906208
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/General_Align1_before.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/General_Align2_after.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/General_Align2_after.JPG
new file mode 100644
index 00000000000..1b7e6c8a810
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/General_Align2_after.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/General_Align2_before.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/General_Align2_before.JPG
new file mode 100644
index 00000000000..d7f441bdf71
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/General_Align2_before.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Hierarchy_Align1_after.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Hierarchy_Align1_after.JPG
new file mode 100644
index 00000000000..28a1dc383b3
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Hierarchy_Align1_after.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Hierarchy_Align1_before.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Hierarchy_Align1_before.JPG
new file mode 100644
index 00000000000..e70a3dd62d8
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Hierarchy_Align1_before.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Hierarchy_Align2_after.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Hierarchy_Align2_after.JPG
new file mode 100644
index 00000000000..6ec34674348
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Hierarchy_Align2_after.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Hierarchy_Align2_before.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Hierarchy_Align2_before.JPG
new file mode 100644
index 00000000000..ef8a577d7e2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Hierarchy_Align2_before.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Hierarchy_Align3_limitation.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Hierarchy_Align3_limitation.JPG
new file mode 100644
index 00000000000..3e960b88e6c
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Hierarchy_Align3_limitation.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Label_Align1_after.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Label_Align1_after.JPG
new file mode 100644
index 00000000000..f3531d29909
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Label_Align1_after.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Label_Align1_before.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Label_Align1_before.JPG
new file mode 100644
index 00000000000..1ba9597d9ec
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Label_Align1_before.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Label_Align2_after.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Label_Align2_after.JPG
new file mode 100644
index 00000000000..c38704de410
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Label_Align2_after.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Label_Align2_before.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Label_Align2_before.JPG
new file mode 100644
index 00000000000..4b68fb3b174
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Label_Align2_before.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Label_Align3_limitation.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Label_Align3_limitation.JPG
new file mode 100644
index 00000000000..df3e5ddfd5d
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Label_Align3_limitation.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Link_Align1_after.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Link_Align1_after.JPG
new file mode 100644
index 00000000000..4f78d430727
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Link_Align1_after.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Link_Align1_before.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Link_Align1_before.JPG
new file mode 100644
index 00000000000..c6f694e7f24
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Link_Align1_before.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Link_Align2_Limitation.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Link_Align2_Limitation.JPG
new file mode 100644
index 00000000000..40d8e31e59b
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Link_Align2_Limitation.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Reference_Align_selection.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Reference_Align_selection.JPG
new file mode 100644
index 00000000000..75a18b4c6fa
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/Reference_Align_selection.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/normal_Align_selection.JPG b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/normal_Align_selection.JPG
new file mode 100644
index 00000000000..54c963614b4
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/images/Alignment/normal_Align_selection.JPG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/tools-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/tools-toc.xml
index 001f10d70ad..5cabd4ab4c8 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/tools-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/tools-toc.xml
@@ -2,5 +2,6 @@
 <toc label="Papyrus Modelling Tools" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
 	<topic label="Using Papyrus modelling tools">
     <anchor id="Tool"/>
-    <link toc="resource/marqueeSelectionTool-toc.xml"/></topic>
+    <link toc="resource/marqueeSelectionTool-toc.xml"/>
+    <link toc="resource/alignmentTool-toc.xml"/></topic>
 </toc>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/META-INF/MANIFEST.MF
index 84dc9a9b4de..fbad4194184 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.help;bundle-version="3.6.0",

- org.eclipse.papyrus.infra.doc;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.doc;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: CSS Documentation

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.doc;singlet

diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/pom.xml
index 715ef949ae3..7247a9367fb 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.doc</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF
index 65e8bb0c15f..a24482bb7bf 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.help;bundle-version="3.6.0",

- org.eclipse.papyrus.infra.doc;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.doc;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: New Child Documentation

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.doc;singleton:

diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/pom.xml
index cc32a59bedf..30063f8c7d9 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.newchild.doc</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF
index 766adcfd456..ca3a08f340b 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.help;bundle-version="3.6.0",

- org.eclipse.papyrus.infra.doc;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.doc;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode.do

diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/pom.xml
index 5769515c89c..6f80703987d 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/pom.xml
@@ -4,11 +4,11 @@
 	<parent>

 		<artifactId>org.eclipse.papyrus</artifactId>

 		<groupId>org.eclipse.papyrus</groupId>

-		<version>1.0.1-SNAPSHOT</version>

+		<version>1.1.0-SNAPSHOT</version>

 		<relativePath>../../../releng/top-pom-main.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.papyrus.infra.services.controlmode.doc</artifactId>

 	<groupId>org.eclipse.papyrus</groupId>

-	<version>1.0.1-SNAPSHOT</version>

+	<version>1.1.0-SNAPSHOT</version>

 	<packaging>eclipse-plugin</packaging>

 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF
index ddd698d1a23..2032e6c6ba5 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.help

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/pom.xml
index 2b9f1eec984..7d3cd77844c 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.viewpoints.doc</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.layers.documentation/META-INF/MANIFEST.MF
index 6b90cb0a7bd..a616a7407fe 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.help

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/pom.xml b/plugins/doc/org.eclipse.papyrus.layers.documentation/pom.xml
index 425778a9cab..fd471886590 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.layers.documentation</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.moka.doc/META-INF/MANIFEST.MF
index abdc09c1d25..cd1544ce60d 100755
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.help;bundle-version="3.6.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Moka Documentation

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.moka.doc.Activator

diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.moka.doc/pom.xml
index 412eec04245..3b3ac78973e 100755
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.moka.doc</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/META-INF/MANIFEST.MF
index 0929df86336..1e3526d8205 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.help

 Bundle-Vendor: %Bundle-Vendor

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.doc;single

diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/pom.xml
index 216e217a7f9..ae51d06a79a 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.common.doc</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/META-INF/MANIFEST.MF
index 12057eac835..2799cfaa2c8 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.doc;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.doc;bundle-version="1.1.0",

  org.eclipse.help;bundle-version="3.6.0"

 Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Profile Documentation

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.profile.doc;singl

diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/pom.xml
index 576c9162047..ad9849a3aaa 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.profile.doc</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF
index 002e7e47d25..917d26d4a3f 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.help;bundle-version="3.6.0",

- org.eclipse.papyrus.infra.doc;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.doc;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Papyrus UML User Guide

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.doc;singleton:=true

diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.uml.doc/pom.xml
index 2fd25054453..e68b417746b 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.doc</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/META-INF/MANIFEST.MF
index a0b27f28358..f50fc8fb856 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.help;bundle-version="3.6.0",

- org.eclipse.papyrus.infra.doc;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.doc;bundle-version="1.1.0"

 Bundle-Vendor: %vendorName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/pom.xml
index c9791521a9c..b0ddf3c7987 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.search.ui.doc</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.views.properties.doc/META-INF/MANIFEST.MF
index 5f49efe1284..7002aa9138d 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.help;bundle-version="3.6.0",

- org.eclipse.papyrus.infra.doc;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.doc;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Properties view Documentation

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.views.properties.doc;singleto

diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.views.properties.doc/pom.xml
index bb4161366d7..aacd4505ae3 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.properties.doc</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/META-INF/MANIFEST.MF
index 3580f9451e9..be485086201 100644
--- a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.editor.perspectiveconfiguration.

diff --git a/plugins/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF
index 1acf46fa258..0fb21be4f30 100644
--- a/plugins/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF
+++ b/plugins/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
 Manifest-Version: 1.0

 Export-Package: org.eclipse.papyrus.editor

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.editor.Activator

diff --git a/plugins/editor/org.eclipse.papyrus.editor/pom.xml b/plugins/editor/org.eclipse.papyrus.editor/pom.xml
index bd20d5a273a..a67989d2c71 100644
--- a/plugins/editor/org.eclipse.papyrus.editor/pom.xml
+++ b/plugins/editor/org.eclipse.papyrus.editor/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.editor</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/META-INF/MANIFEST.MF b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/META-INF/MANIFEST.MF
index 535ae856bab..3b40ef02195 100644
--- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/META-INF/MANIFEST.MF
+++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.doc;singleto

diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/META-INF/MANIFEST.MF b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/META-INF/MANIFEST.MF
index ac9cc8c1529..2d7519e53d8 100644
--- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/META-INF/MANIFEST.MF
+++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Facet Custom Editor
 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Require-Bundle: org.eclipse.help
 Bundle-Vendor: Eclipse Modeling Project
diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/META-INF/MANIFEST.MF b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/META-INF/MANIFEST.MF
index d79a4f9a9dd..82d6f3e6bc2 100644
--- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/META-INF/MANIFEST.MF
+++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/META-INF/MANIFEST.MF
@@ -1,26 +1,26 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.emf.facet.custom.metamodel.edit;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.emf.facet.custom.metamodel.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport,

  org.eclipse.emf.edit.ui;visibility:=reexport,

  org.eclipse.ui.ide;visibility:=reexport,

  org.eclipse.ui.forms,

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

  org.eclipse.emf.ecore.edit,

- org.eclipse.papyrus.emf.facet.efacet.sdk.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.efacet.sdk.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.1.0",

  org.eclipse.jface,

- org.eclipse.papyrus.emf.facet.custom.sdk.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.query.java.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.query.ocl.metamodel;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.custom.sdk.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.query.java.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.query.ocl.metamodel;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/META-INF/MANIFEST.MF b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/META-INF/MANIFEST.MF
index e741fdf4a91..9a3e144a926 100644
--- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/META-INF/MANIFEST.MF
+++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.apache.ant;bundle-version="1.7.1"

 Bundle-Vendor: %Bundle-Vendor

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.doc;singleton:=true

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF
index 30685fbc1cc..82e8fe9ee75 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
  com.ibm.icu;bundle-version="4.2.1"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.common.core.internal.A

  ctivator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/pom.xml
index de3bf1815c9..66398875e68 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.common.core</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF
index 3e334a0aa0d..82a5d71f3e4 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF
@@ -3,16 +3,16 @@ Export-Package: org.eclipse.papyrus.emf.facet.common.sdk.core.internal.exported;
  org.eclipse.papyrus.emf.facet.common.sdk.core.internal.exported.utils

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;bundle-version="2.6.0",

- org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="1.1.0",

  org.eclipse.pde.core;bundle-version="3.6.0",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

  com.ibm.icu;bundle-version="4.2.1",

  org.eclipse.core.resources;bundle-version="3.6.0",

  org.eclipse.jdt.core;bundle-version="3.6.0",

  org.eclipse.jdt.launching;bundle-version="3.5.100"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.common.sdk.core.intern

  al.Activator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/pom.xml
index 57c0cd76249..7de2201a782 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.common.sdk.core</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF
index 681e85f8558..b26fb191dcc 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF
@@ -8,13 +8,13 @@ Export-Package: org.eclipse.papyrus.emf.facet.common.ui.internal,
  org.eclipse.papyrus.emf.facet.common.ui.internal.widgets

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.6.0",

  org.eclipse.ui.ide;bundle-version="3.6.0",

- org.eclipse.papyrus.emf.facet.common.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.common.core;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.common.ui.internal.Act

  ivator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/pom.xml
index db70b8c8366..9cdb9cbff84 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.common.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF
index 26169faac9f..308a2bd9385 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF
@@ -8,16 +8,16 @@ Export-Package: org.eclipse.papyrus.emf.facet.custom.core,
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.emf.ecore,

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

  org.eclipse.emf.edit;bundle-version="2.6.0",

  org.eclipse.emf.validation;bundle-version="1.4.0",

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.core.internal.A

  ctivator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/pom.xml
index 6771fab3963..e14440f1d2a 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.custom.core</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/META-INF/MANIFEST.MF
index 97d4a1e8efa..5b37d753c20 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.

  custom.provider;x-internal:=true

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.edit,

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.papyrus.emf.facet.efacet.metamodel.edit;bundle-version="1.0.1";visibility:=reexport

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.emf.facet.efacet.metamodel.edit;bundle-version="1.1.0";visibility:=reexport

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/pom.xml
index ded64213b1e..49c5fdf6f20 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.custom.metamodel.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF
index 19faa3430d8..f3f5d2d4c87 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore,

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.emf.facet.custom.metamodel.custompt,

  org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom,

  org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl,

@@ -16,7 +16,7 @@ Export-Package: org.eclipse.papyrus.emf.facet.custom.metamodel.custompt,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/pom.xml
index c2dca582003..17a4d433810 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.custom.metamodel</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/META-INF/MANIFEST.MF
index 33af1087f86..66c354243c4 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/META-INF/MANIFEST.MF
@@ -3,15 +3,15 @@ Export-Package: org.eclipse.papyrus.emf.facet.custom.sdk.core,
  org.eclipse.papyrus.emf.facet.custom.sdk.core.internal.validation;x-internal:=true

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.validation;bundle-version="1.4.0",

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.common.sdk.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.common.sdk.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.sdk.core.intern

  al.Activator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/pom.xml
index 5865a0f494d..5b7dc8986b3 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.custom.sdk.core</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/MANIFEST.MF
index 3455f8fc9db..ed8bde91971 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.emf.facet.custom.sdk.ui.dialog

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.emf.facet.widgets.celleditors;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.widgets.celleditors;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

  org.eclipse.swt;bundle-version="3.6.0",

  org.eclipse.emf.ecore;bundle-version="2.6.0",

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.6.0",

- org.eclipse.papyrus.emf.facet.custom.sdk.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet.sdk.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.custom.sdk.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet.sdk.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.1.0",

  org.eclipse.emf.edit;bundle-version="2.6.0",

  org.eclipse.ui.ide;bundle-version="3.6.0",

  org.eclipse.core.expressions;bundle-version="3.4.200"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/pom.xml
index cfd4f8313ed..bf04911c546 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.custom.sdk.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/META-INF/MANIFEST.MF
index 1554827472f..d7653664e36 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/META-INF/MANIFEST.MF
@@ -9,18 +9,18 @@ Export-Package: org.eclipse.papyrus.emf.facet.custom.ui,
  org.eclipse.papyrus.emf.facet.custom.ui.internal.query

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

  org.eclipse.emf.edit;bundle-version="2.6.0",

- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.1.0",

  org.eclipse.emf.edit.ui;bundle-version="2.6.0",

- org.eclipse.papyrus.emf.facet.util.swt;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.jface.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.util.swt;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.jface.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.ui.internal.Act

  ivator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/pom.xml
index f6b8670e1f3..e061611d638 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.custom.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedTreeContentProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedTreeContentProvider.java
index 34e9f7f3b67..c5a96e72e83 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedTreeContentProvider.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedTreeContentProvider.java
@@ -11,6 +11,7 @@
  *    Gregoire Dupe (Mia-Software) - Bug 386387 - [CustomizedTreeContentProvider] The TreeElements are not preserved between two calls to getElements()

  *    Christian W. Damus (CEA) - bug 430700

  *    Christian W. Damus (CEA) - bug 440795

+ *    Christian W. Damus (CEA) - bug 441857

  *

  *******************************************************************************/

 package org.eclipse.papyrus.emf.facet.custom.ui.internal;

@@ -20,15 +21,14 @@ import java.util.Collection;
 import java.util.Collections;

 import java.util.HashMap;

 import java.util.IdentityHashMap;

-import java.util.LinkedList;

 import java.util.List;

 import java.util.Map;

 import java.util.Set;

 

 import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EReference;

+import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.emf.ecore.ETypedElement;

 import org.eclipse.jface.viewers.Viewer;

 import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager;

@@ -209,9 +209,17 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
 	}

 

 	public Object[] getChildren(final EObjectTreeElement treeElement) {

+		Set<EStructuralFeature> facetFeatures;

+		try {

+			facetFeatures = FacetUtils.getETypedElements(treeElement.getEObject(), EStructuralFeature.class, customManager.getFacetManager());

+		} catch (FacetManagerException e) {

+			facetFeatures = Collections.emptySet();

+			Logger.logError(e, Activator.getDefault());

+		}

+

 		final ArrayList<Object> children = new ArrayList<Object>();

-		children.addAll(createAttributes(treeElement));

-		children.addAll(createReferences(treeElement));

+		createAttributes(treeElement, facetFeatures, children);

+		createReferences(treeElement, facetFeatures, children);

 		return children.toArray();

 	}

 

@@ -364,67 +372,57 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
 

 

 

-	private Collection<? extends Object> createReferences(final EObjectTreeElement treeElement) {

+	private void createReferences(final EObjectTreeElement treeElement, Collection<EStructuralFeature> facetFeatures, Collection<Object> children) {

 		final EObject eObject = treeElement.getEObject();

-		final EClass eClass = eObject.eClass();

-		final IFacetManager facetManager = this.customManager.getFacetManager();

-		final List<EReference> allReferences = new ArrayList<EReference>();

-		allReferences.addAll(eClass.getEAllReferences());

-		try {

-			final Set<EReference> facetReferences = FacetUtils.getETypedElements(eObject, EReference.class, facetManager);

-			allReferences.addAll(facetReferences);

-		} catch (final FacetManagerException e) {

-			Logger.logError(e, Activator.getDefault());

+

+		for (EReference next : eObject.eClass().getEAllReferences()) {

+			createReference(treeElement, eObject, next, children);

 		}

+		for (EStructuralFeature next : facetFeatures) {

+			if (next instanceof EReference) {

+				createReference(treeElement, eObject, (EReference) next, children);

+			}

+		}

+	}

 

-		Collection<Object> result = new LinkedList<Object>();

-

-		for (EReference reference : allReferences) {

-			if (isVisible(eObject, reference)) {

-				if (collapseLink(eObject, reference)) {

-					if (reference.getUpperBound() != 1) {

-						result.addAll(getMultiValuedReferenceChildren(reference, eObject, treeElement));

-					} else {

-						Object child = getSingleValuedReferenceChild(reference, eObject, treeElement);

-						if (child != null) {

-							result.add(child);

-						}

-					}

+	private void createReference(EObjectTreeElement treeElement, EObject eObject, EReference eReference, Collection<Object> children) {

+		if (isVisible(eObject, eReference)) {

+			if (collapseLink(eObject, eReference)) {

+				if (eReference.getUpperBound() != 1) {

+					collectMultiValuedReferenceChildren(eReference, eObject, treeElement, children);

 				} else {

-					result.add(getEReferenceProxy(reference, treeElement));

+					Object child = getSingleValuedReferenceChild(eReference, eObject, treeElement);

+					if (child != null) {

+						children.add(child);

+					}

 				}

+			} else {

+				children.add(getEReferenceProxy(eReference, treeElement));

 			}

 		}

-

-		return result;

 	}

 

-	private Collection<? extends Object> createAttributes(final EObjectTreeElement treeElement) {

+	private void createAttributes(final EObjectTreeElement treeElement, Collection<EStructuralFeature> facetFeatures, Collection<? super TreeElement> children) {

 		final EObject eObject = treeElement.getEObject();

-		final EClass eClass = eObject.eClass();

-		final IFacetManager facetManager = this.customManager.getFacetManager();

-		final List<EAttribute> allAttributes = new ArrayList<EAttribute>();

-		allAttributes.addAll(eClass.getEAllAttributes());

-		try {

-			final Set<EAttribute> facetAttributes = FacetUtils.getETypedElements(eObject, EAttribute.class, facetManager);

-			allAttributes.addAll(facetAttributes);

-		} catch (final FacetManagerException e) {

-			Logger.logError(e, Activator.getDefault());

-		}

-

 

-		List<TreeElement> result = new LinkedList<TreeElement>();

-		for (EAttribute eAttribute : allAttributes) {

-			if (isVisible(eObject, eAttribute)) {

-				TreeElement eAttributeTreeElement = getEAttributeProxy(eAttribute, treeElement);

-				if (eAttributeTreeElement != null) {

-					result.add(eAttributeTreeElement);

-				}

+		for (EAttribute next : eObject.eClass().getEAllAttributes()) {

+			createAttribute(treeElement, eObject, next, children);

+		}

+		for (EStructuralFeature next : facetFeatures) {

+			if (next instanceof EAttribute) {

+				createAttribute(treeElement, eObject, (EAttribute) next, children);

 			}

 		}

-		return result;

 	}

 

+	private void createAttribute(EObjectTreeElement treeElement, EObject eObject, EAttribute eAttribute, Collection<? super TreeElement> children) {

+		if (isVisible(eObject, eAttribute)) {

+			TreeElement eAttributeTreeElement = getEAttributeProxy(eAttribute, treeElement);

+			if (eAttributeTreeElement != null) {

+				children.add(eAttributeTreeElement);

+			}

+		}

+	}

 

 

 	private EReferenceTreeElement createReferenceProxy(final EReference reference, final EObjectTreeElement parent) {

@@ -464,8 +462,7 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
 		return child;

 	}

 

-	private List<Object> getMultiValuedReferenceChildren(final EReference eReference, final EObject eObject, final TreeElement parent) {

-		final List<Object> children = new ArrayList<Object>();

+	private void collectMultiValuedReferenceChildren(final EReference eReference, final EObject eObject, final TreeElement parent, Collection<Object> children) {

 		try {

 			final IFacetManager facetManager = this.customManager.getFacetManager();

 			final List<Object> result = facetManager.getOrInvokeMultiValued(eObject, eReference, null);

@@ -478,7 +475,6 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
 		} catch (final FacetManagerException e) {

 			Logger.logError(e, Activator.getDefault());

 		}

-		return children;

 	}

 

 	protected EObjectTreeElement getEObjectProxy(final Object element, final TreeElement parent) {

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/META-INF/MANIFEST.MF
index 2d5e94814a4..fab5090140f 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@ Export-Package: org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcat
  alog

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore,

- org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.catalog.plugin.

  Activator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/pom.xml
index 7cdb93499ff..c8ee9095621 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.efacet.catalog</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/META-INF/MANIFEST.MF
index 08a94cabed3..1e6f15d8862 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/META-INF/MANIFEST.MF
@@ -7,18 +7,18 @@ Export-Package: org.eclipse.papyrus.emf.facet.efacet.core,
  org.eclipse.papyrus.emf.facet.efacet.core.query

 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",

  org.eclipse.emf.ecore;bundle-version="2.6.0",

- org.eclipse.papyrus.emf.facet.efacet.catalog;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.efacet.catalog;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

  org.eclipse.emf.edit;bundle-version="2.6.0",

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.6.0",

- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.core.internal.A

  ctivator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/pom.xml
index e8fddd103ae..028bca4614b 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.efacet.core</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/internal/FacetCache.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/internal/FacetCache.java
new file mode 100644
index 00000000000..dae45d3d158
--- /dev/null
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/internal/FacetCache.java
@@ -0,0 +1,82 @@
+/*****************************************************************************
+ * 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.emf.facet.efacet.core.internal;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.ETypedElement;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+/**
+ * A cache of resolved facet overrides for an {@link EObject}. It expunges itself automatically when
+ * it detects that it is out-of-date with respect to the {@link FacetManagerContext}.
+ */
+class FacetCache extends AdapterImpl {
+
+	private final FacetManagerContext context;
+
+	private long currentGeneration = -1;
+
+	private final Map<ETypedElement, ETypedElement> overrides = new HashMap<ETypedElement, ETypedElement>();
+
+	FacetCache(EObject owner, FacetManagerContext context) {
+		this.context = context;
+		owner.eAdapters().add(this);
+	}
+
+	static FacetCache getInstance(EObject element, FacetManagerContext context) {
+		FacetCache result = (FacetCache) EcoreUtil.getExistingAdapter(element, context);
+
+		if (result == null) {
+			result = new FacetCache(element, context);
+		}
+
+		return result;
+	}
+
+	@Override
+	public boolean isAdapterForType(Object type) {
+		return type == context;
+	}
+
+	@Override
+	public void notifyChanged(Notification msg) {
+		if (!msg.isTouch()) {
+			// It could be that some facet/customization predicate has changed for me. Purge the cache
+			currentGeneration = -1;
+		}
+	}
+
+	public <T extends ETypedElement> T resolve(T feature) {
+		if (context.facetGeneration > currentGeneration) {
+			// Purge and recompute as needed
+			overrides.clear();
+			currentGeneration = context.facetGeneration;
+		}
+
+		// This should be safe because we should only add mappings of matching types, although this cannot
+		// actually be enforced in any way
+		@SuppressWarnings("unchecked")
+		T result = (T) overrides.get(feature);
+		return result;
+	}
+
+	<T extends ETypedElement> void add(T feature, T override) {
+		overrides.put(feature, override);
+	}
+}
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/internal/FacetManagerContext.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/internal/FacetManagerContext.java
index 6cf384d9dd0..21e57baef52 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/internal/FacetManagerContext.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/internal/FacetManagerContext.java
@@ -1,552 +1,640 @@
-/*******************************************************************************

- * Copyright (c) 2011 Mia-Software

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Olivier Remaud (Soft-Maint) - Bug 361794 - [Restructuring] EMF Facet customization meta-model

- *     Gregoire Dupe (Mia-Software) - Bug 364325 - [Restructuring] The user must be able to navigate into a model using the Facet.

- *     Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] EMF Facet customization meta-model

- *     Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning

- *     Gregoire Dupe (Mia-Software) - Bug 375087 - [Table] ITableWidget.addColumn(List<ETypedElement>, List<FacetSet>)

- *     Gregoire Dupe (Mia-Software) - Bug 372626 - Aggregates

- *     Gregoire Dupe (Mia-Software) - Bug 377178 - [EFacet] infinite recursion in override resolution

- *     Gregoire Dupe (Mia-software) - Bug 383418 - [Table] FacetManagerContext.getOverrideCandidateFeatures(...) is empty

- *     Gregoire Dupe (Mia-software) - Bug 420093 - [EFacet] The facetManger list doesn't deal with uniqueness

- *     Thomas Cicognani (Soft-Maint) - Bug 420193 - Listener on FacetManager

- *     Fabien Treguer (Soft-Maint) - Bug 423285 - [Table] FacetSets not stored in a resource cause model manager crashes

- *******************************************************************************/

-

-package org.eclipse.papyrus.emf.facet.efacet.core.internal;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.ListIterator;

-import java.util.Set;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.ETypedElement;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.emf.facet.efacet.core.FacetUtils;

-import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManagerListener;

-import org.eclipse.papyrus.emf.facet.efacet.core.exception.FacetManagerException;

-import org.eclipse.papyrus.emf.facet.efacet.core.internal.FacetManager.ConformanceState;

-import org.eclipse.papyrus.emf.facet.efacet.core.internal.exception.FacetConformanceEvaluationException;

-import org.eclipse.papyrus.emf.facet.efacet.core.internal.exception.UnmatchingExpectedTypeException;

-import org.eclipse.papyrus.emf.facet.efacet.core.internal.exported.IResolverManager;

-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement;

-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;

-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;

-import org.eclipse.papyrus.emf.facet.util.core.Logger;

-import org.eclipse.papyrus.emf.facet.util.core.internal.exported.ListUtils;

-import org.eclipse.papyrus.emf.facet.util.emf.core.ModelUtils;

-

-/**

- * @author oremaud

- *

- *         FacetManager Context

- *

- *         Defines which FacetSets will be taken into account, and in which

- *         order ('front' FacetSets have higher precedence)

- *

- *         Responsible of overrides resolution for Facets and Customs

- */

-class FacetManagerContext implements List<FacetSet> {

-

-	private static final String SILENT_OPTION = "org.eclipse.papyrus.emf.facet.efacet.core.internal.FacetManagerContext.getOverrideCandidateFeatures.silent"; //$NON-NLS-1$

-	private static final boolean SILENT = Boolean

-			.getBoolean(FacetManagerContext.SILENT_OPTION);

-

-	// We cannot use the interface (i.e, List) instead because we need to use

-	// the methods addLast and addFirst

-	private LinkedList<FacetSet> managedFacetSets = new LinkedList<FacetSet>(); // NOPMD by gdupe on 15/03/12 10:36

-	private final transient FacetManager manager;

-	/**

-	 * This field is used to avoid to have to many error messages in the log.

-	 */

-	private final Set<ETypedElement> failingFeatures = new HashSet<ETypedElement>();

-

-	private final Set<IFacetManagerListener> listeners = new HashSet<IFacetManagerListener>();

-

-	public FacetManagerContext(final FacetManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 *

-	 * @param baseFeature

-	 * @param eObject

-	 * @return

-	 * @throws FacetConformanceEvaluationException

-	 * @throws UnmatchingExpectedTypeException

-	 * @throws FacetManagerException

-	 */

-	public <T extends ETypedElement> T resolveOverrides(final T baseFeature,

-			final EObject eObject) throws FacetManagerException {

-		T result = baseFeature;

-		if (baseFeature instanceof DerivedTypedElement) {

-			final DerivedTypedElement derivedResult = resolveOverrides(

-					(DerivedTypedElement) baseFeature, eObject);

-			if (derivedResult != null

-					&& !(derivedResult instanceof ETypedElement)) {

-				throw new UnmatchingExpectedTypeException(

-						"Type mismatch in override resolution '" + baseFeature.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$

-			}

-			result = (T) derivedResult;

-		}

-		// If nothing is found, return the original basefeature

-		if (result == null) {

-			result = baseFeature;

-		}

-		return result;

-	}

-

-	/**

-	 *

-	 * @param baseFeature

-	 * @param eObject

-	 * @return

-	 * @throws FacetConformanceEvaluationException

-	 * @throws FacetManagerException

-	 */

-	public <T extends DerivedTypedElement> T resolveOverrides(

-			final T baseFeature, final EObject eObject)

-			throws FacetManagerException {

-		try {

-			// -- Find master override

-			// If the baseFeature overrides another feature, then we follow the

-			// override chain to find the top feature

-			// The main idea behind this is that the baseFeature does not really

-			// represents a specific feature but a

-			// feature signature (as in java method invocation)

-			final T signatureFeature = FacetUtils

-					.getTopOverrideFeature(baseFeature);

-

-			// -- Find all candidates

-			// Get all Facet referenced by the FacetManager to get all features

-			// matching this signature

-			// Note : candidates are searched ine the order provided by the current

-			// FacetManager,

-			// so they are already ordered by the wanted priority

-			// XXX : Debug check that DerivedTypedElement only contained by Facet

-			final List<T> orderedCandidates = getOverrideCandidateFeatures(eObject,

-					signatureFeature);

-

-			// -- Find the most specific feature

-			return findMostSpecificFeature(orderedCandidates);

-		} catch (Exception e) {

-			throw new FacetManagerException(e);

-		}

-	}

-

-	public List<FacetSet> getManagedFacetSets() {

-		return Collections.unmodifiableList(this.managedFacetSets);

-	}

-

-	public void setManagedFacetSets(final List<FacetSet> facetSets) {

-		this.managedFacetSets = new LinkedList<FacetSet>(facetSets);

-		notifyListeners();

-	}

-

-	public void addBackManagedFacetSet(final FacetSet facetSet) {

-		// adding an already managed FacetSet again moves it to the right position

-		this.managedFacetSets.remove(facetSet);

-		this.managedFacetSets.addLast(facetSet);

-		notifyListeners();

-	}

-

-	public void addFrontManagedFacetSet(final FacetSet facetSet) {

-		if (this.managedFacetSets == null) {

-			this.managedFacetSets = new LinkedList<FacetSet>();

-		}

-		// adding an already managed FacetSet again moves it to the right position

-		this.managedFacetSets.remove(facetSet);

-		this.managedFacetSets.addFirst(facetSet);

-		notifyListeners();

-	}

-

-	/**

-	 * Find the most specific feature in the candidates list. The most specific

-	 * is the feature that : - is the most specific (in terms of Facet

-	 * inheritance) : the lowest in the inheritance tree (per branch) - is

-	 * encountered first. The order is given by the FacetManager context.

-	 *

-	 * @param candidates

-	 *            The list of candidates features. Can be empty.

-	 * @return

-	 */

-	private static <T extends DerivedTypedElement> T findMostSpecificFeature(

-			final List<T> orderedCandidates) {

-		T result = null;

-		if (!orderedCandidates.isEmpty()) {

-			final Iterator<T> candidatesIt = orderedCandidates.iterator();

-			result = candidatesIt.next();

-			// We have the highest priority feature, we just have to check

-			// that there is no more specific one in the override chain (from

-			// top to bottom)

-			while (candidatesIt.hasNext()) {

-				final T candidate = candidatesIt.next();

-				if (isOverridenBy(candidate, result)) {

-					result = candidate;

-				}

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * Find matching candidates.

-	 *

-	 * @param eObject

-	 * @param baseFeature

-	 * @return A list of candidates, in the right order for conflict resolution

-	 * @throws FacetManagerException

-	 */

-	private <T extends DerivedTypedElement> List<T> getOverrideCandidateFeatures(

-			final EObject eObject, final T baseFeature)

-			throws FacetManagerException {

-		final ResourceSet baserFeatureRS = baseFeature.eResource().getResourceSet();

-		final List<T> result = new LinkedList<T>();

-		// Iterate over all Facets from all facetSets to find conforming

-		// features

-		final List<FacetSet> managedFSets = getManagedFacetSets();

-		final List<FacetSet> allFacetSets = new ArrayList<FacetSet>(managedFSets);

-		// add aggregated FacetSets

-		for (FacetSet facetSet : managedFSets) {

-			// FIXME Should handle recursive containment.

-			for (FacetSet subFacetSet : facetSet.getFacetSets()) {

-				final FacetSet resolvedFacetSet = IResolverManager.DEFAULT

-						.resolve(subFacetSet, FacetSet.class);

-				allFacetSets.add(resolvedFacetSet);

-			}

-		}

-		for (FacetSet facetSet : allFacetSets) {

-			final Resource resource = facetSet.eResource();

-			if (resource == null) {

-				final String message = String.format("The facetSet %s (%s) is not stored in a resource.", //$NON-NLS-1$

-						facetSet.getName(), facetSet.getNsURI());

-				Logger.logWarning(message, Activator.getDefault());

-			} else {

-				final ResourceSet facetSetRS = resource.getResourceSet();

-				if (!facetSetRS.equals(baserFeatureRS)) {

-					Logger.logWarning("The facet manager is dealing with more than one resource set.", //$NON-NLS-1$

-							Activator.getDefault());

-				}

-			}

-			for (Facet facet : FacetUtils.getFacets(facetSet)) {

-				final T matchingFeature = getMatchingFeature(eObject, facet,

-						baseFeature);

-				if (matchingFeature != null) {

-					result.add(matchingFeature);

-				}

-			}

-		}

-		if (result.isEmpty()) {

-			if (!this.failingFeatures.contains(baseFeature)

-					&& !FacetManagerContext.SILENT) {

-				Logger.logWarning(

-						"The result of " //$NON-NLS-1$

-								+ this.getClass().getSimpleName()

-								+ ".getOverrideCandidateFeatures(...) is empty! baseFeature=" //$NON-NLS-1$

-								+ EcoreUtil.getURI(baseFeature)

-								+ " (This message will be sent only once)", //$NON-NLS-1$

-						Activator.getDefault());

-				// This avoid to have to many error messages in the log.

-				this.failingFeatures.add(baseFeature);

-			}

-			result.add(baseFeature);

-		}

-		return result;

-	}

-

-	/**

-	 * Test whether a feature is overridden by another (directly or not)

-	 *

-	 * @param targetParent

-	 * @param child

-	 * @return true if child is directly or indirectly overridden by parent,

-	 *         false otherwise

-	 */

-	private static boolean isOverridenBy(final DerivedTypedElement child,

-			final DerivedTypedElement targetParent) {

-

-		boolean result = false;

-		if (child.equals(targetParent)) {

-			result = true;

-		} else {

-			DerivedTypedElement currentParent = child.getOverride();

-			while (!result && currentParent != null) {

-				if (currentParent.equals(targetParent)) {

-					result = true;

-				} else {

-					currentParent = currentParent.getOverride();

-				}

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * Find DerivedTypedElement features that matches the 'signature'

-	 *

-	 * @param eObject

-	 *            EObject used to test conformance

-	 * @param facet

-	 * @param signatureFeature

-	 *            reference feature that serves as 'signature'

-	 * @throws FacetManagerException

-	 */

-	private <T extends DerivedTypedElement> T getMatchingFeature(

-			final EObject eObject, final Facet facet, final T signatureFeature)

-			throws FacetManagerException {

-		T result = null;

-		EList<? extends ETypedElement> eTypedElements;

-		if (signatureFeature instanceof EOperation) {

-			eTypedElements = facet.getFacetOperations();

-		} else {

-			eTypedElements = facet.getFacetElements();

-		}

-		// For each eTypedElement check is it override the signature feature and

-		// if the eTypedElement is owned by a facet to which the eObject

-		// conforms.

-		for (ETypedElement feature : eTypedElements) {

-			if (isMatchingFeature2(signatureFeature, feature)) {

-				// The conformance check is done after the check on the override

-				// to avoid infinite recursion.

-				final ConformanceState conformanceState = this.manager

-						.getConformanceState(eObject, facet);

-				if (conformanceState == ConformanceState.Conformant) {

-					if (!signatureFeature.getClass().isInstance(feature)) {

-						throw new FacetManagerException(

-								ModelUtils.getQualifiedName(feature)

-										+ " overrides " //$NON-NLS-1$

-										+ ModelUtils

-												.getQualifiedName(signatureFeature)

-										+ " but both are not of the same kind."); //$NON-NLS-1$

-					}

-					@SuppressWarnings("unchecked")

-					// @SuppressWarnings("unchecked") check by

-					// "if (!signatureFeature.getClass().isInstance(feature))"

-					final T tmpFeature = (T) feature;

-					result = tmpFeature;

-					break;

-					// Two features from the same Facet cannot

-					// override a feature, so only one can be find

-					// in this Facet => stop search here.

-				}

-			}

-		}

-		return result;

-	}

-

-	private static <T extends DerivedTypedElement> boolean isMatchingFeature2(

-			final T signatureFeature, final ETypedElement feature)

-			throws FacetManagerException {

-		boolean result = false;

-		// We're focusing on DerivedTypedElements

-		// ECore native features could not be overridden by Facets

-		// (EMF facet is supposed to be non intrusive)

-

-		if (signatureFeature.getClass().isInstance(feature)) {

-			final T element = (T) feature;

-			// Just check that the top override is the same as the base feature

-			// i.e. that the current feature matches the 'signature'

-			final DerivedTypedElement topFeature = FacetUtils

-					.getTopOverrideFeature(element);

-			if (topFeature == signatureFeature) {

-				// found a match

-				result = true;

-			} else {

-				final Resource topResource = topFeature.eResource();

-				final Resource signatureResource = signatureFeature.eResource();

-				if (topResource == null || signatureResource == null || topFeature.eResource().getResourceSet() != signatureFeature.eResource().getResourceSet()) {

-					Logger.logWarning("topOverrideFeature.eResource().getResourceSet() != signatureFeature.eResource().getResourceSet()", //$NON-NLS-1$

-							Activator.getDefault());

-				}

-			}

-		}

-		return result;

-	}

-

-	public void removeFacetSet(final FacetSet facetSet) {

-		final boolean removed = this.managedFacetSets.remove(facetSet);

-		if (removed) {

-			notifyListeners();

-		}

-	}

-

-	public void clear() {

-		final boolean empty = this.managedFacetSets.isEmpty();

-		if (!empty) {

-			this.managedFacetSets.clear();

-			notifyListeners();

-		}

-	}

-

-	public int size() {

-		return this.managedFacetSets.size();

-	}

-

-	public boolean isEmpty() {

-		return this.managedFacetSets.isEmpty();

-	}

-

-	public boolean contains(final Object object) {

-		return this.managedFacetSets.contains(object);

-	}

-

-	public Iterator<FacetSet> iterator() {

-		return this.managedFacetSets.iterator();

-	}

-

-	public Object[] toArray() {

-		return this.managedFacetSets.toArray();

-	}

-

-	public <T> T[] toArray(final T[] array) {

-		return this.managedFacetSets.toArray(array);

-	}

-

-	public boolean add(final FacetSet object) {

-		boolean result = false;

-		this.managedFacetSets.remove(object);

-		if (object != null) {

-			result = this.managedFacetSets.add(object);

-		}

-		if (result) {

-			notifyListeners();

-		}

-		return result;

-	}

-

-	public boolean remove(final Object object) {

-		final boolean isRemoved = this.managedFacetSets.remove(object);

-		if (isRemoved) {

-			notifyListeners();

-		}

-		return isRemoved;

-	}

-

-	public boolean containsAll(final Collection<?> collection) {

-		return this.managedFacetSets.containsAll(collection);

-	}

-

-	public boolean addAll(final Collection<? extends FacetSet> collection) {

-		boolean result = false;

-		for (FacetSet facetSet : collection) {

-			this.managedFacetSets.remove(facetSet);

-			if (facetSet != null) {

-				final boolean addResult = this.managedFacetSets.add(facetSet);

-				result = result || addResult;

-			}

-		}

-		if (result) {

-			notifyListeners();

-		}

-		return result;

-	}

-

-	public boolean addAll(final int index,

-			final Collection<? extends FacetSet> collection) {

-		final List<FacetSet> filtered = new ArrayList<FacetSet>();

-		for (FacetSet facetSet : collection) {

-			if (!filtered.contains(facetSet)) {

-				filtered.add(facetSet);

-			}

-		}

-		this.managedFacetSets.removeAll(filtered);

-		final boolean isAdded = this.managedFacetSets.addAll(index,

-				ListUtils.cleanList(filtered));

-		if (isAdded) {

-			notifyListeners();

-		}

-		return isAdded;

-	}

-

-	public boolean removeAll(final Collection<?> collection) {

-		final boolean isRemoved = this.managedFacetSets.removeAll(collection);

-		if (isRemoved) {

-			notifyListeners();

-		}

-		return isRemoved;

-	}

-

-	public boolean retainAll(final Collection<?> collection) {

-		final boolean isRetained = this.managedFacetSets.retainAll(collection);

-		if (isRetained) {

-			notifyListeners();

-		}

-		return isRetained;

-	}

-

-	public FacetSet get(final int index) {

-		return this.managedFacetSets.get(index);

-	}

-

-	public FacetSet set(final int index, final FacetSet element) {

-		final FacetSet oldElement = this.managedFacetSets.set(index, element);

-		if (!oldElement.equals(element)) {

-			notifyListeners();

-		}

-		return oldElement;

-	}

-

-	public void add(final int index, final FacetSet element) {

-		this.managedFacetSets.remove(element);

-		if (element != null) {

-			this.managedFacetSets.add(index, element);

-			notifyListeners();

-		}

-	}

-

-	public FacetSet remove(final int index) {

-		final FacetSet oldElement = this.managedFacetSets.remove(index);

-		notifyListeners();

-		return oldElement;

-	}

-

-	public int indexOf(final Object object) {

-		return this.managedFacetSets.indexOf(object);

-	}

-

-	public int lastIndexOf(final Object object) {

-		return this.managedFacetSets.lastIndexOf(object);

-	}

-

-	public ListIterator<FacetSet> listIterator() {

-		return this.managedFacetSets.listIterator();

-	}

-

-	public ListIterator<FacetSet> listIterator(final int index) {

-		return this.managedFacetSets.listIterator(index);

-	}

-

-	public List<FacetSet> subList(final int fromIndex, final int toIndex) {

-		return this.subList(fromIndex, toIndex);

-	}

-

-	public void addListener(final IFacetManagerListener listener) {

-		this.listeners.add(listener);

-	}

-

-	public void removeListener(final IFacetManagerListener listener) {

-		this.listeners.remove(listener);

-	}

-

-	private void notifyListeners() {

-		for (IFacetManagerListener listener : this.listeners) {

-			listener.facetManagerChanged();

-		}

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2011, 2014 Mia-Software, 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:
+ *     Olivier Remaud (Soft-Maint) - Bug 361794 - [Restructuring] EMF Facet customization meta-model
+ *     Gregoire Dupe (Mia-Software) - Bug 364325 - [Restructuring] The user must be able to navigate into a model using the Facet.
+ *     Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] EMF Facet customization meta-model
+ *     Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
+ *     Gregoire Dupe (Mia-Software) - Bug 375087 - [Table] ITableWidget.addColumn(List<ETypedElement>, List<FacetSet>)
+ *     Gregoire Dupe (Mia-Software) - Bug 372626 - Aggregates
+ *     Gregoire Dupe (Mia-Software) - Bug 377178 - [EFacet] infinite recursion in override resolution
+ *     Gregoire Dupe (Mia-software) - Bug 383418 - [Table] FacetManagerContext.getOverrideCandidateFeatures(...) is empty
+ *     Gregoire Dupe (Mia-software) - Bug 420093 - [EFacet] The facetManger list doesn't deal with uniqueness
+ *     Thomas Cicognani (Soft-Maint) - Bug 420193 - Listener on FacetManager
+ *     Fabien Treguer (Soft-Maint) - Bug 423285 - [Table] FacetSets not stored in a resource cause model manager crashes
+ *     Christian W. Damus (CEA) - Bug 441857 - [Performances - Model Explorer] Severe performance problems for larger models
+ *******************************************************************************/
+
+package org.eclipse.papyrus.emf.facet.efacet.core.internal;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Set;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.BasicEList;
+import org.eclipse.emf.common.util.ECollections;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.ETypedElement;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.emf.facet.efacet.core.FacetUtils;
+import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManagerListener;
+import org.eclipse.papyrus.emf.facet.efacet.core.exception.FacetManagerException;
+import org.eclipse.papyrus.emf.facet.efacet.core.internal.FacetManager.ConformanceState;
+import org.eclipse.papyrus.emf.facet.efacet.core.internal.exception.FacetConformanceEvaluationException;
+import org.eclipse.papyrus.emf.facet.efacet.core.internal.exception.UnmatchingExpectedTypeException;
+import org.eclipse.papyrus.emf.facet.efacet.core.internal.exported.IResolverManager;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;
+import org.eclipse.papyrus.emf.facet.util.core.Logger;
+import org.eclipse.papyrus.emf.facet.util.core.internal.exported.ListUtils;
+import org.eclipse.papyrus.emf.facet.util.emf.core.ModelUtils;
+
+/**
+ * @author oremaud
+ *
+ *         FacetManager Context
+ *
+ *         Defines which FacetSets will be taken into account, and in which
+ *         order ('front' FacetSets have higher precedence)
+ *
+ *         Responsible of overrides resolution for Facets and Customs
+ */
+class FacetManagerContext implements List<FacetSet> {
+
+	private static final String SILENT_OPTION = "org.eclipse.papyrus.emf.facet.efacet.core.internal.FacetManagerContext.getOverrideCandidateFeatures.silent"; //$NON-NLS-1$
+	private static final boolean SILENT = Boolean
+			.getBoolean(FacetManagerContext.SILENT_OPTION);
+
+	// We cannot use the interface (i.e, List) instead because we need to use
+	// the methods addLast and addFirst
+	private final EList<FacetSet> managedFacetSets = new BasicEList<FacetSet>() {
+		private static final long serialVersionUID = 1L;
+
+		@Override
+		protected void didRemove(int index, FacetSet oldObject) {
+			unconfigure(oldObject);
+		}
+
+		@Override
+		protected void didAdd(int index, FacetSet newObject) {
+			configure(newObject);
+		}
+
+		@Override
+		protected void didSet(int index, FacetSet newObject, FacetSet oldObject) {
+			unconfigure(oldObject);
+			configure(newObject);
+		}
+
+		@Override
+		protected void didChange() {
+			facetsUpdated();
+		}
+	};
+	private final transient FacetManager manager;
+
+	private transient Adapter facetAdapter; // Facets aren't serializable so no need for transient, but be consistent with the manager
+	transient long facetGeneration; // Likewise
+	private transient boolean updateEnabled = true;
+
+	/**
+	 * This field is used to avoid to have to many error messages in the log.
+	 */
+	private final Set<ETypedElement> failingFeatures = new HashSet<ETypedElement>();
+
+	private final Set<IFacetManagerListener> listeners = new HashSet<IFacetManagerListener>();
+
+	public FacetManagerContext(final FacetManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 *
+	 * @param baseFeature
+	 * @param eObject
+	 * @return
+	 * @throws FacetConformanceEvaluationException
+	 * @throws UnmatchingExpectedTypeException
+	 * @throws FacetManagerException
+	 */
+	public <T extends ETypedElement> T resolveOverrides(final T baseFeature,
+			final EObject eObject) throws FacetManagerException {
+		T result = baseFeature;
+		if (baseFeature instanceof DerivedTypedElement) {
+			final DerivedTypedElement derivedResult = resolveOverrides(
+					(DerivedTypedElement) baseFeature, eObject);
+			if (derivedResult != null
+					&& !(derivedResult instanceof ETypedElement)) {
+				throw new UnmatchingExpectedTypeException(
+						"Type mismatch in override resolution '" + baseFeature.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			result = (T) derivedResult;
+		}
+		// If nothing is found, return the original basefeature
+		if (result == null) {
+			result = baseFeature;
+		}
+		return result;
+	}
+
+	/**
+	 *
+	 * @param baseFeature
+	 * @param eObject
+	 * @return
+	 * @throws FacetConformanceEvaluationException
+	 * @throws FacetManagerException
+	 */
+	public <T extends DerivedTypedElement> T resolveOverrides(
+			final T baseFeature, final EObject eObject)
+			throws FacetManagerException {
+
+		final FacetCache cache = FacetCache.getInstance(eObject, this);
+		T result = cache.resolve(baseFeature);
+
+		if (result == null) {
+			try {
+				// -- Find master override
+				// If the baseFeature overrides another feature, then we follow the
+				// override chain to find the top feature
+				// The main idea behind this is that the baseFeature does not really
+				// represents a specific feature but a
+				// feature signature (as in java method invocation)
+				final T signatureFeature = FacetUtils
+						.getTopOverrideFeature(baseFeature);
+
+				// -- Find all candidates
+				// Get all Facet referenced by the FacetManager to get all features
+				// matching this signature
+				// Note : candidates are searched ine the order provided by the current
+				// FacetManager,
+				// so they are already ordered by the wanted priority
+				// XXX : Debug check that DerivedTypedElement only contained by Facet
+				final List<T> orderedCandidates = getOverrideCandidateFeatures(eObject,
+						signatureFeature);
+
+				// -- Find the most specific feature
+				result = findMostSpecificFeature(orderedCandidates);
+
+				cache.add(baseFeature, result);
+			} catch (Exception e) {
+				throw new FacetManagerException(e);
+			}
+		}
+
+		return result;
+	}
+
+	public List<FacetSet> getManagedFacetSets() {
+		return Collections.unmodifiableList(this.managedFacetSets);
+	}
+
+	public void setManagedFacetSets(final List<FacetSet> facetSets) {
+		// Don't increment the generation and notify listeners multiple times in this composite operation
+		final boolean enableUpdate = updateEnabled;
+		updateEnabled = false;
+		try {
+			ECollections.setEList(this.managedFacetSets, facetSets);
+		} finally {
+			updateEnabled = enableUpdate;
+		}
+
+		facetsUpdated();
+	}
+
+	public void addBackManagedFacetSet(final FacetSet facetSet) {
+		add(facetSet);
+	}
+
+	public void addFrontManagedFacetSet(final FacetSet facetSet) {
+		add(0, facetSet);
+	}
+
+	/**
+	 * Find the most specific feature in the candidates list. The most specific
+	 * is the feature that : - is the most specific (in terms of Facet
+	 * inheritance) : the lowest in the inheritance tree (per branch) - is
+	 * encountered first. The order is given by the FacetManager context.
+	 *
+	 * @param candidates
+	 *            The list of candidates features. Can be empty.
+	 * @return
+	 */
+	private static <T extends DerivedTypedElement> T findMostSpecificFeature(
+			final List<T> orderedCandidates) {
+		T result = null;
+		if (!orderedCandidates.isEmpty()) {
+			final Iterator<T> candidatesIt = orderedCandidates.iterator();
+			result = candidatesIt.next();
+			// We have the highest priority feature, we just have to check
+			// that there is no more specific one in the override chain (from
+			// top to bottom)
+			while (candidatesIt.hasNext()) {
+				final T candidate = candidatesIt.next();
+				if (isOverridenBy(candidate, result)) {
+					result = candidate;
+				}
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Find matching candidates.
+	 *
+	 * @param eObject
+	 * @param baseFeature
+	 * @return A list of candidates, in the right order for conflict resolution
+	 * @throws FacetManagerException
+	 */
+	private <T extends DerivedTypedElement> List<T> getOverrideCandidateFeatures(
+			final EObject eObject, final T baseFeature)
+			throws FacetManagerException {
+		final ResourceSet baserFeatureRS = baseFeature.eResource().getResourceSet();
+		final List<T> result = new LinkedList<T>();
+		// Iterate over all Facets from all facetSets to find conforming
+		// features
+		final List<FacetSet> managedFSets = getManagedFacetSets();
+		final List<FacetSet> allFacetSets = new ArrayList<FacetSet>(managedFSets);
+		// add aggregated FacetSets
+		for (FacetSet facetSet : managedFSets) {
+			// FIXME Should handle recursive containment.
+			for (FacetSet subFacetSet : facetSet.getFacetSets()) {
+				final FacetSet resolvedFacetSet = IResolverManager.DEFAULT
+						.resolve(subFacetSet, FacetSet.class);
+				allFacetSets.add(resolvedFacetSet);
+			}
+		}
+		for (FacetSet facetSet : allFacetSets) {
+			final Resource resource = facetSet.eResource();
+			if (resource == null) {
+				final String message = String.format("The facetSet %s (%s) is not stored in a resource.", //$NON-NLS-1$
+						facetSet.getName(), facetSet.getNsURI());
+				Logger.logWarning(message, Activator.getDefault());
+			} else {
+				final ResourceSet facetSetRS = resource.getResourceSet();
+				if (!facetSetRS.equals(baserFeatureRS)) {
+					Logger.logWarning("The facet manager is dealing with more than one resource set.", //$NON-NLS-1$
+							Activator.getDefault());
+				}
+			}
+			for (Facet facet : FacetUtils.getFacets(facetSet)) {
+				final T matchingFeature = getMatchingFeature(eObject, facet,
+						baseFeature);
+				if (matchingFeature != null) {
+					result.add(matchingFeature);
+				}
+			}
+		}
+		if (result.isEmpty()) {
+			if (!this.failingFeatures.contains(baseFeature)
+					&& !FacetManagerContext.SILENT) {
+				Logger.logWarning(
+						"The result of " //$NON-NLS-1$
+								+ this.getClass().getSimpleName()
+								+ ".getOverrideCandidateFeatures(...) is empty! baseFeature=" //$NON-NLS-1$
+								+ EcoreUtil.getURI(baseFeature)
+								+ " (This message will be sent only once)", //$NON-NLS-1$
+						Activator.getDefault());
+				// This avoid to have to many error messages in the log.
+				this.failingFeatures.add(baseFeature);
+			}
+			result.add(baseFeature);
+		}
+		return result;
+	}
+
+	/**
+	 * Test whether a feature is overridden by another (directly or not)
+	 *
+	 * @param targetParent
+	 * @param child
+	 * @return true if child is directly or indirectly overridden by parent,
+	 *         false otherwise
+	 */
+	private static boolean isOverridenBy(final DerivedTypedElement child,
+			final DerivedTypedElement targetParent) {
+
+		boolean result = false;
+		if (child.equals(targetParent)) {
+			result = true;
+		} else {
+			DerivedTypedElement currentParent = child.getOverride();
+			while (!result && currentParent != null) {
+				if (currentParent.equals(targetParent)) {
+					result = true;
+				} else {
+					currentParent = currentParent.getOverride();
+				}
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Find DerivedTypedElement features that matches the 'signature'
+	 *
+	 * @param eObject
+	 *            EObject used to test conformance
+	 * @param facet
+	 * @param signatureFeature
+	 *            reference feature that serves as 'signature'
+	 * @throws FacetManagerException
+	 */
+	private <T extends DerivedTypedElement> T getMatchingFeature(
+			final EObject eObject, final Facet facet, final T signatureFeature)
+			throws FacetManagerException {
+		T result = null;
+		EList<? extends ETypedElement> eTypedElements;
+		if (signatureFeature instanceof EOperation) {
+			eTypedElements = facet.getFacetOperations();
+		} else {
+			eTypedElements = facet.getFacetElements();
+		}
+		// For each eTypedElement check is it override the signature feature and
+		// if the eTypedElement is owned by a facet to which the eObject
+		// conforms.
+		for (ETypedElement feature : eTypedElements) {
+			if (isMatchingFeature2(signatureFeature, feature)) {
+				// The conformance check is done after the check on the override
+				// to avoid infinite recursion.
+				final ConformanceState conformanceState = this.manager
+						.getConformanceState(eObject, facet);
+				if (conformanceState == ConformanceState.Conformant) {
+					if (!signatureFeature.getClass().isInstance(feature)) {
+						throw new FacetManagerException(
+								ModelUtils.getQualifiedName(feature)
+										+ " overrides " //$NON-NLS-1$
+										+ ModelUtils
+												.getQualifiedName(signatureFeature)
+										+ " but both are not of the same kind."); //$NON-NLS-1$
+					}
+					@SuppressWarnings("unchecked")
+					// @SuppressWarnings("unchecked") check by
+					// "if (!signatureFeature.getClass().isInstance(feature))"
+					final T tmpFeature = (T) feature;
+					result = tmpFeature;
+					break;
+					// Two features from the same Facet cannot
+					// override a feature, so only one can be find
+					// in this Facet => stop search here.
+				}
+			}
+		}
+		return result;
+	}
+
+	private static <T extends DerivedTypedElement> boolean isMatchingFeature2(
+			final T signatureFeature, final ETypedElement feature)
+			throws FacetManagerException {
+		boolean result = false;
+		// We're focusing on DerivedTypedElements
+		// ECore native features could not be overridden by Facets
+		// (EMF facet is supposed to be non intrusive)
+
+		if (signatureFeature.getClass().isInstance(feature)) {
+			final T element = (T) feature;
+			// Just check that the top override is the same as the base feature
+			// i.e. that the current feature matches the 'signature'
+			final DerivedTypedElement topFeature = FacetUtils
+					.getTopOverrideFeature(element);
+			if (topFeature == signatureFeature) {
+				// found a match
+				result = true;
+			} else {
+				final Resource topResource = topFeature.eResource();
+				final Resource signatureResource = signatureFeature.eResource();
+				if (topResource == null || signatureResource == null || topFeature.eResource().getResourceSet() != signatureFeature.eResource().getResourceSet()) {
+					Logger.logWarning("topOverrideFeature.eResource().getResourceSet() != signatureFeature.eResource().getResourceSet()", //$NON-NLS-1$
+							Activator.getDefault());
+				}
+			}
+		}
+		return result;
+	}
+
+	public void removeFacetSet(final FacetSet facetSet) {
+		this.managedFacetSets.remove(facetSet);
+	}
+
+	public void clear() {
+		this.managedFacetSets.clear();
+	}
+
+	public int size() {
+		return this.managedFacetSets.size();
+	}
+
+	public boolean isEmpty() {
+		return this.managedFacetSets.isEmpty();
+	}
+
+	public boolean contains(final Object object) {
+		return this.managedFacetSets.contains(object);
+	}
+
+	public Iterator<FacetSet> iterator() {
+		return this.managedFacetSets.iterator();
+	}
+
+	public Object[] toArray() {
+		return this.managedFacetSets.toArray();
+	}
+
+	public <T> T[] toArray(final T[] array) {
+		return this.managedFacetSets.toArray(array);
+	}
+
+	public boolean add(final FacetSet object) {
+		boolean result = false;
+
+		if (object != null) {
+			// adding an already managed FacetSet again moves it to the last position
+			int existing = managedFacetSets.indexOf(object);
+			int last = size() - 1;
+			if (existing >= 0) {
+				if (existing != last) {
+					managedFacetSets.move(last, existing);
+					result = true;
+				}
+			} else {
+				result = managedFacetSets.add(object);
+			}
+		}
+
+		return result;
+	}
+
+	public boolean remove(final Object object) {
+		return this.managedFacetSets.remove(object);
+	}
+
+	public boolean containsAll(final Collection<?> collection) {
+		return this.managedFacetSets.containsAll(collection);
+	}
+
+	public boolean addAll(final Collection<? extends FacetSet> collection) {
+		// Don't increment the generation and notify listeners multiple times in this composite operation
+		final boolean result;
+		final boolean enableUpdate = updateEnabled;
+		updateEnabled = false;
+		try {
+			final boolean removed = this.managedFacetSets.removeAll(collection);
+			final boolean added = this.managedFacetSets.addAll(collection);
+			result = removed || added;
+		} finally {
+			updateEnabled = enableUpdate;
+		}
+
+		if (result) {
+			facetsUpdated();
+		}
+
+		return result;
+	}
+
+	public boolean addAll(final int index, final Collection<? extends FacetSet> collection) {
+		final List<FacetSet> filtered = new ArrayList<FacetSet>();
+		for (FacetSet facetSet : collection) {
+			if (!filtered.contains(facetSet)) {
+				filtered.add(facetSet);
+			}
+		}
+
+		// Don't increment the generation and notify listeners multiple times in this composite operation
+		final boolean result;
+		final boolean enableUpdate = updateEnabled;
+		updateEnabled = false;
+		try {
+			final boolean removed = this.managedFacetSets.removeAll(filtered);
+			final boolean added = this.managedFacetSets.addAll(index, ListUtils.cleanList(filtered));
+			result = removed || added;
+		} finally {
+			updateEnabled = enableUpdate;
+		}
+
+		if (result) {
+			facetsUpdated();
+		}
+
+		return result;
+	}
+
+	public boolean removeAll(final Collection<?> collection) {
+		return this.managedFacetSets.removeAll(collection);
+	}
+
+	public boolean retainAll(final Collection<?> collection) {
+		return this.managedFacetSets.retainAll(collection);
+	}
+
+	public FacetSet get(final int index) {
+		return this.managedFacetSets.get(index);
+	}
+
+	public FacetSet set(final int index, final FacetSet element) {
+		return this.managedFacetSets.set(index, element);
+	}
+
+	public void add(final int index, final FacetSet element) {
+		if (element != null) {
+			int existing = managedFacetSets.indexOf(element);
+			if (existing >= 0) {
+				if (existing != index) {
+					managedFacetSets.move(index, existing);
+				}
+			} else {
+				managedFacetSets.add(index, element);
+			}
+		}
+	}
+
+	public FacetSet remove(final int index) {
+		return this.managedFacetSets.remove(index);
+	}
+
+	public int indexOf(final Object object) {
+		return this.managedFacetSets.indexOf(object);
+	}
+
+	public int lastIndexOf(final Object object) {
+		return this.managedFacetSets.lastIndexOf(object);
+	}
+
+	public ListIterator<FacetSet> listIterator() {
+		return this.managedFacetSets.listIterator();
+	}
+
+	public ListIterator<FacetSet> listIterator(final int index) {
+		return this.managedFacetSets.listIterator(index);
+	}
+
+	public List<FacetSet> subList(final int fromIndex, final int toIndex) {
+		return this.subList(fromIndex, toIndex);
+	}
+
+	public void addListener(final IFacetManagerListener listener) {
+		this.listeners.add(listener);
+	}
+
+	public void removeListener(final IFacetManagerListener listener) {
+		this.listeners.remove(listener);
+	}
+
+	private void notifyListeners() {
+		for (IFacetManagerListener listener : this.listeners) {
+			listener.facetManagerChanged();
+		}
+	}
+
+	private void facetsUpdated() {
+		if (updateEnabled) {
+			incrementGeneration();
+			notifyListeners();
+		}
+	}
+
+	private void incrementGeneration() {
+		facetGeneration++;
+	}
+
+	private FacetSet configure(FacetSet facetSet) {
+		if ((facetSet != null) && !facetSet.eAdapters().contains(getFacetSetAdapter())) {
+			facetSet.eAdapters().add(getFacetSetAdapter());
+		}
+		return facetSet;
+	}
+
+	private <T> T unconfigure(T facetSet) {
+		if (facetSet instanceof FacetSet) {
+			((FacetSet) facetSet).eAdapters().remove(getFacetSetAdapter());
+		}
+		return facetSet;
+	}
+
+	private Adapter getFacetSetAdapter() {
+		if (facetAdapter == null) {
+			facetAdapter = new EContentAdapter() {
+				@Override
+				protected void selfAdapt(Notification notification) {
+					if (!notification.isTouch()) {
+						incrementGeneration();
+					}
+
+					super.selfAdapt(notification);
+				}
+			};
+		}
+
+		return facetAdapter;
+	}
+}
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/META-INF/MANIFEST.MF
index 1ebfa3950b0..b9a8e1651f1 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore.edit,

- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.emf.facet.efacet.provider

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.provider.Efacet

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/pom.xml
index 1cefe2317fc..026c7da807d 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.efacet.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/META-INF/MANIFEST.MF
index 5cc96bffcbc..7028a626ab0 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/META-INF/MANIFEST.MF
@@ -3,16 +3,16 @@ Export-Package: org.eclipse.papyrus.emf.facet.efacet.presentation;x-in
  ternal:=true

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.core.resources,

- org.eclipse.papyrus.emf.facet.efacet.edit;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.emf.facet.efacet.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.ecore.xmi,

  org.eclipse.emf.edit.ui,

  org.eclipse.ui.ide,

- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.1.0",

  org.eclipse.emf.ecore.edit;bundle-version="2.6.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/pom.xml
index 422c43d92ad..8ec27512bcb 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.efacet.editor</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/META-INF/MANIFEST.MF
index f1adcce5591..be5583e2a12 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/META-INF/MANIFEST.MF
@@ -8,11 +8,11 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit,

  org.eclipse.emf.ecore,

  org.eclipse.emf.ecore.edit,

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/pom.xml
index a3ac74ccecd..346505c3390 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.efacet.metamodel.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF
index 07614d43449..b7d6b57269f 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF
@@ -19,11 +19,11 @@ Export-Package: org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet,
  org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog.util

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore,

- org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.metamodel;si

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/pom.xml
index fd482409230..a395f366da3 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.efacet.metamodel</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/META-INF/MANIFEST.MF
index 335ad81540d..805ac7378ef 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/META-INF/MANIFEST.MF
@@ -13,19 +13,19 @@ Export-Package: org.eclipse.papyrus.emf.facet.efacet.sdk.ui.dialog,
  org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.query

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

  org.eclipse.core.expressions;bundle-version="3.4.200",

  org.eclipse.emf.edit;bundle-version="2.6.0",

  org.eclipse.core.resources;bundle-version="3.6.0",

- org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.6.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/pom.xml
index 79b6cccf9b8..89bab8830c5 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.efacet.sdk.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/META-INF/MANIFEST.MF
index a28b6ced48b..a45ba6d25c5 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/META-INF/MANIFEST.MF
@@ -9,25 +9,25 @@ Export-Package: org.eclipse.papyrus.emf.facet.efacet.ui,
  org.eclipse.papyrus.emf.facet.efacet.ui.internal.wizards;x-friends:="org.eclipse.papyrus.emf.facet.query.java.ui"

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.ui.ide,

- org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.1.0",

  org.eclipse.emf.edit.ui;bundle-version="2.6.0",

  org.eclipse.emf.ecore.edit;bundle-version="2.6.0",

- org.eclipse.papyrus.emf.facet.widgets.celleditors;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.widgets.celleditors;bundle-version="1.1.0",

  org.eclipse.core.expressions,

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.1.0",

  org.eclipse.ui,

  org.eclipse.core.resources;bundle-version="3.6.0",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.ui.internal.Act

  ivator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/pom.xml
index 447d4054873..7a4a9358f26 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.efacet.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/META-INF/MANIFEST.MF
index f1caa2fdcdf..30814f057e3 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.plugin.Activato

  r

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/pom.xml
index a390de7d786..52ec9adec3b 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.efacet</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/META-INF/MANIFEST.MF
index 06368e5efa8..222a0806831 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
 Manifest-Version: 1.0

 Export-Package: org.eclipse.papyrus.emf.facet.query.java.core,

  org.eclipse.papyrus.emf.facet.query.java.core.internal.exceptions

-Require-Bundle: org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.0.1";visibility:=reexport,

+Require-Bundle: org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.emf.facet.query.java;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.query.java.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.query.java;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.query.java.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

  org.eclipse.emf.ecore;bundle-version="2.6.0",

- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.query.java.core.intern

  al.plugin.Activator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/pom.xml
index 79360baa5b4..600a1482602 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.query.java.core</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/META-INF/MANIFEST.MF
index 92c679ec608..54b5db41ab8 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore,

- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.emf.facet.query.java.metamodel.v0_

  2_0.javaquery

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.query.java.metamodel.i

  nternal.Activator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/pom.xml
index 2b142eeb021..47fe9afabf2 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.query.java.metamodel</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/META-INF/MANIFEST.MF
index f989942d152..67d4400f9fb 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.emf.facet.efacet.sdk.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.query.java.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.efacet.sdk.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.query.java.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.6.0",

  org.eclipse.emf.ecore;bundle-version="2.6.0",

  org.eclipse.emf.common.ui;bundle-version="2.6.0",

@@ -15,11 +15,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.codegen.ecore;bundle-version="2.6.0",

  org.eclipse.emf.edit;bundle-version="2.6.0",

  org.eclipse.jdt.ui;bundle-version="3.6.0",

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.query.java.sdk.ui.inte

  rnal.Activator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/pom.xml
index f890076718b..daeaac45ad7 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.query.java.sdk.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/META-INF/MANIFEST.MF
index 8770c5e799c..d8687a3a4bd 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore,

- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.emf.facet.query.java.javaquery,

  org.eclipse.papyrus.emf.facet.query.java.javaquery.util;x-friends:="org.eclipse.papyrus.emf.facet.query.java.edit"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.java;singleto

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/pom.xml
index 2cdbbc165a8..51477f46a08 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.query.java</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/META-INF/MANIFEST.MF
index 6a930318305..b61d435b01c 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/META-INF/MANIFEST.MF
@@ -4,14 +4,14 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf;bundle-version="2.6.0",

  org.eclipse.ocl;bundle-version="3.0.0",

  org.eclipse.ocl.ecore;bundle-version="3.0.0",

- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.query.ocl.metamodel;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.query.ocl.metamodel;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.query.ocl.core.interna

  l.Activator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/pom.xml
index 9d716753965..87ae49756e3 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.query.ocl.core</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/META-INF/MANIFEST.MF
index 2d6e70310d5..2e635d91265 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1";visibility:=reexport

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0";visibility:=reexport

 Export-Package: org.eclipse.papyrus.emf.facet.query.ocl.metamodel.oclquery,

  org.eclipse.papyrus.emf.facet.query.ocl.metamodel.oclquery.impl,

  org.eclipse.papyrus.emf.facet.query.ocl.metamodel.oclquery.util

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/pom.xml
index d262f757e94..44949c74711 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.query.ocl.metamodel</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/META-INF/MANIFEST.MF
index a08e7a50451..2fc251b5077 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/META-INF/MANIFEST.MF
@@ -4,18 +4,18 @@ Export-Package: org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui.dialog,
  org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui.widget.oclexpression

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet.sdk.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet.sdk.ui;bundle-version="1.1.0",

  org.eclipse.emf.ecore;bundle-version="2.6.0",

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.query.ocl.metamodel;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.query.ocl.metamodel;bundle-version="1.1.0",

  org.eclipse.emf.edit;bundle-version="2.6.0",

- org.eclipse.papyrus.emf.facet.query.ocl.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.query.ocl.core;bundle-version="1.1.0",

  org.eclipse.ocl.ecore;bundle-version="3.0.0",

- org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui.inter

  nal.Activator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/pom.xml
index 01b18fa63d0..6408f66aeb2 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/META-INF/MANIFEST.MF
index 5abb3b7e1df..ae26c9be9c2 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.core.runtime,
  com.ibm.icu;bundle-version="4.2.1"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.util.core.internal.Act

  ivator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/pom.xml
index 7024cb368b6..b67ccace110 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.util.core</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/META-INF/MANIFEST.MF
index 625063208ad..1062a560c53 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.util.emf.catalog.plugi

  n.Activator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/pom.xml
index b1eb18b7ac4..a7400e319cb 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.util.emf.catalog</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/META-INF/MANIFEST.MF
index f36c1137ef6..b789526c4c0 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/META-INF/MANIFEST.MF
@@ -18,15 +18,15 @@ Export-Package: org.eclipse.papyrus.emf.facet.util.emf.core,
  org.eclipse.papyrus.emf.facet.util.emf.core.serialization.model.serialization.impl;x-internal:=true

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;bundle-version="2.2.0",

- org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.papyrus.emf.facet.common.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.emf.facet.common.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.6.0",

  org.eclipse.emf.edit;bundle-version="2.6.0",

- org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.util.emf.core.internal

  .Activator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/pom.xml
index e8bbe64b3e5..ec60f5eced5 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.util.emf.core</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/META-INF/MANIFEST.MF
index 0c749e5b51b..6fb1742acd8 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/META-INF/MANIFEST.MF
@@ -17,17 +17,17 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.common;bundle-version="2.6.0",

  org.eclipse.emf.ecore;bundle-version="2.6.0",

  org.eclipse.ui.ide;bundle-version="3.6.0",

- org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.1.0",

  org.eclipse.emf.edit;bundle-version="2.6.0",

  org.eclipse.emf.edit.ui;bundle-version="2.6.0",

- org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.swt;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.swt;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.util.emf.ui.internal.A

  ctivator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/pom.xml
index 8dcd5a5d4f5..56954a057de 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.util.emf.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF
index c0e7367a066..6ff9a0f9b09 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF
@@ -3,11 +3,11 @@ Export-Package: org.eclipse.papyrus.emf.facet.util.jface.ui.imageprovi
  der

 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",

  org.eclipse.jface;bundle-version="3.6.0",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.swt;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.swt;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.util.jface.ui.internal

  .Activator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/pom.xml
index d82916a07a4..aab504b5e52 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.util.jface.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/META-INF/MANIFEST.MF
index 290488bc9c4..3681add75ed 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/META-INF/MANIFEST.MF
@@ -4,12 +4,12 @@ Export-Package: org.eclipse.papyrus.emf.facet.util.pde.core.internal.exported,
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",

  org.eclipse.pde.core;bundle-version="3.6.0",

  org.eclipse.core.resources;bundle-version="3.6.0",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

  org.eclipse.jdt.core;bundle-version="3.6.0",

  com.ibm.icu;bundle-version="4.2.1"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: EMF Facet PDE Core Utils

 Bundle-Activator: org.eclipse.papyrus.emf.facet.util.pde.core.internal

  .Activator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/pom.xml
index 7607778d306..00f9d5bdee5 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.util.pde.core</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/META-INF/MANIFEST.MF
index 8a6d088b01e..479549ae012 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/META-INF/MANIFEST.MF
@@ -6,10 +6,10 @@ Export-Package: org.eclipse.papyrus.emf.facet.util.swt.colorprovider,
 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.swt;bundle-version="3.6.0",

  org.eclipse.ui;bundle-version="3.6.0",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.util.swt.internal.Acti

  vator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/pom.xml
index 71f57d4a309..8c10157f092 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.util.swt</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/META-INF/MANIFEST.MF
index 05748b6bfff..e904e2584e8 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/META-INF/MANIFEST.MF
@@ -25,14 +25,14 @@ Export-Package: org.eclipse.papyrus.emf.facet.util.ui.internal.exported.composit
  org.eclipse.papyrus.emf.facet.util.ui.utils

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.swt;bundle-version="3.6.0",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.6.0",

  org.eclipse.ui.workbench;bundle-version="3.6.0",

  org.eclipse.jface;bundle-version="3.6.0",

  org.eclipse.emf.edit;bundle-version="2.6.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.util.ui.internal.Activ

  ator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/pom.xml
index f49e0ad1545..b8f155f9077 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.util.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/META-INF/MANIFEST.MF
index 2f6c64336f4..5f53a586655 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/META-INF/MANIFEST.MF
@@ -4,12 +4,12 @@ Export-Package: org.eclipse.papyrus.emf.facet.widgets.celleditors.ecor
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.emf.ecore;bundle-version="2.6.0",

- org.eclipse.papyrus.emf.facet.widgets.celleditors;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.widgets.celleditors;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.widgets.celleditors.ec

  ore.Activator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/pom.xml
index f82ae56bce5..f268f15c9c9 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/META-INF/MANIFEST.MF
index fb6ecc4041b..f2f18e72b94 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/META-INF/MANIFEST.MF
@@ -13,22 +13,22 @@ Export-Package: org.eclipse.papyrus.emf.facet.widgets.celleditors,
 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore,

  org.eclipse.swt;bundle-version="3.6.0",

- org.eclipse.papyrus.emf.facet.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.widgets;bundle-version="1.1.0",

  org.eclipse.jface;bundle-version="3.6.0",

  org.eclipse.ui.workbench;bundle-version="3.6.0",

  org.eclipse.emf.edit;bundle-version="2.6.0",

  org.eclipse.ui.ide;bundle-version="3.6.0",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.6.0",

- org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.swt;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.swt;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.emf.facet.widgets.celleditors.in

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/pom.xml
index 4fc8cb0371f..4663ae078a0 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.widgets.celleditors</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/META-INF/MANIFEST.MF
index d24a7840fd2..06b1188f793 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/META-INF/MANIFEST.MF
@@ -7,12 +7,12 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.ecore;bundle-version="2.6.0",

  org.eclipse.emf.edit;bundle-version="2.6.0",

  org.eclipse.emf.edit.ui;bundle-version="2.6.0",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.widgets.internal.Activ

  ator

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/pom.xml
index 195ded55eb1..db53e32156a 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.widgets</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF
index 34cbfb4b598..f2cdeaba36a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.core.runtime
 Export-Package: org.eclipse.papyrus.infra.core.log

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/pom.xml
index 99ae410818e..cb1f00cb87d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.core.log</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/META-INF/MANIFEST.MF
index 0850501b94f..be0c47cafea 100755
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.infra.core.pluginexplorer

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.infra.core.pluginexplorer.Activa

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/pom.xml
index 8cdcd0cb28d..37a52d95a12 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.core.pluginexplorer</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF
index 83be7beca41..7b6ef39246c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF
@@ -13,15 +13,15 @@ Bundle-Localization: plugin
 Bundle-Name: %pluginName

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Require-Bundle: org.eclipse.swt;bundle-version="3.5.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.ui;bundle-version="3.6.0",

  org.eclipse.core.runtime;bundle-version="3.6.0",

  org.eclipse.emf.ecore,

  org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.infra.core.sasheditor.di.content

  provider.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/pom.xml
index c70eab59d5c..2576448147b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.core.sasheditor.di</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF
index 183a2d3e82b..0ac4cc11d37 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF
@@ -15,14 +15,14 @@ Bundle-Name: %pluginName
 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Require-Bundle: org.eclipse.ui,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.core.runtime;bundle-version="3.7.0",

  org.eclipse.e4.core.contexts;bundle-version="1.0.0";resolution:=optional,

  org.eclipse.e4.ui.model.workbench;bundle-version="0.10.0";resolution:=optional,

  org.eclipse.core.expressions;bundle-version="3.4.300",

  org.eclipse.gef;bundle-version="3.8.1"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.infra.core.sasheditor.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor;singlet

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/pom.xml
index 62747d3b51c..b8fe9ef0167 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.core.sasheditor</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java
index 36d1a1ee39b..fe23da79153 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java
@@ -23,6 +23,7 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IEditorSite;

+import org.eclipse.ui.IWorkbenchPartConstants;

 import org.eclipse.ui.PartInitException;

 import org.eclipse.ui.internal.util.Util;

 import org.eclipse.ui.part.EditorPart;

@@ -47,6 +48,33 @@ public abstract class AbstractMultiPageSashEditor extends EditorPart implements
 	 * Synchronizer in charge of synchronizing tab names with IEditorPart title.

 	 */

 	private SashTabDecorationSynchronizer tabsSynchronizer;

+	

+	/**

+	 * Listener on editor internal pages.

+	 * Used to relay the firePropertyChange() event.

+	 */

+	private IPageLifeCycleEventsListener2 pageLifeCycleEventListener = new DefaultPageLifeCycleEventListener() {

+		

+		public void pageFirePropertyChange(IPage page, int propertyId) {

+			// relay the event.

+			firePropertyChange(propertyId);

+		};

+		

+		/**

+		 * 	Calling getActiveEditor().getEditorInput() will return a different value since the

+		 * active editor has now changed.  Notify the Eclipse Platform listeners by firing an

+		 * appropriate notification.

+		 * 

+		 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.DefaultPageLifeCycleEventListener#pageChanged(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)

+		 *

+		 * @param newPage

+		 */

+		public void pageActivated(IPage newPage) {

+			firePropertyChange(IWorkbenchPartConstants.PROP_INPUT);

+		};

+		

+

+	};

 

 	/**

 	 * Listener on double click events from {@link ISashWindowsContainer}'tabs.

@@ -150,6 +178,11 @@ public abstract class AbstractMultiPageSashEditor extends EditorPart implements
 		tabMouseEventListener = new TabMouseEventListener(sashContainer, getSite());

 

 		tabsSynchronizer = new SashTabDecorationSynchronizer(sashContainer);

+		

+		// Listen on page life cycle to relay property change events

+		// we don't need to remove the handler from sashContainer on dispose, because sashContainer

+		// is disposed itself.

+		sashContainer.addPageLifeCycleListener(pageLifeCycleEventListener);

 	}

 

 	/**

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/DefaultPageLifeCycleEventListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/DefaultPageLifeCycleEventListener.java
new file mode 100644
index 00000000000..020fc71e29c
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/DefaultPageLifeCycleEventListener.java
@@ -0,0 +1,93 @@
+/*****************************************************************************

+ * Copyright (c) 2014 Cedric Dumoulin.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+

+package org.eclipse.papyrus.infra.core.sasheditor.editor;

+

+

+/**

+ * Default implementation for {@link IPageLifeCycleEventsListener2}. This implementation do nothing.

+ * It can be subclassed to overload desired method.

+ * 

+ * 

+ * @author cedric dumoulin

+ *

+ */

+public class DefaultPageLifeCycleEventListener implements IPageLifeCycleEventsListener2 {

+

+	/**

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener#pageOpened(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)

+	 *

+	 * @param page

+	 */

+	public void pageOpened(IPage page) {

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener#pageClosed(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)

+	 *

+	 * @param page

+	 */

+	public void pageClosed(IPage page) {

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener#pageActivated(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)

+	 *

+	 * @param page

+	 */

+	public void pageActivated(IPage page) {

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener#pageDeactivated(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)

+	 *

+	 * @param page

+	 */

+	public void pageDeactivated(IPage page) {

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener#pageAboutToBeOpened(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)

+	 *

+	 * @param page

+	 */

+	public void pageAboutToBeOpened(IPage page) {

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener#pageAboutToBeClosed(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)

+	 *

+	 * @param page

+	 */

+	public void pageAboutToBeClosed(IPage page) {

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageChangedListener#pageChanged(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)

+	 *

+	 * @param newPage

+	 */

+	public void pageChanged(IPage newPage) {

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener2#pageFirePropertyChange(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage, int)

+	 *

+	 * @param page

+	 * @param propertyId

+	 */

+	public void pageFirePropertyChange(IPage page, int propertyId) {

+	}

+

+}

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageLifeCycleEventsListener2.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageLifeCycleEventsListener2.java
new file mode 100644
index 00000000000..37d0727454a
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageLifeCycleEventsListener2.java
@@ -0,0 +1,35 @@
+/*****************************************************************************

+ * Copyright (c) 2014 Cedric Dumoulin.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+

+package org.eclipse.papyrus.infra.core.sasheditor.editor;

+

+/**

+ * Propagate more events from the {@link IPage} lifecycle.

+ * 

+ * @author cedric dumoulin

+ *

+ */

+public interface IPageLifeCycleEventsListener2 extends IPageLifeCycleEventsListener {

+

+	/**

+	 * The specified {@link IPage} has received a firePropertyChange event. Relay it.

+	 * 

+	 * @param page

+	 *        The page firing the event.

+	 * @param propertyId

+	 * 		  The ID of the page property that has changed

+	 */

+	public void pageFirePropertyChange(IPage page, int propertyId);

+

+}

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java
index fda6a5e3413..e431710afc2 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/EditorPart.java
@@ -376,7 +376,10 @@ public class EditorPart extends PagePart implements IEditorPage {
 	 *            the id of the property that changed

 	 */

 	private void handlePropertyChange(int propertyId) {

+		// cedric : old fashion, deprecated ?

 		getSashWindowContainer().firePropertyChange(propertyId);

+		// relay the event to the page lifecycle event notifier

+		getSashWindowContainer().getLifeCycleEventProvider().firePageFirePropertyChangeEvent(this,  propertyId);

 	}

 

 	/**

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerEventsProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerEventsProvider.java
index 42dfcf752df..2490914e761 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerEventsProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerEventsProvider.java
@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import java.util.List;

 

 import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener;

+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener2;

 

 

 /**

@@ -117,4 +118,19 @@ public class SashContainerEventsProvider {
 		}

 	}

 

+	/**

+	 * Notify all listener with event.

+	 * @param page The page that has receive the event.

+	 * @param propertyId the propertyId received by the page

+	 */

+	public void firePageFirePropertyChangeEvent(PagePart page, int propertyId) {

+		// Fire events to internal listeners

+		for(IPageLifeCycleEventsListener listener : listeners) {

+			if( listener instanceof IPageLifeCycleEventsListener2 ) {

+				((IPageLifeCycleEventsListener2)listener).pageFirePropertyChange(page, propertyId);

+			}

+			

+		}

+	}

+

 }

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
index 7ff603bd0fe..9a5b3b0f80e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
@@ -19,24 +19,24 @@ Export-Package: org.eclipse.papyrus.infra.core,
  org.eclipse.papyrus.infra.core.resource.sasheditor,

  org.eclipse.papyrus.infra.core.services,

  org.eclipse.papyrus.infra.core.utils

-Require-Bundle: org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.0.1";visibility:=reexport,

+Require-Bundle: org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.core.runtime,

  org.eclipse.ui.ide;bundle-version="3.8.0",

  org.eclipse.emf.edit.ui;bundle-version="2.8.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.8.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",

  org.eclipse.gef;bundle-version="3.8.1",

  org.eclipse.emf.ecore.xmi;bundle-version="2.8.0",

  org.eclipse.emf.workspace;bundle-version="1.5.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0",

  org.eclipse.core.filesystem

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.infra.core.Activator

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml
index 2f52f445cd2..cdbf785810b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.core</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java
index fb3f6a1edbc..3ef7414db4c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java
@@ -689,7 +689,7 @@ public class ModelSet extends ResourceSetImpl {
 	 * Create models that are not already created or loaded.
 	 */
 	public void createMissingModels() throws ModelException {
-		throw new UnsupportedOperationException("Not yet implemented");
+		throw new UnsupportedOperationException("Not yet implemented"); // TODO
 
 	}
 
@@ -697,7 +697,7 @@ public class ModelSet extends ResourceSetImpl {
 	 * Load models that are not already created or loaded.
 	 */
 	public void loadMissingModels() throws ModelException {
-		throw new UnsupportedOperationException("Not yet implemented");
+		throw new UnsupportedOperationException("Not yet implemented"); // TODO
 
 	}
 
diff --git a/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/META-INF/MANIFEST.MF b/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/META-INF/MANIFEST.MF
index 3b8865b7e6a..5d922cace85 100644
--- a/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.serviceregistry;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.infra.core.serviceregistry;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.edit;visibility:=reexport,

  org.eclipse.uml2.common.edit;visibility:=reexport

 Export-Package: org.eclipse.papyrus.infra.core.serviceregistry.servicedescriptors.provider,

@@ -8,7 +8,7 @@ Export-Package: org.eclipse.papyrus.infra.core.serviceregistry.servicedescriptor
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.core.serviceregistry.servi

diff --git a/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/META-INF/MANIFEST.MF b/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/META-INF/MANIFEST.MF
index ea86de1b4be..f193bc85ea5 100644
--- a/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.core.resources,

- org.eclipse.papyrus.infra.core.serviceregistry.edit;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.infra.core.serviceregistry.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport,

  org.eclipse.emf.edit.ui,

  org.eclipse.ui.ide

@@ -10,7 +10,7 @@ Export-Package: org.eclipse.papyrus.infra.core.serviceregistry.service
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.core.serviceregistry.servi

diff --git a/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.tests/META-INF/MANIFEST.MF b/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.tests/META-INF/MANIFEST.MF
index 248d45fc57d..07d934d3c90 100644
--- a/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.tests/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.tests/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.emf.ecore.xmi,
- org.junit;bundle-version="4.10.0"
-Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.papyrus.infra.core.serviceregistry;bundle-v
- ersion="0.10.0"
-Bundle-Version: 1.0.1.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.core.serviceregistry.te
- sts;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.emf.ecore.xmi,

+ org.junit;bundle-version="4.10.0"

+Bundle-Vendor: %providerName

+Fragment-Host: org.eclipse.papyrus.infra.core.serviceregistry;bundle-v

+ ersion="0.10.0"

+Bundle-Version: 1.1.0.qualifier

+Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.infra.core.serviceregistry.te

+ sts;singleton:=true

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

+

diff --git a/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/META-INF/MANIFEST.MF b/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/META-INF/MANIFEST.MF
index 6cdd205cd28..5315b6ebfca 100644
--- a/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/META-INF/MANIFEST.MF
@@ -8,12 +8,12 @@ Export-Package: org.eclipse.papyrus.infra.core.serviceregistry,
  org.eclipse.papyrus.infra.core.serviceregistry.servicedescriptorswithid.util

 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.junit,

  org.eclipse.emf.common,

  org.eclipse.emf.ecore

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.core.serviceregistry.Activ

diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/META-INF/MANIFEST.MF b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/META-INF/MANIFEST.MF
index 4c9cc8eddf5..c3178310b95 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/META-INF/MANIFEST.MF
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/META-INF/MANIFEST.MF
@@ -3,10 +3,10 @@ Export-Package: org.eclipse.papyrus.infra.discovery.ui.menu,
  org.eclipse.papyrus.infra.discovery.ui.menu.handler

 Require-Bundle: org.eclipse.ui;bundle-version="3.8.0",

  org.eclipse.core.runtime;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.discovery.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.discovery.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.discovery.ui.menu.Activato

diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/pom.xml b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/pom.xml
index 23018ee04dd..014ab1f4b2e 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/pom.xml
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.discovery.ui.menu</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/META-INF/MANIFEST.MF b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/META-INF/MANIFEST.MF
index da2d7d4bd2a..0da50bd4ddb 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/META-INF/MANIFEST.MF
@@ -14,15 +14,15 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit.ui;visibility:=reexport,

  org.eclipse.ui,

  org.eclipse.ui.forms,

- org.eclipse.papyrus.infra.discovery;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.discovery;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.discovery.ui,

  org.eclipse.papyrus.infra.discovery.ui.viewer,

  org.eclipse.papyrus.infra.discovery.ui.wizards

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.discovery.ui.Activator

diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/pom.xml b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/pom.xml
index 68bfc3ef7de..8f5a339ac66 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/pom.xml
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.discovery.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/META-INF/MANIFEST.MF b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/META-INF/MANIFEST.MF
index 6fd3e3c8108..0bcafed8a77 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/META-INF/MANIFEST.MF
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Export-Package: org.eclipse.papyrus.infra.discovery,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.discovery.Activator$Implem

diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/pom.xml b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/pom.xml
index b9d69c4d1ec..c6cc2b116b7 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/pom.xml
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.discovery</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF
index bbe35730c5c..495200bf342 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF
@@ -7,11 +7,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

  org.eclipse.emf.ecore;bundle-version="2.8.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.infra.emf.appearance.Activator

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/pom.xml
index cb4ccebe5a3..787a7487130 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.emf.appearance</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF
index f81e98c9a11..1d8abd75de7 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
 Manifest-Version: 1.0

 Export-Package: org.eclipse.papyrus.infra.emf.diagram.common,

  org.eclipse.papyrus.infra.emf.diagram.common.handler

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.eclipse.core.commands;bundle-version="3.6.1",

  org.eclipse.ui,

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.infra.emf.diagram.common.Activat

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/pom.xml
index b763d490429..8bcb23561d2 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.emf.diagram.common</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/META-INF/MANIFEST.MF
index bdfaf5f3ce6..03ea0139cbc 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/META-INF/MANIFEST.MF
@@ -7,20 +7,20 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.ecore.editor;bundle-version="2.7.0",

  org.eclipse.core.resources;bundle-version="3.7.100",

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",

- org.eclipse.papyrus.infra.emf.newchild;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf.newchild;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Eclipse-BuddyPolicy: dependent

 Bundle-Name: Papyrus EMF Editor

 Bundle-Activator: org.eclipse.papyrus.infra.emf.editor.Activator

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.embeddededitor/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.embeddededitor/META-INF/MANIFEST.MF
index 6119a293ff6..207493a8773 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.embeddededitor/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.embeddededitor/META-INF/MANIFEST.MF
@@ -10,21 +10,21 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.edit;bundle-version="2.7.0",

  org.eclipse.emf.ecore.editor;bundle-version="2.7.0",

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.emf.facet.infra.browser.custom;bundle-version="0.1.0",

  org.eclipse.emf.facet.infra.browser.custom.core;bundle-version="0.1.0",

  org.eclipse.emf.facet.infra.browser;bundle-version="0.1.0",

  org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.newchild;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.newchild;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: EML Editor

 Bundle-Activator: org.eclipse.papyrus.infra.emf.embeddededitor.Activat

  or

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.facet.queries/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.facet.queries/META-INF/MANIFEST.MF
index a9f139c14d7..eb1e2cdc7be 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.facet.queries/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.facet.queries/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.infra.emf.facet.queries.Activato

  r

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/META-INF/MANIFEST.MF
index ea59ad3eddb..e742f2a59f7 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/META-INF/MANIFEST.MF
@@ -15,18 +15,18 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.uml2.uml,

  org.eclipse.ui;bundle-version="3.7.0",

  org.eclipse.emf.edit.ui;bundle-version="2.7.0",

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Eclipse-BuddyPolicy: dependent

 Bundle-Activator: org.eclipse.papyrus.infra.emf.newchild.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF
index c6466efccab..998258285fe 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Export-Package: org.eclipse.papyrus.infra.emf.readonly,

  org.eclipse.papyrus.infra.emf.readonly.handlers

-Require-Bundle: org.eclipse.papyrus.infra.onefile;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.onefile;bundle-version="1.1.0",

  org.eclipse.core.expressions;bundle-version="3.4.300",

  org.eclipse.core.resources;bundle-version="3.7.0",

  org.eclipse.core.runtime;bundle-version="3.7.0",

@@ -10,14 +10,14 @@ Require-Bundle: org.eclipse.papyrus.infra.onefile;bundle-version="1.0.1",
  org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

  org.eclipse.jface;bundle-version="3.8.0",

  org.eclipse.ui,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/pom.xml
index eb63f5cca6f..cc686640a1e 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.emf.readonly</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
index 6347ea3572c..8c7bca4dadc 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
@@ -14,29 +14,29 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

  org.eclipse.emf.ecore;bundle-version="2.7.0",

  org.eclipse.emf.edit;bundle-version="2.7.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.emf.edit.ui;bundle-version="2.8.0",

  org.eclipse.core.databinding;bundle-version="1.4.1",

  org.eclipse.core.databinding.property;bundle-version="1.4.0",

  org.eclipse.emf.databinding;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.emf.ecore.xmi,

  com.ibm.icu;bundle-version="4.4.2",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.core.expressions;bundle-version="3.4.400",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.7.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: EMF Tools

 Bundle-Activator: org.eclipse.papyrus.infra.emf.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml
index 4fd56648d33..57a24d2e8ce 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.emf</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/resource/DependencyManagementHelper.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/resource/DependencyManagementHelper.java
index 9804a314025..2bd33a691c0 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/resource/DependencyManagementHelper.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/resource/DependencyManagementHelper.java
@@ -133,11 +133,14 @@ public class DependencyManagementHelper {
 			EObject eObject = allContentsIterator.next();
 
 			for (EReference reference : eObject.eClass().getEAllReferences()) {
-				if (reference.isContainment()) {
+				if (reference.isContainer() || reference.isContainment()) {
 					continue;
 				}
 
-				if (!reference.isChangeable()) {
+				// Attempts to modify a changeable + derived feature (e.g. Class#general in UML)
+				// will rely in reverse-derivation algorithms, which may recreate some existing elements
+				// (Instead of modifying them). This can result in loss of information. Don't change derived values.
+				if (reference.isDerived() || !reference.isChangeable()) {
 					continue;
 				}
 
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF
index 0636cf0c9ad..4b871b52b4a 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF
@@ -3,26 +3,26 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.configuration.ha
  ndler

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.css.xtext;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.css.xtext;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.gmf.runtime.draw2d.ui;bundle-version="1.5.0",

  org.eclipse.draw2d;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.e4.ui.css.core;bundle-version="0.10.2",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: CSS Configuration

 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.configuration.

  Activator

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/pom.xml
index 5090d1706f7..11ef9c41f3d 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/pom.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.configuration</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF
index 2c0a9325db7..3b4ce82cfd4 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF
@@ -1,23 +1,23 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

  org.eclipse.core.databinding;bundle-version="1.4.1",

  org.eclipse.emf.ecore;bundle-version="2.9.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.e4.ui.css.core;bundle-version="0.10.2",

- org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.css.xtext;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.css.xtext;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.draw2d.ui;bundle-version="1.7.0",

  org.eclipse.draw2d;bundle-version="3.9.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: CSS Debug view

 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.debug.Activato

  r

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/pom.xml
index 3c60c521a9f..ff1ec6739cd 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/pom.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../../releng/top-pom-dev.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.debug</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF
index 5122d8f0ac8..b45bac62e71 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF
@@ -4,30 +4,30 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.properties.creation,
  org.eclipse.papyrus.infra.gmfdiag.css.properties.provider

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.emf.edit;bundle-version="2.8.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.1.0",

  org.eclipse.emf.databinding;bundle-version="1.2.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

  org.eclipse.e4.ui.css.core;bundle-version="0.10.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: CSS Properties

 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.properties.Act

  ivator

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/pom.xml
index c33ef022b4c..529a48b640f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/pom.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.properties</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/META-INF/MANIFEST.MF
index c604e461998..920d9ea3981 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="

- 1.0.1"

+ 1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Papyrus Theme

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.theme;singl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/pom.xml
index 6936c989527..ab42efdadf8 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/pom.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.theme</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/META-INF/MANIFEST.MF
index f8a6a6e429d..0811378eb15 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.ui.contentassist,
  org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr,

  org.eclipse.papyrus.infra.gmfdiag.ui.internal,

  org.eclipse.papyrus.infra.gmfdiag.ui.quickfix

-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css.xtext;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css.xtext;bundle-version="1.1.0",

  org.eclipse.xtext.ui,

  org.eclipse.ui.editors;bundle-version="3.5.0",

  org.eclipse.ui.ide;bundle-version="3.5.0",

@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css.xtext;bundle-version="1.0.
  org.eclipse.e4.ui.css.core;bundle-version="0.10.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: CSS Editor UI

 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.ui.internal.CSSAct

  ivator

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/pom.xml
index 795ea1dfc74..bac7e8281ca 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/pom.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF
index ba9483f8eda..050b4e1e858 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF
@@ -27,7 +27,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.1.0";visibility:=reexport,
  org.eclipse.core.commands;bundle-version="3.6.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: CSS Editor

 Bundle-ManifestVersion: 2

 Import-Package: org.apache.log4j,

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/pom.xml
index 5a02196370f..96259093213 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/pom.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.xtext</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
index 84911bfb682..870288bda96 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
@@ -19,30 +19,30 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

  org.eclipse.e4.ui.css.core;bundle-version="0.10.0",

  org.eclipse.emf.ecore;bundle-version="2.8.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

  org.w3c.css.sac;bundle-version="1.3.1",

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

  org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation.edit;bundle-version="1.7.0",

  org.w3c.dom.svg;bundle-version="1.1.0",

  org.eclipse.emf.edit.ui,

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.Activator

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml
index bf05ed17d73..4a84ebd388d 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF
index a9825af13aa..243d86b3d5d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.emf.ecore;bundle-version="2.10.0",

  org.eclipse.ui;bundle-version="3.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.extensionpoints.editors,

  org.eclipse.papyrus.extensionpoints.editors.configuration,

  org.eclipse.papyrus.extensionpoints.editors.definition,

@@ -15,7 +15,7 @@ Export-Package: org.eclipse.papyrus.extensionpoints.editors,
  org.eclipse.papyrus.extensionpoints.editors.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.extensionpoints.editors.Activato

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/pom.xml
index a89e2bd23b5..13e1c812b02 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.extensionpoints.editors</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF
index b9d58fc9163..a37377b6dbe 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui.workbench,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.common.core,

  org.eclipse.emf.common,

  org.eclipse.gef,

@@ -8,10 +8,10 @@ Require-Bundle: org.eclipse.ui.workbench,
  org.eclipse.emf.transaction.ui;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

  org.eclipse.core.expressions;bundle-version="3.4.500",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor

 Export-Package: org.eclipse.papyrus.commands,

@@ -19,7 +19,7 @@ Export-Package: org.eclipse.papyrus.commands,
  org.eclipse.papyrus.commands.wrappers

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/pom.xml
index 76ae268dd2a..cd4440885da 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.commands</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
index 1cf6fc227d5..a13b54ef751 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
@@ -26,28 +26,28 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.common,
  org.eclipse.papyrus.infra.gmfdiag.common.utils

 Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="2.5.0",

  org.eclipse.emf.ecore.edit;bundle-version="2.5.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0";visibility:=reexport,

  org.eclipse.gef;bundle-version="3.7.1";visibility:=reexport,

  org.eclipse.emf.workspace;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0";visibility:=reexport,

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

  org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

  org.eclipse.emf.databinding;bundle-version="1.3.0",

  org.eclipse.core.databinding.property;bundle-version="1.4.200",

  org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.1",

  org.eclipse.core.expressions,

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

  org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",

  org.apache.batik.svggen;bundle-version="[1.6.0,1.7.0)",

  org.w3c.dom.svg;bundle-version="1.1.0",

@@ -56,19 +56,19 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="2.5.0",
  org.apache.batik.xml;bundle-version="[1.6.0,1.7.0)",

  org.eclipse.gmf.tooling.runtime,

  com.ibm.icu,

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.decoration;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.decoration;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0",

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.common.Activator

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml
index e93dd2626b1..9c46ad66352 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.common</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SynchronizableGmfDiagramEditor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SynchronizableGmfDiagramEditor.java
index a8f52d6220d..dd03f4261d3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SynchronizableGmfDiagramEditor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SynchronizableGmfDiagramEditor.java
@@ -149,12 +149,12 @@ public class SynchronizableGmfDiagramEditor extends DiagramDocumentEditor implem
 

 			// We may also search for a GMF View (Instead of a semantic model Element)

 			if (!clonedList.isEmpty()) {

-				for (Object element : clonedList) {

+				for (Iterator<?> iterator = clonedList.iterator(); iterator.hasNext();) {

+					Object element = iterator.next();

 					if (graphicalViewer.getEditPartRegistry().containsKey(element) && !clonedList.isEmpty()) {

-						clonedList.remove(element);

+						iterator.remove();

 						researchedEditPart = (IGraphicalEditPart) graphicalViewer.getEditPartRegistry().get(element);

 						partSelection.add(researchedEditPart);

-

 					}

 				}

 			}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/AbstractAlignLabelCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/AbstractAlignLabelCommand.java
new file mode 100644
index 00000000000..577ea2cd271
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/AbstractAlignLabelCommand.java
@@ -0,0 +1,8 @@
+package org.eclipse.papyrus.infra.gmfdiag.common.commands;

+

+import org.eclipse.gef.commands.Command;

+

+public class AbstractAlignLabelCommand extends Command {

+

+	

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/AlignLabelCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/AlignLabelCommand.java
new file mode 100644
index 00000000000..e5dfcbc67ed
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/AlignLabelCommand.java
@@ -0,0 +1,23 @@
+package org.eclipse.papyrus.infra.gmfdiag.common.commands;

+

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+

+public class AlignLabelCommand extends AbstractAlignLabelCommand {

+	

+	private Rectangle constraint;

+	

+	private PapyrusLabelEditPart label;

+	

+	@Override

+	public void execute() {

+		// TODO Auto-generated method stub

+		//super.execute();

+		

+		System.out.println("____J'execute la commande");

+	}

+	

+		

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusLabelEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusLabelEditPart.java
index d4adfd85aeb..c80c3124e77 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusLabelEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusLabelEditPart.java
@@ -1,31 +1,41 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.editpart;

-

-import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

-

-

-public abstract class PapyrusLabelEditPart extends LabelEditPart {

-

-	public PapyrusLabelEditPart(View view) {

-		super(view);

-	}

-

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-

-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Céline Janssens (ALL4TEC) celine.janssens@all4tec.net
+ *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 443235
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpart;
+
+import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.LabelAlignmentEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.LabelPrimarySelectionEditPolicy;
+
+
+
+public abstract class PapyrusLabelEditPart extends LabelEditPart {
+
+	public PapyrusLabelEditPart(View view) {
+		super(view);
+	}
+
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+
+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
+		installEditPolicy(LabelAlignmentEditPolicy.LABEL_ALIGNMENT_KEY, new LabelAlignmentEditPolicy());
+		installEditPolicy(LabelPrimarySelectionEditPolicy.LABEL_PRIMARY_SELECTION_KEY, new LabelPrimarySelectionEditPolicy());
+
+	}
+}
+
+
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/LabelAlignmentEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/LabelAlignmentEditPolicy.java
new file mode 100644
index 00000000000..481aa72e222
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/LabelAlignmentEditPolicy.java
@@ -0,0 +1,204 @@
+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

+

+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ * Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Initial API and implementation

+ *

+ *****************************************************************************/

+import java.util.Iterator;

+import java.util.List;

+

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.gef.ConnectionEditPart;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editparts.AbstractConnectionEditPart;

+import org.eclipse.gef.editpolicies.AbstractEditPolicy;

+import org.eclipse.gef.requests.AlignmentRequest;

+import org.eclipse.gef.requests.ChangeBoundsRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

+

+/**

+ * This EditPolicy provides the command for the alignment. In the case of

+ * Label.

+ */

+public class LabelAlignmentEditPolicy extends AbstractEditPolicy{

+

+	/** 

+	 * the key for the Port Alignment EditPolicy 

+	 */

+	public static final String LABEL_ALIGNMENT_KEY = "Label Alignment"; //$NON-NLS-1$

+

+

+	/** Integer corresponding to the alignment type ( p.e. Left = 1, Bottom = 32) */

+	private int alignment ;

+

+	/** Current edit Part */

+	private GraphicalEditPart label ;

+

+	/** Reference rectangle on which the Label is aligned */

+	private Rectangle refBounds;

+

+	/** Bounds of the current label */

+	private Rectangle bounds;

+

+	/**

+	 * Get Command associate to the corresponding Request

+	 * Only REQ_ALIGN request return a Command

+	 * @return Command to move the label in case of REQ_ALIGN, null if not.

+	 * @param request Request for which a command is required. 

+	 */

+	public Command getCommand(Request request) {

+		Command cmd = null;

+		if (REQ_ALIGN.equals(request.getType())){

+			 cmd = getAlignLabelCommand ((AlignmentRequest) request);

+		}

+		return cmd;

+	}

+

+	/**

+	 * Get The alignment Command for the corresponding Alignment Request.

+	 * This method transforms the alignment Request into a move request and return the move command associated to this new Request.

+	 * 

+	 * @param request Alignment Request for which the Alignment Command is returned 

+	 * @return Alignment command 

+	 */

+	private Command getAlignLabelCommand(AlignmentRequest request) {

+

+		alignment = request.getAlignment();		

+		// get the Alignment rectangle on which the selected edit part should be aligned.

+		refBounds = request.getAlignmentRectangle().getCopy();

+

+		label = (GraphicalEditPart) getHost(); 

+		bounds = getAbsolutePosition(label);

+

+		Point moveDelta = new Point(0, 0);

+

+		if (isAlignmentAllowed()){

+			switch (alignment ){

+			case PositionConstants.LEFT:

+				moveDelta.setX(refBounds.x - bounds.x );

+				break;

+			case PositionConstants.RIGHT:

+				moveDelta.setX(refBounds.getRight().x - bounds.getRight().x );

+				break;

+			case PositionConstants.TOP:

+				moveDelta.setY(refBounds.y - bounds.y );

+				break;

+			case PositionConstants.BOTTOM:

+				moveDelta.setY(refBounds.getBottom().y - bounds.getBottom().y );

+				break;

+			case PositionConstants.CENTER:

+				moveDelta.setX(refBounds.getTop().x - bounds.getTop().x );

+				break;

+			case PositionConstants.MIDDLE:

+				moveDelta.setY(refBounds.getLeft().y - bounds.getLeft().y );

+				break;

+			}

+

+

+			//build the Move request

+			ChangeBoundsRequest req = new ChangeBoundsRequest(REQ_MOVE);

+

+			req.setEditParts(((ChangeBoundsRequest)request).getEditParts());

+			req.setMoveDelta(moveDelta);

+			req.setExtendedData(request.getExtendedData());

+

+			return getHost().getCommand(req);

+

+		} 

+		else {

+			// if alignment not allowed return no command

+			return null;

+

+		}

+

+	}

+

+	/**

+	 * Determine if the current edit part can be aligned.

+	 * 

+	 * The label cannot be aligned if its connector target or source moves as well

+	 * Because if the source/target moves, the connector moves as well and the label linked to the connector translates with the Edge

+	 * Same if the Affixed node is selected. 

+	 */

+	private boolean isAlignmentAllowed() {

+		EditPart parent = label.getParent();

+		boolean isAllow = true;

+		if (parent instanceof AbstractConnectionEditPart){

+			// Label alignment is not allowed if it should moves at the same time as the connector

+			// That means if the Source or target of the connector is part of the selection

+			int sourceSelectionType = ((ConnectionEditPart)label.getParent()).getSource().getSelected();

+			int targetSelectionType = ((ConnectionEditPart)label.getParent()).getTarget().getSelected();

+

+			

+			boolean isRefDependent = isRefSibling(parent);

+			

+			if (!isRefDependent) {

+				boolean isExtremitiesSelected = (sourceSelectionType == EditPart.SELECTED)||(targetSelectionType == EditPart.SELECTED);

+				isAllow = !isExtremitiesSelected;

+			}

+			

+

+		} else if (parent instanceof AbstractBorderItemEditPart) {

+			// if the label is an affixed label and if the affixed node is part of the selection, the label is not aligned

+			isAllow =  !(parent.getSelected() == EditPart.SELECTED);

+		}

+

+		return isAllow;

+	}

+

+	/**

+	 * Define if the Label is sibling of the Reference object.

+	 * @param parent Label's Parent

+	 * @return true if the reference is a sibling of the Label

+	 */

+	private boolean isRefSibling(EditPart parent) {

+

+		boolean isRefSibling = false;

+		if (parent instanceof AbstractConnectionEditPart){

+

+			List<?> children = parent.getChildren();

+			Iterator<?> iter = children.iterator();

+

+			while(iter.hasNext() && !isRefSibling ){

+				Object child =  iter.next();

+				if (((EditPart)child).getSelected() == EditPart.SELECTED_PRIMARY){

+					isRefSibling = true;

+				}

+			}

+		}

+		return isRefSibling;

+	}

+

+	/**

+	 * 

+	 * A {@link Rectangle} with the absolute position from the {@link EditPart}

+	 * 

+	 * @param ep

+	 *        the {@link EditPart} that we want the position

+	 * @return a {@link Rectangle} with the absolute position from the {@link EditPart}

+	 * 

+	 */

+	public static Rectangle getAbsolutePosition(EditPart ep) {

+		GraphicalEditPart part = (GraphicalEditPart)ep;

+		Rectangle rect = part.getFigure().getBounds().getCopy();

+		part.getFigure().translateToAbsolute(rect);

+		return rect;

+	}

+

+

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/LabelPrimarySelectionEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/LabelPrimarySelectionEditPolicy.java
new file mode 100644
index 00000000000..328cad7118d
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/LabelPrimarySelectionEditPolicy.java
@@ -0,0 +1,123 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *	Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.draw2d.Graphics;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.LineBorder;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy;
+import org.eclipse.gef.handles.MoveHandle;
+
+/**
+ * Edit policy for primary selection of Label.
+ *
+ * @author Gabriel Pascual
+ */
+public class LabelPrimarySelectionEditPolicy extends SelectionHandlesEditPolicy {
+
+	/** The Constant LABEL_PRIMARY_SELECTION_KEY. */
+	public static final String LABEL_PRIMARY_SELECTION_KEY = "primary_label";
+
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public LabelPrimarySelectionEditPolicy() {
+		super();
+	}
+
+	/**
+	 * Creates the selection handles.
+	 *
+	 * @return the list
+	 * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#createSelectionHandles()
+	 */
+	@Override
+	protected List<IFigure> createSelectionHandles() {
+		IFigure labelHandle = new PapyrusLabelHandle((GraphicalEditPart) getHost());
+		return Arrays.asList(labelHandle);
+	}
+
+
+	/**
+	 * The Class PapyrusLabelHandle.
+	 */
+	private class PapyrusLabelHandle extends MoveHandle {
+
+		/** The line border style. */
+		private LineBorder lineBorder;
+
+		/**
+		 * Constructor.
+		 *
+		 * @param owner
+		 *            the owner
+		 */
+		public PapyrusLabelHandle(GraphicalEditPart owner) {
+			super(owner);
+		}
+
+		/**
+		 * Initialize.
+		 *
+		 * @see org.eclipse.gef.handles.MoveHandle#initialize()
+		 */
+		@Override
+		protected void initialize() {
+			lineBorder = new LineBorder(null, 1, Graphics.LINE_DOT);
+			setOpaque(false);
+			setBorder(getStyleLine());
+		}
+
+		/**
+		 * Returns the style line for the border of the handle.
+		 * 
+		 * @return the style line of the handle
+		 */
+		protected LineBorder getStyleLine() {
+			return (isPrimary()) ? lineBorder : null;
+		}
+
+		/**
+		 * Returns <code>true</code> if the handle's owner is the primary selection.
+		 * 
+		 * @return <code>true</code> if the handles owner has primary selection.
+		 */
+		protected boolean isPrimary() {
+			return getOwner().getSelected() == EditPart.SELECTED_PRIMARY;
+		}
+
+		/**
+		 * Paint figure.
+		 *
+		 * @param graphics
+		 *            the graphics
+		 * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics)
+		 */
+		@Override
+		protected void paintFigure(Graphics graphics) {
+
+			// Change border according to selection state of owner
+			setBorder(getStyleLine());
+
+			super.paintFigure(graphics);
+		}
+
+	}
+
+}
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramEditPartsUtil.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramEditPartsUtil.java
index acb9cc8ecc0..7320fe5b90c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramEditPartsUtil.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramEditPartsUtil.java
@@ -20,8 +20,11 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPartViewer;
 import org.eclipse.gef.RootEditPart;
+import org.eclipse.gef.editparts.AbstractConnectionEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
+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.parts.DiagramGraphicalViewer;
 import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
@@ -224,4 +227,28 @@ public class DiagramEditPartsUtil {
 		}
 		return -1.0;
 	}
+	
+	/**
+	 * This Method return the Graphical container of an EditPart.
+	 * Depending on the type of EditPart, the container can be the Direct Parent or the grand parent.
+	 * @param currentEP
+	 * @return
+	 */
+	public static final EditPart getContainerEditPart(GraphicalEditPart currentEP) {
+	
+		EditPart container;
+		EditPart parent = currentEP.getParent();
+		if (parent instanceof AbstractConnectionEditPart){
+			container =  parent.getParent();
+		}else if (parent instanceof AbstractBorderItemEditPart){
+			container =  parent.getParent().getParent();
+		}else if (currentEP instanceof AbstractBorderItemEditPart){
+			container =  parent.getParent();
+		}else {
+			container = parent;
+		}
+
+		return container;
+	}
+
 }
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/META-INF/MANIFEST.MF
index 81aceaed082..0691beb14d7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/META-INF/MANIFEST.MF
@@ -5,13 +5,13 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.ecore,

  org.eclipse.gmf.runtime.common.core,

  org.eclipse.gmf.runtime.emf.commands.core,

- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: GMF-specific control mode behavior

 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.controlmode.Activa

  tor

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/pom.xml
index d999ed40965..4479104fa70 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.controlmode</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/META-INF/MANIFEST.MF
index 324b860d872..ee31404b6af 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.ui,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0"

 Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.model,

  org.eclipse.papyrus.infra.gmfdiag.css.stylesheets,

@@ -11,7 +11,7 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.model,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/pom.xml
index 223fe43c7dc..6472e1e6e44 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.model</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/META-INF/MANIFEST.MF
index 1e8cf5cae0d..1de4c42b37d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.gef;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: CSS Palette customization

 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.palette.Activa

  tor

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/pom.xml
index 30693cc1c6f..4ed1b22de55 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.palette</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF
index 0acb0a232ac..010050f2a8c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF
@@ -3,19 +3,19 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.dnd.policy,
  org.eclipse.papyrus.infra.gmfdiag.dnd.strategy

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Customizable Drag and Drop

 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.dnd.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/pom.xml
index 71513d7b743..2ad45e2d57d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.dnd</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/META-INF/MANIFEST.MF
index 89676512767..78444340412 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.gmf.runtime.common.ui.services.action,

  org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter

 Bundle-Vendor: %Bundle-Vendor

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/pom.xml
index 4a4cc5bb561..abef9b2391a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF
index 0bba7d8de77..e0d387a4106 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF
@@ -1,27 +1,27 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.hyperlink;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.hyperlink;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.navigation;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.navigation;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.gmfdiag.hyperlink,

  org.eclipse.papyrus.infra.gmfdiag.hyperlink.editpolicies,

  org.eclipse.papyrus.infra.gmfdiag.hyperlink.ui

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: GMF Diagram Hyperlink

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.hyperlink.Activato

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/pom.xml
index 320e54a93bb..6a41f4fee2f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.hyperlink</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF
index 0ca4faa89df..0349a8d1f97 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.core.expressions,

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.7.0"

 Export-Package: org.eclipse.papyrus.infra.gmfdiag.menu,

  org.eclipse.papyrus.infra.gmfdiag.menu.handlers

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.menu.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/pom.xml
index 4233a4f44be..fb8c6430588 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.menu</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
index 35f18aca71a..3a7eb6c7432 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation,

  org.eclipse.emf.transaction,

  org.eclipse.gmf.runtime.common.core,

  org.eclipse.gmf.runtime.emf.commands.core,

  org.eclipse.core.expressions,

  org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.1.0",

  org.eclipse.emf.ecore,

- org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml
index 049e51ccb2b..5b908e9a365 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.modelexplorer</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF
index e3289ed6adc..2d0a09d5aef 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

  org.eclipse.core.expressions;bundle-version="3.4.300",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

  org.eclipse.ui.navigator;bundle-version="3.5.100",

  org.eclipse.core.runtime;bundle-version="3.7.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.navigation;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.navigation;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.gmfdiag.navigation,

  org.eclipse.papyrus.infra.gmfdiag.navigation.decorator,

  org.eclipse.papyrus.infra.gmfdiag.navigation.preference

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/pom.xml
index 343f797ed99..4acdef643a7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.navigation</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF
index f05fc070a11..0b200655c0e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.infra.gmfdiag.outline,

  org.eclipse.papyrus.infra.gmfdiag.outline.internal;x-internal:=true,

  org.eclipse.papyrus.infra.gmfdiag.outline.overview

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.uml2.uml.editor;bundle-version="2.2.0",

  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.2.0",

  org.eclipse.core.runtime;bundle-version="3.7.0",

@@ -10,13 +10,13 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
  org.eclipse.gef;bundle-version="3.7.1",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.outline.internal.A

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/pom.xml
index 37d5e6d66a4..bcdba0ec0e6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.outline</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF
index 6f057949de5..3ed3ccadc4d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF
@@ -10,13 +10,13 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.preferences,
  org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor,

  org.eclipse.papyrus.infra.gmfdiag.preferences.utils

 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  com.ibm.icu,

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.preferences.Activa

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/pom.xml
index 7ce81973e89..aec5d2ce9ea 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.preferences</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
index 86ddd6ef830..72f2b564557 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
@@ -3,29 +3,29 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.properties.extension,
  org.eclipse.papyrus.infra.gmfdiag.properties.modelelement

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.4.1",

  org.eclipse.emf.edit;bundle-version="2.7.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.core.databinding;bundle-version="1.4.0",

  org.eclipse.emf.databinding;bundle-version="1.2.0",

  org.eclipse.core.databinding.property;bundle-version="1.4.0",

  org.eclipse.core.databinding.beans;bundle-version="1.2.100",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.emf.edit.ui;bundle-version="2.7.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.properties.Activat

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml
index ec5bcab2132..0286262feda 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.properties</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/META-INF/MANIFEST.MF
index 4f31c15fa64..d8d4ec3e5c2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.emf.ecore;bundle-version="2.9.0",

  org.eclipse.gmf.runtime.diagram.core;bundle-version="1.6.0",

- org.eclipse.papyrus.views.search;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.search;bundle-version="1.1.0",

  org.eclipse.search;bundle-version="3.8.100"

 Bundle-Vendor: %vendorName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.viewersearcher.Act

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/pom.xml
index 2675b28c738..16455a2f03f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.viewersearcher</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF
index 50afc9a7691..baaffe53b76 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

  org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.4.2",

  org.eclipse.core.databinding;bundle-version="1.4.0",

  org.eclipse.jface.databinding;bundle-version="1.5.0",

  org.eclipse.core.databinding.property;bundle-version="1.4.0",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1"

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.widgets.Activator

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/pom.xml
index fca9ccb18dd..6c6d5583d05 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.widgets</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
index f56404bc52c..a6453d5d65c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
@@ -8,23 +8,23 @@ Export-Package: org.eclipse.papyrus.infra.emf.nattable,
  org.eclipse.papyrus.infra.emf.nattable.validator

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",

  org.eclipse.emf.ecore;bundle-version="2.9.0",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.emf.edit,

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: EMF Nattable

 Bundle-Activator: org.eclipse.papyrus.infra.emf.nattable.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml
index ea342fd50d9..0763e58a43c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.emf.nattable</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/AbstractSynchronizedOnEStructuralFeatureAxisManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/AbstractSynchronizedOnEStructuralFeatureAxisManager.java
index 2d0b1ffd281..053f4600312 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/AbstractSynchronizedOnEStructuralFeatureAxisManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/AbstractSynchronizedOnEStructuralFeatureAxisManager.java
@@ -186,7 +186,7 @@ public abstract class AbstractSynchronizedOnEStructuralFeatureAxisManager extend
 				if (getListenFeatures().contains(msg.getFeature())) {

 					featureValueHasChanged(msg);

 				}

-			};

+			}

 		};

 

 		getTableContext().eAdapters().add(this.featureListener);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
index 511ea80bc32..0943f2269c1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
@@ -8,25 +8,25 @@ Export-Package: org.eclipse.papyrus.infra.nattable.common,
  org.eclipse.papyrus.infra.nattable.common.wizards

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

  org.eclipse.emf.edit,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.emf.transaction,

  org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.e4.ui.workbench,

  org.eclipse.e4.core.contexts,

  org.eclipse.core.expressions,

  org.eclipse.emf.edit.ui,

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.infra.nattable.common.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
index c5daa80bd24..d383f309382 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.common</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
index 90e099851b2..2d0a0386ac0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
@@ -4,20 +4,20 @@ Export-Package: org.eclipse.papyrus.infra.nattable.controlmode,
  org.eclipse.papyrus.infra.nattable.controlmode.helpers

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.commands.core,

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.infra.nattable.controlmode.Activ

  ator

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml
index d5df8a5e16a..cc462d0b1b1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.controlmode</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF
index 22fea79c5f3..ea87c0ecdc6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0

 Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Papyrus Table Documentation

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.doc

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF
index bac317205fa..f3fad375bd8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit;visibility:=reexport,

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider,

  org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider,

  org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider,

@@ -16,7 +16,7 @@ Export-Package: org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.p
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.pr

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/pom.xml
index fa1ac50b9c6..f3111facd38 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.model.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
index bf80f8a2608..2825e7edfa3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport,

  org.eclipse.emf.edit.ui;visibility:=reexport,

  org.eclipse.ui.ide;visibility:=reexport,

  org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.nattable.model.editor.customeditors,

  org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation,

  org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation,

@@ -20,7 +20,7 @@ Export-Package: org.eclipse.papyrus.infra.nattable.model.editor.customeditors,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.pr

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/pom.xml
index 40b1eae4519..439498f21c8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.model.editor</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
index ac3787d3cd1..6ca3d709d02 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
@@ -33,7 +33,7 @@ Export-Package: org.eclipse.papyrus.infra.nattable.model,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.Activator

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/pom.xml
index 03235c91313..503ab758b4b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.model</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
index c063b54aabd..213eeed5322 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
@@ -6,30 +6,30 @@ Export-Package: org.eclipse.papyrus.infra.nattable.modelexplorer,
  org.eclipse.papyrus.infra.nattable.modelexplorer.queries

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.common.core,

  org.eclipse.gmf.runtime.emf.commands.core,

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.type.core,

  org.eclipse.core.expressions,

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .,

  bin

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.infra.nattable.modelexplorer.Act

  ivator

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml
index 0b9dfeca8b7..58faf4d5b6c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.modelexplorer</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
index 63b505f4736..44cc6b0c3ff 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
@@ -3,29 +3,29 @@ Export-Package: org.eclipse.papyrus.infra.nattable.properties.constrai
  nts

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

  org.eclipse.emf.ecore,

  org.eclipse.emf.edit,

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

  org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",

  org.eclipse.emf.databinding,

  org.eclipse.core.databinding.property;bundle-version="1.4.200",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.infra.nattable.properties.Activa

  tor

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
index 93e507f7b6f..86466aeb473 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.properties</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
index fe565cf2056..8cb2a986835 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
@@ -8,26 +8,26 @@ Export-Package: org.eclipse.papyrus.infra.nattable.views.config,
  org.eclipse.papyrus.infra.nattable.views.config.utils

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

  org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",

- org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.1.0",

  org.eclipse.emf.edit,

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.emf.transaction,

  org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.infra.nattable.views.config.Acti

  vator

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml
index cb1f0df8701..6b96f75781c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.views.config</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF
index 2bad0b0a55a..e7613a07d07 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF
@@ -1,24 +1,24 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",

- org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.views.config;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.views.config;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.views.editor;s

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/pom.xml
index 4d8e3337dde..5ccce06d2aa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.views.editor</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
index 494e1f08e33..dba991415cf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
@@ -21,32 +21,32 @@ Export-Package: org.eclipse.papyrus.infra.nattable,
  org.eclipse.papyrus.infra.nattable.tester,

  org.eclipse.papyrus.infra.nattable.utils,

  org.eclipse.papyrus.infra.nattable.widget

-Require-Bundle: org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.core.runtime,

  org.eclipse.emf.transaction,

  org.eclipse.emf.ecore,

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

  org.eclipse.emf.edit,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.swt,

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

  org.eclipse.emf.edit.ui,

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",

  org.eclipse.core.expressions,

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

  org.apache.commons.lang,

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.infra.nattable.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml
index 44ef1d257a3..8c1b4001e52 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/AbstractCellManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/AbstractCellManager.java
index 97797edee73..03e4180e704 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/AbstractCellManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/AbstractCellManager.java
@@ -32,20 +32,6 @@ import org.eclipse.papyrus.infra.tools.converter.ConvertedValueContainer;
  */

 public abstract class AbstractCellManager implements ICellManager {

 

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#handles(java.lang.Object, java.lang.Object)

-	 *

-	 * @param columnElement

-	 * @param rowElement

-	 * @return

-	 */

-	@Override

-	public boolean handles(Object columnElement, Object rowElement) {

-		return false;

-	}

-

 	/**

 	 *

 	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#getValue(java.lang.Object, java.lang.Object, INattableModelManager)

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/nattableconfiguration/NattableConfigurationRegistry.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/nattableconfiguration/NattableConfigurationRegistry.java
index 7e9193cb1f1..d237c76a3fb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/nattableconfiguration/NattableConfigurationRegistry.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/nattableconfiguration/NattableConfigurationRegistry.java
@@ -144,12 +144,12 @@ public class NattableConfigurationRegistry {
 				if (myTester != null) {

 					return myTester.isAllowed(tableContext);

 				} else {

-					new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.NattableConfigurationRegistry_TesterNotFound);

+					return new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.NattableConfigurationRegistry_TesterNotFound);

 				}

 			} else if (tester == null) {

 				return new Status(IStatus.OK, Activator.PLUGIN_ID, Messages.NattableConfigurationRegistry_NoTesterForThisConfiguration);

 			} else {

-				new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.NattableConfigurationRegistry_TesterNotManager);

+				return new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.NattableConfigurationRegistry_TesterNotManager);

 			}

 		}

 		return new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.NattableConfigurationRegistry_ConfigurationNotFound);

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF
index 11a7b47fd9b..265a4462084 100644
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF
@@ -4,15 +4,15 @@ Export-Package: org.eclipse.papyrus.eclipse.project.editors.file,
  org.eclipse.papyrus.eclipse.project.editors.project

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.core.resources,

  org.eclipse.jdt.core,

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.pde.ui;bundle-version="3.6.100",

  org.eclipse.emf.ecore;bundle-version="2.10.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.eclipse.project.editors.Activato

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/pom.xml b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/pom.xml
index 3b957373721..3dbf4ab25af 100644
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.eclipse.project.editors</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF
index 126672c534e..3d5402f61a4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.edit;visibility:=reexport

 Export-Package: org.eclipse.papyrus.infra.constraints.environment.provider,

  org.eclipse.papyrus.infra.constraints.provider

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.constraints.provider.Const

diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/pom.xml
index 9842478bbcb..2621364a612 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.constraints.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF
index c0a32abad39..235bfb019d7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.core.resources,

- org.eclipse.papyrus.infra.constraints.edit;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.infra.constraints.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport,

  org.eclipse.emf.edit.ui;visibility:=reexport,

  org.eclipse.ui.ide

@@ -10,7 +10,7 @@ Export-Package: org.eclipse.papyrus.infra.constraints.environment.presentation,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.constraints.presentation.C

diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/pom.xml
index 405ea919c56..d8192df12f8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.constraints.editor</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF
index 2a3859eba0d..2616809e8e2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF
@@ -16,12 +16,12 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore,

  org.eclipse.ui;bundle-version="3.7.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Eclipse-BuddyPolicy: dependent

 Bundle-Activator: org.eclipse.papyrus.infra.constraints.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi b/plugins/infra/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi
index ad420a9045d..652e46f32b6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi
+++ b/plugins/infra/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi
@@ -1,9 +1,27 @@
 <?xml version="1.0" encoding="ASCII"?>

-<environment:ConstraintEnvironment xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:environment="http://www.eclipse.org/papyrus/constraints/environment/0.9">

-  <constraintTypes label="EMF Instance Of" constraintClass="org.eclipse.papyrus.infra.constraints.constraints.EMFInstanceOfConstraint"/>

-  <constraintTypes label="True constraint" constraintClass="org.eclipse.papyrus.infra.constraints.constraints.TrueConstraint"/>

-  <constraintTypes label="EMF Query" constraintClass="org.eclipse.papyrus.infra.constraints.constraints.EMFQueryConstraint"/>

-  <constraintTypes label="Java Instance Of" constraintClass="org.eclipse.papyrus.infra.constraints.constraints.JavaInstanceOf"/>

-  <constraintTypes label="Java Query" constraintClass="org.eclipse.papyrus.infra.constraints.constraints.JavaQueryConstraint"/>

-  <constraintTypes label="Has EAnnotation" constraintClass="org.eclipse.papyrus.infra.constraints.constraints.HasEAnnotationConstraint"/>

+<environment:ConstraintEnvironment

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:environment="http://www.eclipse.org/papyrus/constraints/environment/0.9">

+  <constraintTypes

+      label="EMF Instance Of"

+      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.EMFInstanceOfConstraint"/>

+  <constraintTypes

+      label="True constraint"

+      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.TrueConstraint"/>

+  <constraintTypes

+      label="EMF Query"

+      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.EMFQueryConstraint"/>

+  <constraintTypes

+      label="Java Instance Of"

+      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.JavaInstanceOf"/>

+  <constraintTypes

+      label="Java Query"

+      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.JavaQueryConstraint"/>

+  <constraintTypes

+      label="Has EAnnotation"

+      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.HasEAnnotationConstraint"/>

+  <constraintTypes

+      label="Attached to Resource"

+      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.AttachedToResourceConstraint"/>

 </environment:ConstraintEnvironment>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.constraints/pom.xml
index 72c0f8d5620..f7f09b64230 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.constraints/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.constraints</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/AttachedToResourceConstraint.java b/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/AttachedToResourceConstraint.java
new file mode 100644
index 00000000000..5859aac77fd
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/AttachedToResourceConstraint.java
@@ -0,0 +1,56 @@
+/*****************************************************************************
+ * 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.constraints.constraints;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+
+/**
+ * A properties view constraint that matches objects that are attached to some resource.
+ */
+public class AttachedToResourceConstraint extends AbstractConstraint {
+
+	/**
+	 * Initializes me.
+	 */
+	public AttachedToResourceConstraint() {
+		super();
+	}
+
+	@Override
+	protected boolean match(Object selection) {
+		boolean result = false;
+
+		EObject object = EMFHelper.getEObject(selection);
+
+		if (object != null) {
+			result = object.eResource() != null;
+		}
+
+		return result;
+	}
+
+	@Override
+	protected boolean equivalent(Constraint constraint) {
+		if (this == constraint) {
+			return true;
+		}
+		return constraint instanceof AttachedToResourceConstraint;
+	}
+
+	@Override
+	public String toString() {
+		return "AttachedToResourceConstraint"; //$NON-NLS-1$
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF
index 6e1cf00a05a..1b7a2d3259f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.help;bundle-version="3.6.0",
  org.eclipse.ui.intro;bundle-version="3.4.0",

  org.eclipse.pde.ui;bundle-version="3.8.0"

 Bundle-Vendor: %Bundle-Vendor

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.doc;singleton:=true

diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.doc/pom.xml
index da41cc4952e..6d4e31ab6d7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.doc/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.doc</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.export/META-INF/MANIFEST.MF
index 5cf017f2149..a192afa1789 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/META-INF/MANIFEST.MF
@@ -5,12 +5,12 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

  org.eclipse.core.expressions;bundle-version="3.4.300",

  org.eclipse.emf.common.ui;bundle-version="2.7.0",

- org.eclipse.papyrus.infra.onefile;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.onefile;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.export.internal.Activator

diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.export/pom.xml
index 498c0e146ef..f7e1115876b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.export</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/META-INF/MANIFEST.MF
index 2a9fcfaee1d..47fb6aeda8a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.edit;visibility:=reexport,

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.emf.ecore.edit;visibility:=reexport,

  org.eclipse.uml2.types;visibility:=reexport,

  org.eclipse.uml2.uml;visibility:=reexport,

  org.eclipse.uml2.uml.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.provider,

  org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider,

  org.eclipse.papyrus.infra.extendedtypes.provider

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.provider.Ext

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/pom.xml
index b30a2ecb8d8..85fbd0f3b0d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.extendedtypes.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/META-INF/MANIFEST.MF
index a91c7f3e77c..5969e49a0c0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.infra.extendedtypes.edit;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.infra.extendedtypes.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport,

  org.eclipse.emf.edit.ui;visibility:=reexport,

  org.eclipse.ui.ide;visibility:=reexport,

@@ -11,7 +11,7 @@ Export-Package: org.eclipse.papyrus.infra.extendedtypes.presentation
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.presentation

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
index 7393e5edc2d..96d097c9533 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",

  org.eclipse.emf.ecore;bundle-version="2.7.0",

  org.eclipse.emf.ecore.xmi;bundle-version="2.6.0",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",

  org.eclipse.uml2.uml,

  org.eclipse.uml2.types,

  org.eclipse.emf.edit,

  org.eclipse.emf.ecore.edit,

  org.eclipse.uml2.uml.edit,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.ui;bundle-version="3.7.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

  org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.extendedtypes.emf,

  org.eclipse.papyrus.infra.extendedtypes.emf.converter,

  org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration,

@@ -29,7 +29,7 @@ Export-Package: org.eclipse.papyrus.infra.extendedtypes.emf,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.emf.Activato

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/pom.xml
index 02c5845dae2..a2385fcc8da 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.extendedtypes.emf</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF
index 177b67d7fe5..e9de5380075 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF
@@ -6,10 +6,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.uml2.uml;bundle-version="3.2.0",

  org.eclipse.ui;bundle-version="3.7.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.common.ui.services;bundle-version="1.3.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.extendedtypes,

  org.eclipse.papyrus.infra.extendedtypes.advices,

  org.eclipse.papyrus.infra.extendedtypes.handler,

@@ -28,7 +28,7 @@ Export-Package: org.eclipse.papyrus.infra.extendedtypes,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.Activator

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/pom.xml
index dc9e65ecb9a..807278ac765 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.extendedtypes</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF
index b4e57a0b51a..0f217d68b8e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF
@@ -8,24 +8,24 @@ Export-Package: org.eclipse.papyrus.infra.hyperlink,
 Require-Bundle: org.eclipse.emf.transaction,

  org.eclipse.gef,

  org.eclipse.gmf.runtime.notation.edit,

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.eclipse.ui,

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.ui.navigator;bundle-version="3.5.200",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.core.filesystem;bundle-version="1.3.200",

- org.eclipse.papyrus.infra.services.openelement;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.openelement;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/pom.xml
index ff68726993c..61ea37e3143 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.hyperlink</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF
index d3ff470d136..8fdd3415cc1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.infra.newchild.elementcreationmenu

  model.provider

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.newchild;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.infra.newchild;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.edit;visibility:=reexport,

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.emf.ecore.edit;visibility:=reexport

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/pom.xml
index 0c71aa13619..4278dd11ff0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.newchild.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF
index c0eb6acec4a..0aba95b8603 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Export-Package: org.eclipse.papyrus.infra.newchild.elementcreationmenu
  model.presentation

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.infra.newchild.edit;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.infra.newchild.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport,

  org.eclipse.emf.edit.ui;visibility:=reexport,

  org.eclipse.ui.ide;visibility:=reexport,

@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
index 0c17726cdbe..2497b8847e3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
@@ -9,18 +9,18 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.ecore,

  org.eclipse.osgi,

  org.eclipse.emf.ecore.xmi,

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.1.0",

  org.eclipse.emf.transaction,

  org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.newchild/pom.xml
index cc4b4807df9..ae1e679db51 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.newchild</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF
index 1c9b49660ab..70514232e1a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF
@@ -1,23 +1,23 @@
 Manifest-Version: 1.0

 Export-Package: org.eclipse.papyrus.infra.onefile.model,

  org.eclipse.papyrus.infra.onefile.utils

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.ui.navigator,

  org.eclipse.ui.navigator.resources,

  org.eclipse.core.resources;bundle-version="3.7.0",

  org.eclipse.core.runtime;bundle-version="3.7.0",

  org.eclipse.ui,

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.ltk.core.refactoring;bundle-version="3.6.0",

  org.eclipse.ltk.ui.refactoring;bundle-version="3.7.0",

  org.eclipse.core.filesystem;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.core.expressions,

  org.eclipse.emf.ecore

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.onefile.Activator

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.onefile/pom.xml
index e73c40ab590..f9ee98b5df6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.onefile</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/action/PapyrusCopyFilesAndFoldersOperation.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/action/PapyrusCopyFilesAndFoldersOperation.java
index 79985ec5cad..691de191cdb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/action/PapyrusCopyFilesAndFoldersOperation.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/action/PapyrusCopyFilesAndFoldersOperation.java
@@ -15,7 +15,9 @@
 package org.eclipse.papyrus.infra.onefile.action;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -29,8 +31,11 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModelUtils;
 import org.eclipse.papyrus.infra.core.utils.DiResourceSet;
 import org.eclipse.papyrus.infra.emf.resource.DependencyManagementHelper;
 import org.eclipse.papyrus.infra.emf.resource.MoveFileURIReplacementStrategy;
@@ -61,7 +66,7 @@ public class PapyrusCopyFilesAndFoldersOperation extends CopyFilesAndFoldersOper
 
 	/*
 	 * (non-Javadoc)
-	 *
+	 * 
 	 * @see org.eclipse.papyrus.infra.onefile.action.CopyFilesAndFoldersOperation#performCopyWithAutoRename(org.eclipse.core.resources.IResource[],
 	 * org.eclipse.core.runtime.IPath, org.eclipse.core.runtime.IProgressMonitor)
 	 */
@@ -109,7 +114,7 @@ public class PapyrusCopyFilesAndFoldersOperation extends CopyFilesAndFoldersOper
 
 	/*
 	 * (non-Javadoc)
-	 *
+	 * 
 	 * @see org.eclipse.papyrus.infra.onefile.action.CopyFilesAndFoldersOperation#performCopy(org.eclipse.core.resources.IResource[],
 	 * org.eclipse.core.runtime.IPath, org.eclipse.core.runtime.IProgressMonitor)
 	 */
@@ -129,7 +134,7 @@ public class PapyrusCopyFilesAndFoldersOperation extends CopyFilesAndFoldersOper
 
 	/*
 	 * (non-Javadoc)
-	 *
+	 * 
 	 * @see org.eclipse.papyrus.infra.onefile.action.CopyFilesAndFoldersOperation#copyResources(org.eclipse.core.resources.IResource[],
 	 * org.eclipse.core.resources.IContainer)
 	 */
@@ -138,11 +143,13 @@ public class PapyrusCopyFilesAndFoldersOperation extends CopyFilesAndFoldersOper
 	public IResource[] copyResources(IResource[] resources, IContainer destination) {
 		IResource[] copyResources = super.copyResources(resources, destination);
 		try {
-			ModelSet modelSet = initModelSet(copyResources);
+			List<ModelSet> modelSetList = initModelSet(copyResources);
 			Map<URI, URI> constructInternalMapping = constructInternalMapping(copyResources);
 			for (int i = 0; i < resources.length; i++) {
-				if (checkResource(modelSet, resources[i])) {
-					restoreAllLink(modelSet, constructInternalMapping, copyResources[i], destinationPaths[i]);
+				for (ModelSet modelSet : modelSetList) {
+					if (checkResource(modelSet, resources[i])) {
+						restoreAllLink(modelSet, constructInternalMapping, copyResources[i], destinationPaths[i]);
+					}
 				}
 			}
 		} catch (IOException e) {
@@ -157,17 +164,23 @@ public class PapyrusCopyFilesAndFoldersOperation extends CopyFilesAndFoldersOper
 	 * @param resources
 	 * @return
 	 */
-	protected ModelSet initModelSet(IResource[] resources) {
-		ModelSet modelSet = new DiResourceSet();
+	protected List<ModelSet> initModelSet(IResource[] resources) {
+		List<ModelSet> modelSetList = new ArrayList<ModelSet>();
 		for (IResource iResource : resources) {
 			IPath fullPath = iResource.getFullPath();
 			if (DiModel.MODEL_FILE_EXTENSION.equals(fullPath.getFileExtension())) {
 				if (iResource instanceof IFile) {
-					modelSet.createsModels((IFile) iResource);
+					try {
+						ModelSet modelSet = new DiResourceSet();
+						modelSet.loadModels((IFile) iResource);
+						modelSetList.add(modelSet);
+					} catch (ModelMultiException e) {
+						Activator.log.error("It was not possible to load models", e); //$NON-NLS-1$
+					}
 				}
 			}
 		}
-		return modelSet;
+		return modelSetList;
 	}
 
 	/**
@@ -210,8 +223,27 @@ public class PapyrusCopyFilesAndFoldersOperation extends CopyFilesAndFoldersOper
 			DependencyManagementHelper.updateDependencies(oneInternalCopyMapping.getKey(), oneInternalCopyMapping.getValue(), resource);
 		}
 		resource.save(ResourceUtils.getSaveOptions());
-	}
+		IPath fullPath = copyResources.getFullPath();
+		Resource sashResource = null;
 
+		// restore links for sash
+		if (DiModel.MODEL_FILE_EXTENSION.equals(fullPath.getFileExtension())) {
+			SashModel sashModel = SashModelUtils.getSashModel(modelSet);
+			if (sashModel != null && !constructInternalMapping.containsKey(sashModel.getURI())) { // Kepler and earlier stored the sash model in the DI
+				sashResource = sashModel.getResource();
+				for (Entry<URI, URI> oneInternalCopyMapping : constructInternalMapping.entrySet()) {
+					DependencyManagementHelper.updateDependencies(oneInternalCopyMapping.getKey(), oneInternalCopyMapping.getValue(), sashResource);
+				}
+			}
+			if (sashResource != null) { // save new sash model
+				ModelSet tempModelSet = new DiResourceSet();
+				tempModelSet.createModels(uri);
+				URI newsashModelURI = SashModelUtils.getSashModel(tempModelSet).getURI();
+				sashResource.setURI(newsashModelURI);
+				sashResource.save(ResourceUtils.getSaveOptions());
+			}
+		}
+	}
 
 	/**
 	 * Construct an URI mapping from source to target
@@ -230,5 +262,4 @@ public class PapyrusCopyFilesAndFoldersOperation extends CopyFilesAndFoldersOper
 		}
 		return internalCopyMapping;
 	}
-
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/PapyrusEditActionProvider.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/PapyrusEditActionProvider.java
index 2c2b79c21aa..1960608988d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/PapyrusEditActionProvider.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/PapyrusEditActionProvider.java
@@ -19,7 +19,6 @@ import java.util.List;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.TreeSelection;
@@ -36,7 +35,6 @@ import org.eclipse.ui.actions.ActionContext;
 import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.navigator.CommonActionProvider;
 import org.eclipse.ui.navigator.ICommonActionExtensionSite;
-import org.eclipse.ui.navigator.ICommonMenuConstants;
 import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
 
 /**
@@ -55,21 +53,18 @@ public class PapyrusEditActionProvider extends CommonActionProvider {
 
 	@Override
 	public void fillActionBars(IActionBars actionBars) {
+		super.fillActionBars(actionBars);
 		if (fInViewPart) {
 			actionBars.setGlobalActionHandler(ActionFactory.PASTE.getId(), pasteAction);
 		}
-		super.fillActionBars(actionBars);
 	}
 
 	@Override
 	public void fillContextMenu(IMenuManager menu) {
 		super.fillContextMenu(menu);
-		appendToGroup(menu, pasteAction, ICommonMenuConstants.GROUP_EDIT);
-	}
-
-	private void appendToGroup(IMenuManager menu, IAction action, String id) {
-		if (action != null && action.isEnabled()) {
-			menu.appendToGroup(id, action);
+		if (pasteAction != null && pasteAction.isEnabled()) {
+			menu.insertAfter(PapyrusModelPasteAction.ID, pasteAction); // same as the internal org.eclipse.ui.internal.navigator.resources.actions.PasteAction.ID
+			menu.remove(PapyrusModelPasteAction.ID);
 		}
 	}
 
diff --git a/plugins/infra/org.eclipse.papyrus.infra.psf/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.psf/META-INF/MANIFEST.MF
index c38c5113a61..bb8347703a1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.psf/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.psf/META-INF/MANIFEST.MF
@@ -4,11 +4,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.team.core;bundle-version="3.7.0",

  org.eclipse.core.resources;bundle-version="3.8.100",

  org.eclipse.team.ui;bundle-version="3.7.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.9.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Papyrus PSF support

 Bundle-Activator: org.eclipse.papyrus.infra.psf.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/org.eclipse.papyrus.infra.psf/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.psf/pom.xml
index 1a073d0d5d0..ea8dec90037 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.psf/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.psf/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.psf</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
index 9ef1a088388..7463cfb60d4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Export-Package: org.eclipse.papyrus.infra.tools.comparator,
  org.eclipse.papyrus.infra.tools.util

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.core.databinding;bundle-version="1.4.1",

  org.eclipse.emf.common;bundle-version="2.9.0",

  org.eclipse.emf.ecore;bundle-version="2.9.0",

@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui,
  com.google.guava;bundle-version="11.0.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Eclipse-BuddyPolicy: dependent

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.infra.tools.Activator

diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.tools/pom.xml
index 357271ade92..762cd08606c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.tools/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.tools</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/IMultipleObservableValue.java b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/IMultipleObservableValue.java
new file mode 100644
index 00000000000..b2fd4b1cfeb
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/IMultipleObservableValue.java
@@ -0,0 +1,37 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.tools.databinding;
+
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+
+
+
+/**
+ * Interface for a multiple selection of observable values.
+ */
+public interface IMultipleObservableValue extends AggregatedObservable, IObservableValue {
+
+	/**
+	 * @return the list of sub-observable values
+	 */
+	List<IObservableValue> getObservableValues();
+
+	/**
+	 * @return the list of observed values
+	 */
+	List<Object> getObservedValues();
+
+}
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableValue.java b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableValue.java
index c4c0ef6a7d0..faaf6b23c6f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableValue.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableValue.java
@@ -9,6 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

  *  Christian W. Damus (CEA) - bug 417409

+ *  Christian W. Damus (CEA) - bug 444227

  *

  *****************************************************************************/

 package org.eclipse.papyrus.infra.tools.databinding;

@@ -33,7 +34,7 @@ import org.eclipse.core.databinding.observable.value.ValueDiff;
  * All sub-elements will be edited at the same time, with the same value.

  */

 // TODO : Add listeners on sub-observables, and remove them on dispose

-public class MultipleObservableValue extends ReferenceCountedObservable.Value implements AggregatedObservable, IChangeListener {

+public class MultipleObservableValue extends ReferenceCountedObservable.Value implements IMultipleObservableValue, IChangeListener {

 

 	/**

 	 *

@@ -107,16 +108,10 @@ public class MultipleObservableValue extends ReferenceCountedObservable.Value im
 		return null;

 	}

 

-	/**

-	 * @return the list of sub-observable values

-	 */

 	public List<IObservableValue> getObservableValues() {

 		return observableValues;

 	}

 

-	/**

-	 * @return the list of observed values

-	 */

 	public List<Object> getObservedValues() {

 		List<Object> result = new LinkedList<Object>();

 		for (IObservableValue value : getObservableValues()) {

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
index 4f2f4bcfc4e..94fc23cf417 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",

- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.7.100",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.ui.forms;bundle-version="3.5.100",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.ui.resources.Activator

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/pom.xml
index b62d6c4e720..96a28c036ff 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.ui.resources</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/RenameModelChange.java b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/RenameModelChange.java
index 7163d8a32b2..f4f3ed6ae18 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/RenameModelChange.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/RenameModelChange.java
@@ -60,6 +60,8 @@ import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.resource.ModelsReader;
 import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;
 import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModelUtils;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModelUtils;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.core.utils.EditorUtils;
 import org.eclipse.papyrus.infra.emf.readonly.ReadOnlyManager;
@@ -282,6 +284,27 @@ public class RenameModelChange extends Change {
 			}
 			pm.worked(5);
 
+
+			try {
+				SashModel oldSash = SashModelUtils.getSashModel(resourceSet);
+				URI oldSashURI = oldSash.getResourceURI();
+				Resource resource = oldSash.getResource();
+				resourceSet.loadModels(newFile);
+				SashModel sashModel = SashModelUtils.getSashModel(resourceSet);
+				URI stashNewFile = sashModel.getResourceURI();
+				resource.setURI(stashNewFile);
+				resource.save(ResourceUtils.getSaveOptions());
+				if(oldSash != null) { // delete old stash
+					try {
+						resourceSet.getURIConverter().delete(oldSashURI, null);
+					} catch (IOException e) {
+						log.error(Messages.bind(Messages.RenameModelChange_ErrorLoading, oldSashURI), e);
+					}
+				}
+			} catch (Exception e) {
+				log.error(e);
+			}
+
 			// Do not forget to unload all the resources to avoid memory leak
 			pm.subTask(Messages.RenameModelChange_Unloading);
 			resourceSet.unload();
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF
index 19b2f85a752..ddba9f97355 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.7.0"

 Export-Package: org.eclipse.papyrus.infra.services.controlmode.history,

  org.eclipse.papyrus.infra.services.controlmode.history.utils,

@@ -11,7 +11,7 @@ Export-Package: org.eclipse.papyrus.infra.services.controlmode.history,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/pom.xml
index ec83d295dcd..8000a963f86 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.controlmode.history</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
index 17d4753c2f8..cfffbda9a4d 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
@@ -6,22 +6,22 @@ Export-Package: org.eclipse.papyrus.infra.services.controlmode,
  org.eclipse.papyrus.infra.services.controlmode.ui,

  org.eclipse.papyrus.infra.services.controlmode.util

 Require-Bundle: org.eclipse.emf.edit.ui,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.core.expressions;bundle-version="3.4.400",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0",

  org.eclipse.equinox.registry,

  org.eclipse.emf.workspace,

  org.eclipse.gmf.runtime.common.core,

  org.eclipse.gmf.runtime.emf.commands.core,

  org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1"

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.Contr

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml
index c3c99076300..d016e5367fd 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.controlmode</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF
index 345b4b7176b..085abe6dd16 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.apache.commons.lang;bundle-version="2.4.0",

  org.eclipse.emf.ecore;bundle-version="2.8.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.7.0",

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.services.decoration,

  org.eclipse.papyrus.infra.services.decoration.util

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.services.decoration.Activa

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/pom.xml
index 249182131c5..c69110d4d2e 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.decoration</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF
index 53d39ee4cb1..26a2d4bdca5 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF
@@ -12,13 +12,13 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

  org.eclipse.emf;bundle-version="2.6.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.services.edit.Activator

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/pom.xml
index 2843353886f..e0bd02d6381 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/META-INF/MANIFEST.MF
index 1e8ee4da418..a45d93cfa21 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/META-INF/MANIFEST.MF
@@ -4,11 +4,11 @@ Export-Package: org.eclipse.papyrus.infra.services.labelprovider,
  org.eclipse.papyrus.infra.services.labelprovider.service.impl

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: LabelProvider service

 Bundle-Activator: org.eclipse.papyrus.infra.services.labelprovider.Act

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/pom.xml
index 54e953d9c8d..14b691d27ad 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.labelprovider</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF
index 6a8d3be511d..cd634537369 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF
@@ -3,14 +3,14 @@ Export-Package: org.eclipse.papyrus.infra.services.localizer,
  org.eclipse.papyrus.infra.services.localizer.internal;x-internal:=true,

  org.eclipse.papyrus.infra.services.localizer.util

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/pom.xml
index c2845fbe3ab..621e1fdf422 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.localizer</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF
index c75e1ba3d35..0d25bb97096 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF
@@ -5,16 +5,16 @@ Export-Package: org.eclipse.papyrus.infra.services.markerlistener,
  org.eclipse.papyrus.infra.services.markerlistener.util

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.7.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.common.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.emf.edit.ui;bundle-version="2.7.0",

  org.eclipse.core.expressions;bundle-version="3.4.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.services.markerlistener.Ac

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/pom.xml
index fa92656057e..02d39c68606 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.markerlistener</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF
index a6e4be44b1e..46c4b121b87 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF
@@ -4,13 +4,13 @@ Export-Package: org.eclipse.papyrus.infra.services.navigation,
  org.eclipse.papyrus.infra.services.navigation.service

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.jface

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Navigation Service

 Bundle-Activator: org.eclipse.papyrus.infra.services.navigation.Activa

  tor

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/pom.xml
index 23d461ad093..129ba61d8f5 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.navigation</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF
index d9c192831d3..0ee7ca031a9 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF
@@ -4,18 +4,18 @@ Export-Package: org.eclipse.papyrus.infra.services.openelement,
  org.eclipse.papyrus.infra.services.openelement.service.impl

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.emf.ecore;bundle-version="2.9.0",

  org.eclipse.ui.ide;bundle-version="3.8.100",

  org.eclipse.core.resources;bundle-version="3.8.100",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.navigation;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.navigation;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: OpenElement Service

 Bundle-Activator: org.eclipse.papyrus.infra.services.openelement.Activ

  ator

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/pom.xml
index bd97d7de679..5e98a558d1c 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.openelement</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF
index 45ecdce512f..b48ee53d944 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF
@@ -4,18 +4,18 @@ Export-Package: org.eclipse.papyrus.infra.services.resourceloading.pre
 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.jface,

  org.eclipse.ui,

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.emf;bundle-version="2.6.0",

  org.eclipse.emf.common.ui;bundle-version="2.7.0",

  org.eclipse.emf.common;bundle-version="2.8.0",

  org.eclipse.core.resources;bundle-version="3.8.0",

  org.eclipse.gef;bundle-version="3.8.1",

  org.eclipse.emf.ecore,

- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.services.resourceloading.p

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/pom.xml
index 0cf2342f549..143e5fbbbc2 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.resourceloading.preferences</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF
index 60b66762f0f..213467ba33a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF
@@ -3,25 +3,25 @@ Export-Package: org.eclipse.papyrus.infra.services.resourceloading,
  org.eclipse.papyrus.infra.services.resourceloading.impl,

  org.eclipse.papyrus.infra.services.resourceloading.strategies,

  org.eclipse.papyrus.infra.services.resourceloading.util

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

  org.eclipse.core.expressions,

  org.eclipse.core.resources;bundle-version="3.7.0",

  org.eclipse.core.runtime;bundle-version="3.7.0",

  org.eclipse.gef;bundle-version="3.7.1",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.services.resourceloading.A

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/pom.xml
index 129473943a5..16c83b32872 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.resourceloading</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/META-INF/MANIFEST.MF
index 6a841cb5bc7..374b479690b 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.infra.services.semantic,

  org.eclipse.papyrus.infra.services.semantic.service

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.emf.ecore;bundle-version="2.6.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: Semantic Service

 Bundle-Activator: org.eclipse.papyrus.infra.services.semantic.Activato

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/pom.xml
index 64de23025ed..4c1c22fcfdd 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.semantic</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF
index 808c9918a1c..92b49c98e04 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF
@@ -11,17 +11,17 @@ Require-Bundle: org.eclipse.ui,
  org.apache.commons.lang;bundle-version="2.3.0",

  org.eclipse.emf.edit.ui;bundle-version="2.6.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.0.100",

- org.eclipse.papyrus.infra.services.decoration;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.decoration;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0"

 Bundle-Vendor: %pluginProvider

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.services.validation.Activa

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/pom.xml
index 4b345efd726..d069c63397f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.validation</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF
index ded11b3658f..406f1e9d9a7 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF
@@ -3,12 +3,12 @@ Export-Package: org.eclipse.papyrus.infra.services.viewersearch,
  org.eclipse.papyrus.infra.services.viewersearch.impl

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.emf.ecore;bundle-version="2.9.0"

 Bundle-Vendor: %vendorName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.services.viewersearch.Acti

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/pom.xml
index 19885d84b33..5c8b44c21ce 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.viewersearch</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/META-INF/MANIFEST.MF
index be1dff2812e..279cd18a43f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.ui;bundle-version="3.105.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.emf.ecore;bundle-version="2.9.0"

 Bundle-Vendor: %vendorName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.services.viewlabelprovider

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/pom.xml
index 14fcea9f25a..d02fa6d2bd4 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.viewlabelprovider</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/META-INF/MANIFEST.MF
index ee360a77cbc..b2b32a5dbd8 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.edit,

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.constraints.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.constraints.edit;bundle-version="1.1.0",

  org.eclipse.emf.ecore,

  org.eclipse.emf.ecore.edit,

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.iso42010.edit;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.iso42010.edit;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.viewpoints.configuration.pro

  vider

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.configuration.p

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/pom.xml
index eceef624dd9..8e4ef97e003 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/pom.xml
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.viewpoints.configuration.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/META-INF/MANIFEST.MF
index 2cc3a9791c5..63b3e6b6de3 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/META-INF/MANIFEST.MF
@@ -5,15 +5,15 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit.ui,

  org.eclipse.ui.ide,

  org.eclipse.emf.ecore.edit,

- org.eclipse.papyrus.infra.viewpoints.iso42010.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.configuration.edit;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.viewpoints.iso42010.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration.edit;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.viewpoints.configuration.pre

  sentation

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.configuration.p

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/pom.xml
index 137b926f2be..a55e8717f2d 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/pom.xml
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.viewpoints.configuration.editor</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF
index 5a58b60c632..144a9040580 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF
@@ -9,15 +9,15 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,

  org.eclipse.emf.edit,

  org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.configuration.A

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/pom.xml
index 3e8b82e3c2d..9e07377db2c 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/pom.xml
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.viewpoints.configuration</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/META-INF/MANIFEST.MF
index 6bd231f836f..c53634dfec9 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.edit;visibility:=reexport

 Export-Package: org.eclipse.papyrus.infra.viewpoints.iso42010.provider

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.iso42010.provid

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/pom.xml
index 580a34cd9d5..2648d4ab492 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/pom.xml
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.viewpoints.iso42010.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/META-INF/MANIFEST.MF
index 2b89f6a16c7..95bd1bf14c6 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/META-INF/MANIFEST.MF
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.iso42010.Activa

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/pom.xml
index 7b150c6664d..5efc3a80405 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/pom.xml
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.viewpoints.iso42010</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF
index 7b94c3105c2..beadc3ddac2 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF
@@ -14,17 +14,17 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.runtime.diagram.ui,

  org.eclipse.gmf.runtime.diagram.ui.providers,

  org.eclipse.gmf.runtime.notation.edit,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml
index 5d0ed1b9715..5b9b20bc12b 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.viewpoints.policy</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF
index 0f941bced02..cc113750752 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF
@@ -3,14 +3,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

  org.eclipse.emf.common,

  org.eclipse.emf.ecore,

- org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.9.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.preferences.Act

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/pom.xml
index abdbde38cbc..cda9ac8d62b 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/pom.xml
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.viewpoints.preferences</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF
index b49667e40df..dc6ecd0144a 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF
@@ -14,10 +14,10 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,

  org.eclipse.ui.forms;bundle-version="3.5.100",

  org.eclipse.draw2d;bundle-version="3.8.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.infra.widgets.toolbox.Activator

diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/pom.xml b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/pom.xml
index 0759c00da45..558add3f36e 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/pom.xml
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.widgets.toolbox</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
index d2050872656..aa5229dbf47 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
@@ -4,14 +4,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.databinding.property;bundle-version="1.3.0",

  org.eclipse.core.databinding,

  org.eclipse.jface.databinding,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",

  org.eclipse.core.resources;bundle-version="3.7.100",

  org.eclipse.ui.ide;bundle-version="3.7.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

  com.ibm.icu;bundle-version="4.4.2",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.widgets,

  org.eclipse.papyrus.infra.widgets.creation,

  org.eclipse.papyrus.infra.widgets.databinding,

@@ -24,7 +24,7 @@ Export-Package: org.eclipse.papyrus.infra.widgets,
  org.eclipse.papyrus.infra.widgets.validator

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/pom.xml b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/pom.xml
index 94440dd3505..66f5e29c718 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/pom.xml
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.widgets</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractValueEditor.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractValueEditor.java
index 39347ed433e..2cbb8b44e2f 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractValueEditor.java
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractValueEditor.java
@@ -1,281 +1,299 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation

- *  Christian W. Damus (CEA) - bug 402525

- *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 435415

- *  Christian W. Damus (CEA) - bug 417409

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.core.databinding.UpdateValueStrategy;

-import org.eclipse.core.databinding.conversion.IConverter;

-import org.eclipse.core.databinding.observable.ChangeEvent;

-import org.eclipse.core.databinding.observable.IChangeListener;

-import org.eclipse.core.databinding.observable.IObserving;

-import org.eclipse.core.databinding.observable.value.IObservableValue;

-import org.eclipse.core.databinding.observable.value.IValueChangeListener;

-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;

-import org.eclipse.core.databinding.validation.IValidator;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.jface.fieldassist.ControlDecoration;

-import org.eclipse.papyrus.infra.widgets.validator.AbstractValidator;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * An abstract class to represent Single-value Editors. Single-value editors are

- * based on the Eclipse Databinding Framework They take {@link IObservableValue} s as Input

- *

- * @author Camille Letavernier

- *

- */

-public abstract class AbstractValueEditor extends AbstractEditor {

-

-	/**

-	 * The IObservableValue associated to the model property

-	 */

-	protected IObservableValue modelProperty;

-

-	/**

-	 * The IObservableValue associated to the widget

-	 */

-	protected IObservableValue widgetObservable;

-

-	/**

-	 * The UpdateStrategy for binding data from widget to model

-	 */

-	protected UpdateValueStrategy targetToModelStrategy;

-

-	/**

-	 * The UpdateStrategy for binding data from model to widget

-	 */

-	protected UpdateValueStrategy modelToTargetStrategy;

-

-	/**

-	 * the Validator for the target

-	 */

-	protected AbstractValidator targetValidator;

-

-	/**

-	 * the Validator for the model

-	 */

-	protected IValidator modelValidator;

-

-	protected boolean errorBinding = false;

-

-	protected ControlDecoration controlDecoration;

-

-	protected static final Color VALID = new Color(Display.getCurrent(), 144, 238, 144); // CSS LightGreen

-

-	protected static final Color DEFAULT = Display.getCurrent().getSystemColor(SWT.COLOR_WHITE);

-

-	protected static final Color EDIT = new Color(Display.getCurrent(), 255, 204, 153); // Orange

-

-	protected static final Color ERROR = new Color(Display.getCurrent(), 255, 153, 153); // Red

-

-	protected AbstractValueEditor(Composite parent) {

-		super(parent);

-	}

-

-	protected AbstractValueEditor(Composite parent, int style, String label) {

-		super(parent, style, label);

-	}

-

-	protected AbstractValueEditor(Composite parent, int style) {

-		super(parent, style);

-	}

-

-	protected AbstractValueEditor(Composite parent, String label) {

-		super(parent, label);

-	}

-

-	/**

-	 * Sets this editor's IObservableValue associated to the widget property

-	 *

-	 * @param widgetObservable

-	 * @param targetToModel

-	 *            the IConverter to convert data from Widget to Model

-	 * @param modelToTarget

-	 *            the IConverter to convert data from Model to Widget

-	 */

-	protected void setWidgetObservable(IObservableValue widgetObservable, IConverter targetToModel, IConverter modelToTarget) {

-		this.widgetObservable = widgetObservable;

-		setConverters(targetToModel, modelToTarget);

-	}

-

-	/**

-	 * Sets this editor's widgetObservable

-	 *

-	 * @param widgetObservable

-	 *            The widget observable value

-	 * @param commitOnChange

-	 *            If true, CommitListeners will be notified when the widget

-	 *            observable changes

-	 */

-	protected void setWidgetObservable(IObservableValue widgetObservable, boolean commitOnChange) {

-		this.widgetObservable = widgetObservable;

-		if (commitOnChange) {

-			this.widgetObservable.addChangeListener(new IChangeListener() {

-

-				@Override

-				public void handleChange(ChangeEvent event) {

-					commit();

-				}

-			});

-		}

-	}

-

-	/**

-	 * Sets this editor's IObservableValue associated to the widget property

-	 *

-	 * @param widgetObservable

-	 */

-	protected void setWidgetObservable(IObservableValue widgetObservable) {

-		setWidgetObservable(widgetObservable, false);

-	}

-

-	/**

-	 * Sets this editor's IObservableValue associated to the model property, and

-	 * binds it to the Editor's Widget

-	 *

-	 * @param modelProperty

-	 */

-	public void setModelObservable(IObservableValue modelProperty) {

-		this.modelProperty = modelProperty;

-		doBinding();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void setConverters(IConverter targetToModel, IConverter modelToTarget) {

-		if (targetToModelStrategy == null) {

-			targetToModelStrategy = new UpdateValueStrategy();

-		}

-		if (modelToTargetStrategy == null) {

-			modelToTargetStrategy = new UpdateValueStrategy();

-		}

-		targetToModelStrategy.setConverter(targetToModel);

-		modelToTargetStrategy.setConverter(modelToTarget);

-	}

-

-	/**

-	 * Sets the UpdateStrategies for databinding between the widget and the

-	 * model

-	 *

-	 * @param targetToModelStrategy

-	 *            The widget to model Update strategy

-	 * @param modelToTargetStrategy

-	 *            The model to widget Update strategy

-	 */

-	public void setUpdateStrategies(UpdateValueStrategy targetToModelStrategy, UpdateValueStrategy modelToTargetStrategy) {

-		this.targetToModelStrategy = targetToModelStrategy;

-		this.modelToTargetStrategy = modelToTargetStrategy;

-	}

-

-	/**

-	 * Binds the Widget Observable to the Model observable property, using the

-	 * specified converters or Update strategies when available

-	 *

-	 * When overriding this method, you should also override {@link #refreshValue()}

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.editors.AbstractEditor#doBinding()

-	 */

-	@Override

-	protected void doBinding() {

-		if (modelProperty == null || widgetObservable == null) {

-			return;

-		}

-		setBinding();

-	}

-

-	/**

-	 * Returns the value from the widget May be used even when the Model

-	 * Observable is not set

-	 *

-	 * @return The current value for this editor

-	 */

-	public abstract Object getValue();

-

-	/**

-	 * Initialize binding

-	 */

-	private void setBinding() {

-		binding = getBindingContext().bindValue(widgetObservable, modelProperty, targetToModelStrategy, modelToTargetStrategy);

-		binding.getValidationStatus().addValueChangeListener(new IValueChangeListener() {

-

-			@Override

-			public void handleValueChange(ValueChangeEvent event) {

-				// Don't handle validation changes if we don't have a validator, because then it could only be green and it isn't useful.

-				// Also, if we're showing in a dialog, then our widget may have been disposed already if we're validating a change applied

-				// by hitting the OK button

-				if ((modelValidator) != null) {

-					// Check if the widget is disposed before isReadOnly() to avoid NPE

-					if (!AbstractValueEditor.this.isDisposed() && !isReadOnly()) { // Bug 434787 : Shouldn't not execute the timer thread if the widget is disposed

-						IStatus status = (IStatus) binding.getValidationStatus().getValue(); // Bug 435415 : Update the status only if the widget isn't disposed

-						updateStatus(status);

-						changeColorField();

-					}

-				}

-			}

-

-		});

-	}

-

-	public void updateStatus(IStatus status) {

-	}

-

-	/**

-	 * Set the target to model Strategy to after get validation

-	 *

-	 * @param targetToModelValidator

-	 */

-	public void setTargetAfterGetValidator(AbstractValidator targetToModelValidator) {

-		if (targetToModelValidator != null) {

-			targetToModelStrategy.setAfterGetValidator(targetToModelValidator);

-		}

-	}

-

-	/**

-	 * Set the model strategy with After get validation

-	 * Set the target strategy with before set validation

-	 *

-	 * @param modelValidator

-	 */

-	public void setModelValidator(IValidator targetToModelValidator) {

-		this.modelValidator = targetToModelValidator;

-		targetToModelStrategy.setBeforeSetValidator(targetToModelValidator);

-		modelToTargetStrategy.setAfterGetValidator(targetToModelValidator);

-	}

-

-	/**

-	 * Initialize both strategies with default values

-	 */

-	public void setStrategies() {

-		if (modelToTargetStrategy == null) {

-			modelToTargetStrategy = new UpdateValueStrategy();

-		}

-		if (targetToModelStrategy == null) {

-			targetToModelStrategy = new UpdateValueStrategy();

-		}

-	}

-

-	@Override

-	protected Object getContextElement() {

-		// Our observables for features of EMF objects are expected to implement IObserving because

-		// the observe the value of the object's feature

-		return (modelProperty instanceof IObserving) ? ((IObserving) modelProperty).getObserved() : null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *  Christian W. Damus (CEA) - bug 402525
+ *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 435415
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.core.databinding.UpdateValueStrategy;
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.core.databinding.observable.IObserving;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
+import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.fieldassist.ControlDecoration;
+import org.eclipse.papyrus.infra.widgets.validator.AbstractValidator;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * An abstract class to represent Single-value Editors. Single-value editors are
+ * based on the Eclipse Databinding Framework They take {@link IObservableValue} s as Input
+ *
+ * @author Camille Letavernier
+ *
+ */
+public abstract class AbstractValueEditor extends AbstractEditor {
+
+	/**
+	 * The IObservableValue associated to the model property
+	 */
+	protected IObservableValue modelProperty;
+
+	/**
+	 * The IObservableValue associated to the widget
+	 */
+	protected IObservableValue widgetObservable;
+
+	/**
+	 * The UpdateStrategy for binding data from widget to model
+	 */
+	protected UpdateValueStrategy targetToModelStrategy;
+
+	/**
+	 * The UpdateStrategy for binding data from model to widget
+	 */
+	protected UpdateValueStrategy modelToTargetStrategy;
+
+	/**
+	 * the Validator for the target
+	 */
+	protected AbstractValidator targetValidator;
+
+	/**
+	 * the Validator for the model
+	 */
+	protected IValidator modelValidator;
+
+	protected boolean errorBinding = false;
+
+	protected ControlDecoration controlDecoration;
+
+	protected static final Color VALID = new Color(Display.getCurrent(), 144, 238, 144); // CSS LightGreen
+
+	protected static final Color DEFAULT = Display.getCurrent().getSystemColor(SWT.COLOR_WHITE);
+
+	protected static final Color EDIT = new Color(Display.getCurrent(), 255, 204, 153); // Orange
+
+	protected static final Color ERROR = new Color(Display.getCurrent(), 255, 153, 153); // Red
+
+	private boolean initialValidation;
+
+	protected AbstractValueEditor(Composite parent) {
+		super(parent);
+	}
+
+	protected AbstractValueEditor(Composite parent, int style, String label) {
+		super(parent, style, label);
+	}
+
+	protected AbstractValueEditor(Composite parent, int style) {
+		super(parent, style);
+	}
+
+	protected AbstractValueEditor(Composite parent, String label) {
+		super(parent, label);
+	}
+
+	/**
+	 * Sets this editor's IObservableValue associated to the widget property
+	 *
+	 * @param widgetObservable
+	 * @param targetToModel
+	 *            the IConverter to convert data from Widget to Model
+	 * @param modelToTarget
+	 *            the IConverter to convert data from Model to Widget
+	 */
+	protected void setWidgetObservable(IObservableValue widgetObservable, IConverter targetToModel, IConverter modelToTarget) {
+		this.widgetObservable = widgetObservable;
+		setConverters(targetToModel, modelToTarget);
+	}
+
+	/**
+	 * Sets this editor's widgetObservable
+	 *
+	 * @param widgetObservable
+	 *            The widget observable value
+	 * @param commitOnChange
+	 *            If true, CommitListeners will be notified when the widget
+	 *            observable changes
+	 */
+	protected void setWidgetObservable(IObservableValue widgetObservable, boolean commitOnChange) {
+		this.widgetObservable = widgetObservable;
+		if (commitOnChange) {
+			this.widgetObservable.addChangeListener(new IChangeListener() {
+
+				@Override
+				public void handleChange(ChangeEvent event) {
+					commit();
+				}
+			});
+		}
+	}
+
+	/**
+	 * Sets this editor's IObservableValue associated to the widget property
+	 *
+	 * @param widgetObservable
+	 */
+	protected void setWidgetObservable(IObservableValue widgetObservable) {
+		setWidgetObservable(widgetObservable, false);
+	}
+
+	/**
+	 * Sets this editor's IObservableValue associated to the model property, and
+	 * binds it to the Editor's Widget
+	 *
+	 * @param modelProperty
+	 */
+	public void setModelObservable(IObservableValue modelProperty) {
+		this.modelProperty = modelProperty;
+		doBinding();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setConverters(IConverter targetToModel, IConverter modelToTarget) {
+		if (targetToModelStrategy == null) {
+			targetToModelStrategy = new UpdateValueStrategy();
+		}
+		if (modelToTargetStrategy == null) {
+			modelToTargetStrategy = new UpdateValueStrategy();
+		}
+		targetToModelStrategy.setConverter(targetToModel);
+		modelToTargetStrategy.setConverter(modelToTarget);
+	}
+
+	/**
+	 * Sets the UpdateStrategies for databinding between the widget and the
+	 * model
+	 *
+	 * @param targetToModelStrategy
+	 *            The widget to model Update strategy
+	 * @param modelToTargetStrategy
+	 *            The model to widget Update strategy
+	 */
+	public void setUpdateStrategies(UpdateValueStrategy targetToModelStrategy, UpdateValueStrategy modelToTargetStrategy) {
+		this.targetToModelStrategy = targetToModelStrategy;
+		this.modelToTargetStrategy = modelToTargetStrategy;
+	}
+
+	/**
+	 * Binds the Widget Observable to the Model observable property, using the
+	 * specified converters or Update strategies when available
+	 *
+	 * When overriding this method, you should also override {@link #refreshValue()}
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.editors.AbstractEditor#doBinding()
+	 */
+	@Override
+	protected void doBinding() {
+		if (modelProperty == null || widgetObservable == null) {
+			return;
+		}
+		setBinding();
+	}
+
+	/**
+	 * Returns the value from the widget May be used even when the Model
+	 * Observable is not set
+	 *
+	 * @return The current value for this editor
+	 */
+	public abstract Object getValue();
+
+	/**
+	 * Initialize binding
+	 */
+	private void setBinding() {
+		binding = getBindingContext().bindValue(widgetObservable, modelProperty, targetToModelStrategy, modelToTargetStrategy);
+		binding.getValidationStatus().addValueChangeListener(new IValueChangeListener() {
+
+			@Override
+			public void handleValueChange(ValueChangeEvent event) {
+				// Don't handle validation changes if we don't have a validator, because then it could only be green and it isn't useful.
+				// Also, if we're showing in a dialog, then our widget may have been disposed already if we're validating a change applied
+				// by hitting the OK button
+				if ((modelValidator) != null) {
+					// Check if the widget is disposed before isReadOnly() to avoid NPE
+					if (!AbstractValueEditor.this.isDisposed() && !isReadOnly()) { // Bug 434787 : Shouldn't not execute the timer thread if the widget is disposed
+						IStatus status = (IStatus) binding.getValidationStatus().getValue(); // Bug 435415 : Update the status only if the widget isn't disposed
+						updateStatus(status);
+
+						// Don't kick the colour if we're just doing the initial validation to show the decoration.
+						// Only trigger the colours on user-initiated edits
+						if (!initialValidation) {
+							changeColorField();
+						}
+					}
+				}
+			}
+
+		});
+	}
+
+	public void updateStatus(IStatus status) {
+	}
+
+	/**
+	 * Set the target to model Strategy to after get validation
+	 *
+	 * @param targetToModelValidator
+	 */
+	public void setTargetAfterGetValidator(AbstractValidator targetToModelValidator) {
+		if (targetToModelValidator != null) {
+			targetToModelStrategy.setAfterGetValidator(targetToModelValidator);
+		}
+	}
+
+	/**
+	 * Set the model strategy with After get validation
+	 * Set the target strategy with before set validation
+	 *
+	 * @param modelValidator
+	 */
+	public void setModelValidator(IValidator targetToModelValidator) {
+		this.modelValidator = targetToModelValidator;
+		targetToModelStrategy.setBeforeSetValidator(targetToModelValidator);
+		modelToTargetStrategy.setAfterGetValidator(targetToModelValidator);
+
+		if ((binding != null) && (this.modelValidator != null)) {
+			final boolean wasInitialValidation = initialValidation;
+			initialValidation = true;
+
+			try {
+				binding.validateModelToTarget();
+			} finally {
+				initialValidation = wasInitialValidation;
+			}
+		}
+	}
+
+	/**
+	 * Initialize both strategies with default values
+	 */
+	public void setStrategies() {
+		if (modelToTargetStrategy == null) {
+			modelToTargetStrategy = new UpdateValueStrategy();
+		}
+		if (targetToModelStrategy == null) {
+			targetToModelStrategy = new UpdateValueStrategy();
+		}
+	}
+
+	@Override
+	protected Object getContextElement() {
+		// Our observables for features of EMF objects are expected to implement IObserving because
+		// the observe the value of the object's feature
+		return (modelProperty instanceof IObserving) ? ((IObserving) modelProperty).getObserved() : null;
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceDialog.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceDialog.java
index 8f36b7985a7..1103051c9dc 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceDialog.java
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceDialog.java
@@ -10,6 +10,7 @@
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

  *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation

  *  Christian W. Damus (CEA) - bug 402525

+ *  Christian W. Damus (CEA) - bug 443497

  *

  *****************************************************************************/

 package org.eclipse.papyrus.infra.widgets.editors;

@@ -276,9 +277,13 @@ public class ReferenceDialog extends AbstractValueEditor implements SelectionLis
 				@Override

 				public void run() {

 					Object newValue = valueFactory.edit(editInstanceButton, currentValue);

-					if (newValue != currentValue) {

+

+					// Per the contract of ReferenceValueFactory::edit(), a null return means the object was edited "in place."

+					// In that case, there is nothing further to do

+					if ((newValue != null) && (newValue != currentValue)) {

 						setValue(newValue);

 					}

+

 					updateLabel();

 				}

 			}, NLS.bind(Messages.ReferenceDialog_editOperation, labelText));

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF
index 0b4216c484e..f2e8880cec0 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF
@@ -14,45 +14,45 @@ Export-Package: org.eclipse.papyrus.sysml.diagram.blockdefinition,
  org.eclipse.papyrus.sysml.diagram.blockdefinition.utils

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.sysml;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.emf.common.ui;bundle-version="2.5.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.3.0",

  org.eclipse.core.expressions;bundle-version="3.4.100",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",

  org.eclipse.draw2d;bundle-version="3.7.1",

  org.eclipse.gef;bundle-version="3.7.1",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.sysml.diagram.blockdefinition.Ac

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/pom.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/pom.xml
index b8005abe1f3..4f911c2fedc 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/pom.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.diagram.blockdefinition</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
index 7c4fea7dfd5..f83e10e76ab 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
@@ -28,44 +28,44 @@ Export-Package: org.eclipse.papyrus.gmf.diagram.common.commands,
  org.eclipse.papyrus.uml.diagram.common.utils

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.emf;bundle-version="2.6.0",

  org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.papyrus.sysml;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.core.expressions,

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="1.1.0",

  org.eclipse.draw2d;bundle-version="3.7.1",

  org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.uml2.common.edit;bundle-version="1.6.0",

  org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.emf.edit.ui;bundle-version="2.8.0",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",

- org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.sysml.diagram.common.Activator

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/pom.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/pom.xml
index e46ff868b3c..f9d560fd678 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/pom.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.diagram.common</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLabelEditPart.java
index 8cc4ea43cb6..056840e5aa4 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLabelEditPart.java
@@ -71,6 +71,7 @@ import org.eclipse.papyrus.gmf.diagram.common.locator.TextCellEditorLocator;
 import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
 import org.eclipse.papyrus.infra.gmfdiag.common.commands.SemanticAdapter;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.LabelAlignmentEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.LabelPreferenceHelper;
@@ -127,6 +128,7 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new TextSelectionEditPolicy());
 		installEditPolicy(EditPolicyRoles.SNAP_FEEDBACK_ROLE, new DefaultSnapBackEditPolicy());
 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new LabelDefaultSemanticEditPolicy());
+		installEditPolicy(LabelAlignmentEditPolicy.LABEL_ALIGNMENT_KEY, new LabelAlignmentEditPolicy());
 	}
 
 	/**
@@ -186,7 +188,7 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 	}
 
 	@Override
-	protected List getModelChildren() {
+	protected List<?> getModelChildren() {
 		return Collections.EMPTY_LIST;
 	}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementNodeLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementNodeLabelEditPart.java
index 9806172ba28..6e4a13a8115 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementNodeLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementNodeLabelEditPart.java
@@ -227,8 +227,8 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 	}
 
 	@Override
-	protected List getModelChildren() {
-		return Collections.EMPTY_LIST;
+	protected List<?> getModelChildren() {
+		return Collections.emptyList();
 	}
 
 	@Override
@@ -304,7 +304,7 @@ public abstract class AbstractElementNodeLabelEditPart extends GraphicalEditPart
 					final EObject element = getParserElement();
 					final IParser parser = getParser();
 					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl() {
+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<IParserEditStatus>() {
 
 							@Override
 							public void run() {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLCreateOrShowExistingElementHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLCreateOrShowExistingElementHelper.java
index cba1a327d2e..1af6e4da783 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLCreateOrShowExistingElementHelper.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLCreateOrShowExistingElementHelper.java
@@ -26,7 +26,7 @@ import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
 import org.eclipse.papyrus.sysml.service.types.utils.ConnectorUtils;

 import org.eclipse.papyrus.uml.diagram.common.helper.CreateOrShowExistingElementHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.ILinkMappingHelper;

-import org.eclipse.papyrus.uml.diagram.common.util.EdgeEndsMapper;

+import org.eclipse.papyrus.uml.diagram.common.util.LinkEndsMapper;

 import org.eclipse.uml2.uml.AggregationKind;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Connector;

@@ -164,9 +164,9 @@ public class SysMLCreateOrShowExistingElementHelper extends CreateOrShowExisting
 	 *         a list of {@link EdgeEndsMapper} referencing the existing links between the source and the target

 	 */

 	@Override

-	protected List<EdgeEndsMapper> getExistingLinksBetweenSourceAndTarget(final CreateRelationshipRequest request, final IElementType wantedElementType) {

+	protected List<LinkEndsMapper> getExistingLinksBetweenSourceAndTarget(final CreateRelationshipRequest request, final IElementType wantedElementType) {

 		if (wantedElementType.getEClass() == UMLPackage.eINSTANCE.getConnector()) {

-			final List<EdgeEndsMapper> existingElement = new ArrayList<EdgeEndsMapper>();

+			final List<LinkEndsMapper> existingElement = new ArrayList<LinkEndsMapper>();

 			for (final Element current : ((Element) request.getContainer()).getOwnedElements()) {

 				if (hasWantedType(current, wantedElementType)) {

 					final Collection<?> sources = this.linkMappingHelper.getSource(current);

@@ -178,7 +178,7 @@ public class SysMLCreateOrShowExistingElementHelper extends CreateOrShowExisting
 						View targetView = (View) request.getParameter(RequestParameterConstants.EDGE_CREATE_REQUEST_TARGET_VIEW);

 						boolean canBeDisplayed = ConnectorUtils.canDisplayExistingConnectorBetweenViewsAccordingToNestedPaths((Connector) current, sourceView, targetView);

 						if (canBeDisplayed) {

-							existingElement.add(new EdgeEndsMapper(current, sources, null, null));

+							existingElement.add(new LinkEndsMapper(current, sources, null, null));

 						}

 					}

 				}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/META-INF/MANIFEST.MF
index e508e4fc095..c93ff8bb21d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.css.theme;bundle-version="1.0.1";resolution:=optional

+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.css.theme;bundle-version="1.1.0";resolution:=optional

 Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: SysML Css

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.css;singleton:=

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/pom.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/pom.xml
index 6d22a8cef4c..a95df6a9763 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/pom.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.diagram.css</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF
index 59ee3fdc6ff..ee3383a38e0 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF
@@ -15,42 +15,42 @@ Export-Package: org.eclipse.papyrus.sysml.diagram.internalblock,
  org.eclipse.papyrus.sysml.diagram.internalblock.utils

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.sysml;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.emf.common.ui;bundle-version="2.5.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.3.0",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

  org.eclipse.core.expressions,

- org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.sysml.diagram.internalblock.Acti

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/pom.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/pom.xml
index f7bed2d9052..02778a8d26b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/pom.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.diagram.internalblock</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF
index 358f7d2e06a..43aa986f839 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF
@@ -17,42 +17,42 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.sysml;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.emf.common.ui;bundle-version="2.5.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.3.0",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

  org.eclipse.core.expressions,

- org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",

- org.eclipse.papyrus.sysml.diagram.internalblock;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml.diagram.internalblock;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

  org.eclipse.core.databinding.observable;bundle-version="1.4.1",

- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1"

+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.sysml.diagram.parametric.Activat

  or

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/pom.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/pom.xml
index c2b7f1dceef..c5eaec98b0e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/pom.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.diagram.parametric</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF
index 523cc640bd4..3f6a9dd75fd 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF
@@ -10,32 +10,32 @@ Export-Package: org.eclipse.papyrus.sysml.diagram.requirement,
  org.eclipse.papyrus.sysml.diagram.requirement.utils

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.3.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.eclipse.emf.common.ui;bundle-version="2.7.0",

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.sysml.diagram.requirement.Activa

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/pom.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/pom.xml
index c6c98c3e8e1..741e5e2a396 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/pom.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.diagram.requirement</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/figure/CustomRequirementFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/figure/CustomRequirementFigure.java
index 0403a285a73..663628fda0e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/figure/CustomRequirementFigure.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/figure/CustomRequirementFigure.java
@@ -1,56 +1,57 @@
-/*****************************************************************************

- * Copyright (c) 2012 ATOS.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * Olivier Mélois (ATOS) - Initial API and implementation

- *

- ******************************************************************************/

-package org.eclipse.papyrus.sysml.diagram.requirement.figure;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;

-

-public class CustomRequirementFigure extends ClassifierFigure {

-

-	/** The Attribute Compartment */

-	private final static String ATTRIBUTE_COMPARTMENT = "attributeCompartment";

-

-	/** The Operation Compartment */

-	private final static String OPERATION_COMPARTMENT = "operationCompartment";

-

-	/** The NestedClassifier Compartment */

-	private final static String NESTEDCLASSIFIER_COMPARTMENT = "nestedClassifierCompartment";

-

-	/** The RequirementIdInformation Compartment */

-	private final static String REQUIREMENT_ID_INFO_COMPARTMENT = "requirementIdInformationCompartment";

-

-	/** The List of Compartment */

-	private final static List<String> COMPARTMENT = new ArrayList<String>() {

-

-		private static final long serialVersionUID = 1L;

-		{

-			add(ATTRIBUTE_COMPARTMENT);

-			add(OPERATION_COMPARTMENT);

-			add(NESTEDCLASSIFIER_COMPARTMENT);

-			add(REQUIREMENT_ID_INFO_COMPARTMENT);

-		}

-	};

-

-	public CustomRequirementFigure() {

-		super();

-		createContentPane(COMPARTMENT);

-	}

-

-	public IFigure getRequirementIdInformationCompartmentFigure() {

-		return getCompartment(REQUIREMENT_ID_INFO_COMPARTMENT);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 ATOS.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Olivier Mélois (ATOS) - Initial API and implementation
+ *
+ ******************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.requirement.figure;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
+
+public class CustomRequirementFigure extends ClassFigure {
+
+	/** The Attribute Compartment */
+	private final static String ATTRIBUTE_COMPARTMENT = "attributeCompartment";
+
+	/** The Operation Compartment */
+	private final static String OPERATION_COMPARTMENT = "operationCompartment";
+
+	/** The NestedClassifier Compartment */
+	private final static String NESTEDCLASSIFIER_COMPARTMENT = "nestedClassifierCompartment";
+
+	/** The RequirementIdInformation Compartment */
+	private final static String REQUIREMENT_ID_INFO_COMPARTMENT = "requirementIdInformationCompartment";
+
+	/** The List of Compartment */
+	private final static List<String> COMPARTMENT = new ArrayList<String>() {
+
+		private static final long serialVersionUID = 1L;
+		{
+			add(ATTRIBUTE_COMPARTMENT);
+			add(OPERATION_COMPARTMENT);
+			add(NESTEDCLASSIFIER_COMPARTMENT);
+			add(REQUIREMENT_ID_INFO_COMPARTMENT);
+		}
+	};
+
+	public CustomRequirementFigure() {
+		super();
+		createContentPane(COMPARTMENT);
+	}
+
+	public IFigure getRequirementIdInformationCompartmentFigure() {
+		return getCompartment(REQUIREMENT_ID_INFO_COMPARTMENT);
+	}
+}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/META-INF/MANIFEST.MF
index 99c0c8cf0d8..c79d2d7477a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
 Manifest-Version: 1.0

 Export-Package: org.eclipse.papyrus.sysml.diagram.ui

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.7.0",

  org.eclipse.jface;bundle-version="3.8.0",

  org.eclipse.ui,

  org.eclipse.ui.ide;bundle-version="3.8.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.sysml.diagram.ui.Activator

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/pom.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/pom.xml
index 5152814a814..aee1c16a63a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/pom.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.diagram.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/META-INF/MANIFEST.MF b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/META-INF/MANIFEST.MF
index 17417f08d6f..4b6620dc5be 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/META-INF/MANIFEST.MF
@@ -1,37 +1,37 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.sysml;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml;bundle-version="1.1.0",

  org.eclipse.swt,

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

  org.eclipse.ui.navigator;bundle-version="3.5.0",

- org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.1.0",

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.modelexplorer;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.modelexplorer;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.0",

  org.eclipse.emf.edit.ui,

- org.eclipse.papyrus.infra.newchild;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.newchild;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.sysml.modelexplorer

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .,

  bin

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.sysml.modelexplorer.Activator

diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/pom.xml b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/pom.xml
index f3c684991da..97734e03597 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/pom.xml
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.modelexplorer</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF
index 11d1371f573..c52f77a07a2 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.sysml;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.nattable.menu;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.nattable.menu;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

- org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

  org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",

  org.eclipse.core.expressions

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.sysml.nattable.allocation.config

  .Activator

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/pom.xml b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/pom.xml
index 8657e5446c9..4d3eb8e1c02 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/pom.xml
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.nattable.allocation.config</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/META-INF/MANIFEST.MF
index 65cc7796189..f5860fb8edd 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.sysml.nattable.allocation.config;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1"

+ org.eclipse.papyrus.sysml.nattable.allocation.config;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.sysml.nattable.allocation.Activa

  tor

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/pom.xml b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/pom.xml
index 805aef6f6d3..a16f44c08a8 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/pom.xml
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.nattable.allocation</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF
index cca1ed086bf..cf1e0963324 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.sysml.nattable.menu.handlers

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

  org.eclipse.core.expressions;bundle-version="3.4.500",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

  org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.sysml.nattable.menu.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/pom.xml b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/pom.xml
index dd3c900d6eb..e28c829a4e8 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/pom.xml
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.nattable.menu</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF
index b1fa76bff0f..bc40abec2b2 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.sysml.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.sysml.nattable.requirement.confi

  g.Activator

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/pom.xml b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/pom.xml
index 0494b262f34..1cb2ef6c2d7 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/pom.xml
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.nattable.requirement.config</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF
index 9bb7c1c2a41..3a6af60cf6e 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

  org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",

- org.eclipse.papyrus.uml.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.sysml;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.nattable.requirement.config;bundle-version="1.0.1"

+ org.eclipse.papyrus.sysml;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.nattable.requirement.config;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.sysml.nattable.requirement.Activ

  ator

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/pom.xml b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/pom.xml
index 02fe84e8bd4..1a432d04381 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/pom.xml
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.nattable.requirement</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF
index ac0ef4a3852..e3797e7a7e2 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.sysml.nattable.manager.axis

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.1.0",

  org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.service.types;bundle-version="1.1.0",

  org.eclipse.emf.edit;bundle-version="2.9.0",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.sysml.nattable.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/pom.xml b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/pom.xml
index e3f7080c731..39da6ce5c2c 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/pom.xml
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.nattable</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/META-INF/MANIFEST.MF b/plugins/sysml/org.eclipse.papyrus.sysml.edit/META-INF/MANIFEST.MF
index 5adcf7c10b4..576b8211bea 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/META-INF/MANIFEST.MF
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.sysml;bundle-version="1.0.1";visibility:=reexport,

+Require-Bundle: org.eclipse.papyrus.sysml;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.core.runtime;bundle-version="3.6.0",

  org.eclipse.emf.edit;bundle-version="2.8.0",

  org.eclipse.emf.ecore;visibility:=reexport,

@@ -23,7 +23,7 @@ Export-Package: org.eclipse.papyrus.sysml.activities.provider,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.sysml.provider.SysmlEditPlugin$I

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/pom.xml b/plugins/sysml/org.eclipse.papyrus.sysml.edit/pom.xml
index c64ed4a2e49..56e16552573 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/pom.xml
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF
index f844fe271cd..eaa162aad73 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF
@@ -10,19 +10,19 @@ Export-Package: org.eclipse.papyrus.sysml.service.types,
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.uml2.uml;bundle-version="5.0.0",

- org.eclipse.papyrus.sysml;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.core.expressions,

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.sysml.service.types.Activator

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/pom.xml b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/pom.xml
index 05d21257d4c..b53f4713193 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/pom.xml
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.service.types</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/META-INF/MANIFEST.MF b/plugins/sysml/org.eclipse.papyrus.sysml/META-INF/MANIFEST.MF
index 07d373e9f0e..9918f4c5ffd 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/META-INF/MANIFEST.MF
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

  org.eclipse.core.runtime,

  org.eclipse.emf.ecore,

  org.eclipse.emf.ecore.xmi,

@@ -42,7 +42,7 @@ Export-Package: org.eclipse.papyrus.sysml,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/pom.xml b/plugins/sysml/org.eclipse.papyrus.sysml/pom.xml
index 3e2b9d8e3ca..3ed90bf843b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/pom.xml
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF
index 7e8d8e10915..2ef892d8672 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.properties;bundle-version="1.0.1"

+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.properties;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.sysml.properties.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/pom.xml b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/pom.xml
index 09e137fd611..bdc74947015 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/pom.xml
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml.properties</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF b/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF
index ad8bedfb957..79293417f11 100644
--- a/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF
+++ b/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
 Manifest-Version: 1.0

 Export-Package: org.eclipse.papyrus.team.svn

-Require-Bundle: org.eclipse.papyrus.infra.onefile;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.onefile;bundle-version="1.1.0",

  org.eclipse.team.svn.ui;resolution:=optional,

  org.eclipse.gmf.runtime.common.core,

  org.eclipse.emf.ecore,

  org.eclipse.team.svn.core;resolution:=optional,

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.emf.edit,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0",

  org.eclipse.team.core;bundle-version="3.7.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.team.svn.Activator

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF
index 503d53df711..391c0b1b9ce 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.uml.alf.common;bundle-version="1.0.1";visibility:=reexport,

+Require-Bundle: org.eclipse.papyrus.uml.alf.common;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.xtext.ui,

  org.eclipse.ui.editors;bundle-version="3.5.0",

  org.eclipse.ui.ide;bundle-version="3.5.0",

@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.papyrus.uml.alf.common;bundle-version="1.0.1";visibi
  org.eclipse.ui,

  org.antlr.runtime

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.alf.ui.internal.CommonActiva

  tor

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/pom.xml b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/pom.xml
index 0a9a9e0ef54..ee8ddc56ec9 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/pom.xml
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.alf.common.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF
index 837e5245279..62f5cc2d0f0 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF
@@ -13,10 +13,10 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
  org.eclipse.emf.mwe2.launch;resolution:=optional,

  org.eclipse.xtext.util,

  org.antlr.runtime,

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/pom.xml b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/pom.xml
index 233d3658f6c..637a8f692e6 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/pom.xml
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.alf.common</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF
index c86fec068e8..74002278f94 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF
@@ -14,12 +14,12 @@ Require-Bundle: org.eclipse.xtext.ui,
  org.eclipse.xtext.builder,

  org.antlr.runtime,

  org.eclipse.uml2.uml;bundle-version="3.2.0",

- org.eclipse.papyrus.uml.alf;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.alf;bundle-version="1.1.0",

  org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.alf.ui.internal.AlfActivator

 Import-Package: org.apache.log4j

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/pom.xml b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/pom.xml
index 3858c6d2c98..ae1004d6611 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/pom.xml
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.alf.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF
index cc83e3057a3..7f063e116b0 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF
@@ -25,17 +25,17 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.emf.common,

  org.antlr.runtime,

  org.eclipse.uml2.uml;bundle-version="3.2.0",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.apache.log4j;bundle-version="1.2.15",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

  org.eclipse.jface;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.alf.common;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/pom.xml b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/pom.xml
index 09dd27021c9..7739f339633 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/pom.xml
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.alf</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
index 050672a48f1..61f54cb3b68 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
@@ -36,10 +36,10 @@ Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.ui.navigator.resources,

  org.eclipse.gmf.runtime.diagram.ui.properties,

  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

  org.eclipse.ocl.ecore,

  org.eclipse.core.runtime,

  org.eclipse.core.resources,

@@ -54,26 +54,26 @@ Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.gmf.runtime.draw2d.ui,

  org.eclipse.uml2.uml,

  org.eclipse.emf.validation,

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.jface,

  org.eclipse.ui.views,

  org.eclipse.emf.ecore,

@@ -85,11 +85,11 @@ Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.emf.validation.ocl;visibility:=reexport,

  org.eclipse.gef,

  org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.activity.part.UMLDia

  gramEditorPlugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/editpolicy/ExpansionRegionCompartmentDnDEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/editpolicy/ExpansionRegionCompartmentDnDEditPolicy.java
new file mode 100644
index 00000000000..434d6b32b88
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/editpolicy/ExpansionRegionCompartmentDnDEditPolicy.java
@@ -0,0 +1,77 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.activity.activitygroup.editpolicy;
+
+import org.eclipse.core.commands.operations.IUndoableOperation;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
+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.DropObjectsRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ExpansionNodeAsInEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ExpansionNodeAsOutEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityGroupCustomDragAndDropEditPolicy;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.ExpansionNode;
+
+
+public class ExpansionRegionCompartmentDnDEditPolicy extends ActivityGroupCustomDragAndDropEditPolicy {
+
+	@Override
+	protected IUndoableOperation getDropObjectCommand(DropObjectsRequest dropRequest, EObject droppedObject) {
+		if (isExpansionNode(droppedObject)) {
+			return dropExpansionNode((ExpansionNode) droppedObject);
+		}
+		return super.getDropObjectCommand(dropRequest, droppedObject);
+	}
+
+	public IUndoableOperation dropExpansionNode(ExpansionNode expNode) {
+		int visualID = 0;
+		if (expNode.getRegionAsInput() != null) {
+			visualID = ExpansionNodeAsInEditPart.VISUAL_ID;
+		} else {
+			visualID = ExpansionNodeAsOutEditPart.VISUAL_ID;
+		}
+		CompositeCommand wrapCommand = new CompositeCommand("Wrap drop command");
+		IGraphicalEditPart graphicalParent;
+		if (getHost() instanceof ShapeCompartmentEditPart) {
+			graphicalParent = (IGraphicalEditPart) getHost().getParent();
+		} else {
+			graphicalParent = (IGraphicalEditPart) getHost();
+		}
+		wrapCommand.add(getCreateViewCommand(graphicalParent, expNode, visualID));
+		return wrapCommand;
+	}
+
+	protected ICommand getCreateViewCommand(IGraphicalEditPart parent, Element droppedElement, int nodeVISUALID) {
+		IAdaptable elementAdapter = new EObjectAdapter(droppedElement);
+		ViewDescriptor descriptor = new ViewDescriptor(elementAdapter, Node.class, ((IHintedType) getUMLElementType(nodeVISUALID)).getSemanticHint(), ViewUtil.APPEND, true, getDiagramPreferencesHint());
+
+		CreateCommand c = new CreateCommand(getEditingDomain(), descriptor, parent.getPrimaryView());
+
+		return c.canExecute() ? c : org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
+	}
+
+	private boolean isExpansionNode(EObject droppedElement) {
+		return droppedElement instanceof ExpansionNode;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/groupcontainment/ActivityPartitionContainment.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/groupcontainment/ActivityPartitionContainment.java
index efaec4f5935..7f86b2aa55e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/groupcontainment/ActivityPartitionContainment.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/groupcontainment/ActivityPartitionContainment.java
@@ -62,6 +62,7 @@ public class ActivityPartitionContainment extends AbstractContainerNodeDescripto
 		references.add(UMLPackage.eINSTANCE.getActivityPartition_Node());

 		references.add(UMLPackage.eINSTANCE.getActivityPartition_Edge());

 		references.add(UMLPackage.eINSTANCE.getActivityPartition_Subpartition());

+		references.add(UMLPackage.eINSTANCE.getElement_OwnedComment());

 		return references;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen
index a003a279c10..5aa284933f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen
@@ -3564,7 +3564,7 @@
       <compartments visualID="7009" editPartClassName="ExpansionRegionStructuredActivityNodeContentCompartmentEditPart" itemSemanticEditPolicyClassName="ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy" notationViewFactoryClassName="ExpansionRegionStructuredActivityNodeContentCompartmentViewFactory" canonicalEditPolicyClassName="ExpansionRegionStructuredActivityNodeContentCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.34 /0/@diagram/@childNodes.35 /0/@diagram/@childNodes.36 /0/@diagram/@childNodes.37 /0/@diagram/@childNodes.44 /0/@diagram/@childNodes.52 /0/@diagram/@childNodes.54 /0/@diagram/@childNodes.56 /0/@diagram/@childNodes.57 /0/@diagram/@childNodes.60 /0/@diagram/@childNodes.64 /0/@diagram/@childNodes.65 /0/@diagram/@childNodes.70 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.73 /0/@diagram/@childNodes.76 /0/@diagram/@childNodes.79 /0/@diagram/@childNodes.83 /0/@diagram/@childNodes.85 /0/@diagram/@childNodes.87 /0/@diagram/@childNodes.90 /0/@diagram/@childNodes.92 /0/@diagram/@childNodes.69 /0/@diagram/@childNodes.93" title="StructuredActivityNodeContentCompartment" canCollapse="false" needsTitle="false" node="/0/@diagram/@childNodes.57" listLayout="false">
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getStructuredActivityNodeCompartment" figureQualifiedClassName="org.eclipse.draw2d.RoundedRectangle"/>
-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityGroupCustomDragAndDropEditPolicy"/>
+        <behaviour xsi:type="gmfgen:CustomBehaviour" key="EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.activitygroup.editpolicy.ExpansionRegionCompartmentDnDEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;RemoveOrphanView&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.RemoveOrphanViewPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.CustomExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/pom.xml
index 7c9fb8a51f2..10abe562838 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.activity</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityEditPart.java
index 09aade5f514..6e8043a5c2d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityEditPart.java
@@ -19,7 +19,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -47,6 +46,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityCanonicalEditPolicy;

@@ -374,8 +374,8 @@ public class ActivityEditPart extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -384,8 +384,8 @@ public class ActivityEditPart extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityEditPartCN.java
index bd213f3b4ef..b5efac4d378 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityEditPartCN.java
@@ -6,7 +6,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -34,6 +33,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityCanonicalEditPolicy;

@@ -366,8 +366,8 @@ public class ActivityEditPartCN extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -376,8 +376,8 @@ public class ActivityEditPartCN extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityFinalNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityFinalNodeEditPart.java
index 9ef33c3eeec..da2531bdced 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityFinalNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityFinalNodeEditPart.java
@@ -19,7 +19,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -49,6 +48,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -276,8 +276,8 @@ public class ActivityFinalNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -286,8 +286,8 @@ public class ActivityFinalNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityParameterNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityParameterNodeEditPart.java
index 5af9aaa51f1..2764f52743a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityParameterNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityParameterNodeEditPart.java
@@ -22,7 +22,6 @@ import org.eclipse.draw2d.GridLayout;
 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.Label;

 import org.eclipse.draw2d.RectangleFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.emf.common.notify.Notification;

@@ -46,6 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityParameterNodeItemSemanticEditPolicy;

@@ -286,8 +286,8 @@ public class ActivityParameterNodeEditPart extends BorderNamedElementEditPart im
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -296,8 +296,8 @@ public class ActivityParameterNodeEditPart extends BorderNamedElementEditPart im
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityPartitionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityPartitionEditPart.java
index 04e8dd4d3fc..68813859507 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityPartitionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityPartitionEditPart.java
@@ -18,7 +18,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -40,6 +39,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityPartitionItemSemanticEditPolicy;

@@ -296,8 +296,8 @@ public class ActivityPartitionEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -306,8 +306,8 @@ public class ActivityPartitionEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AddStructuralFeatureValueActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AddStructuralFeatureValueActionEditPart.java
index 112e5318080..30dd86cd233 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AddStructuralFeatureValueActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AddStructuralFeatureValueActionEditPart.java
@@ -7,7 +7,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.command.CommandStack;

 import org.eclipse.emf.common.notify.Notification;

@@ -39,6 +38,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -323,8 +323,8 @@ public class AddStructuralFeatureValueActionEditPart extends AbstractBorderedSha
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -333,8 +333,8 @@ public class AddStructuralFeatureValueActionEditPart extends AbstractBorderedSha
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AddVariableValueActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AddVariableValueActionEditPart.java
index 88e38fa066f..ea79cdff185 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AddVariableValueActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AddVariableValueActionEditPart.java
@@ -7,7 +7,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.command.CommandStack;

 import org.eclipse.emf.common.notify.Notification;

@@ -38,6 +37,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -310,8 +310,8 @@ public class AddVariableValueActionEditPart extends AbstractBorderedShapeEditPar
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -320,8 +320,8 @@ public class AddVariableValueActionEditPart extends AbstractBorderedShapeEditPar
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/BroadcastSignalActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/BroadcastSignalActionEditPart.java
index 9151842809e..818ff46d29e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/BroadcastSignalActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/BroadcastSignalActionEditPart.java
@@ -6,7 +6,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.gef.EditPart;

@@ -31,6 +30,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -289,8 +289,8 @@ public class BroadcastSignalActionEditPart extends AbstractBorderedShapeEditPart
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -299,8 +299,8 @@ public class BroadcastSignalActionEditPart extends AbstractBorderedShapeEditPart
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CallBehaviorActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CallBehaviorActionEditPart.java
index 597d75f23fb..0e52ab4631c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CallBehaviorActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CallBehaviorActionEditPart.java
@@ -19,7 +19,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -45,6 +44,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -385,8 +385,8 @@ public class CallBehaviorActionEditPart extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -395,8 +395,8 @@ public class CallBehaviorActionEditPart extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CallOperationActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CallOperationActionEditPart.java
index ffa899be14c..c99f30a574a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CallOperationActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CallOperationActionEditPart.java
@@ -19,7 +19,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -45,6 +44,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -382,8 +382,8 @@ public class CallOperationActionEditPart extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -392,8 +392,8 @@ public class CallOperationActionEditPart extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CentralBufferNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CentralBufferNodeEditPart.java
index 6d226a2aa9d..61376cef273 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CentralBufferNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CentralBufferNodeEditPart.java
@@ -7,7 +7,6 @@ import java.util.List;
 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.MarginBorder;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -33,6 +32,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.BehaviorPropertyNodeEditPolicy;

@@ -278,8 +278,8 @@ public class CentralBufferNodeEditPart extends AbstractBorderedShapeEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -288,8 +288,8 @@ public class CentralBufferNodeEditPart extends AbstractBorderedShapeEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CommentEditPartCN.java
index e5f154deb68..4835fa028ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CommentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CommentEditPartCN.java
@@ -17,7 +17,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -39,6 +38,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -275,8 +275,8 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -285,8 +285,8 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConditionalNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConditionalNodeEditPart.java
index 9af25a841a6..266ca85aeb7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConditionalNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConditionalNodeEditPart.java
@@ -18,7 +18,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -40,6 +39,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.draw2d.StructuredActivityNodeFigure;

@@ -296,8 +296,8 @@ public class ConditionalNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -306,8 +306,8 @@ public class ConditionalNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPostcondEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPostcondEditPart.java
index 25de4e7d310..fe3a3392cdf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPostcondEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPostcondEditPart.java
@@ -18,7 +18,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -40,6 +39,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -285,8 +285,8 @@ public class ConstraintAsLocalPostcondEditPart extends AbstractConstraintEditPar
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -295,8 +295,8 @@ public class ConstraintAsLocalPostcondEditPart extends AbstractConstraintEditPar
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPrecondEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPrecondEditPart.java
index 97f1f34e242..57408c098b5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPrecondEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPrecondEditPart.java
@@ -18,7 +18,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -40,6 +39,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -285,8 +285,8 @@ public class ConstraintAsLocalPrecondEditPart extends AbstractConstraintEditPart
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -295,8 +295,8 @@ public class ConstraintAsLocalPrecondEditPart extends AbstractConstraintEditPart
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintEditPartCN.java
index 67a556d81b5..2c0a30bf83e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintEditPartCN.java
@@ -5,7 +5,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -27,6 +26,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -270,8 +270,8 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -280,8 +280,8 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CreateObjectActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CreateObjectActionEditPart.java
index e6a45c1e66a..00139e09363 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CreateObjectActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CreateObjectActionEditPart.java
@@ -7,7 +7,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.command.CommandStack;

 import org.eclipse.emf.common.notify.Notification;

@@ -38,6 +37,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -297,8 +297,8 @@ public class CreateObjectActionEditPart extends AbstractBorderedShapeEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -307,8 +307,8 @@ public class CreateObjectActionEditPart extends AbstractBorderedShapeEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DataStoreNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DataStoreNodeEditPart.java
index 143f42069fa..ce7dad38383 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DataStoreNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DataStoreNodeEditPart.java
@@ -20,7 +20,6 @@ import java.util.List;
 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.MarginBorder;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.emf.common.notify.Notification;

@@ -47,6 +46,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.BehaviorPropertyNodeEditPolicy;

@@ -320,8 +320,8 @@ public class DataStoreNodeEditPart extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -330,8 +330,8 @@ public class DataStoreNodeEditPart extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DecisionNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DecisionNodeEditPart.java
index 8a02d557844..3d42ce41e7a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DecisionNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DecisionNodeEditPart.java
@@ -19,7 +19,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.emf.common.notify.Notification;

@@ -43,6 +42,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -251,8 +251,8 @@ public class DecisionNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -261,8 +261,8 @@ public class DecisionNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DestroyObjectActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DestroyObjectActionEditPart.java
index 0ffd2fb2241..bb287261a49 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DestroyObjectActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DestroyObjectActionEditPart.java
@@ -6,7 +6,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.gef.EditPart;

@@ -31,6 +30,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -289,8 +289,8 @@ public class DestroyObjectActionEditPart extends AbstractBorderedShapeEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -299,8 +299,8 @@ public class DestroyObjectActionEditPart extends AbstractBorderedShapeEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DurationConstraintAsLocalPostcondEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DurationConstraintAsLocalPostcondEditPart.java
index 7ade58fd800..363fcecb494 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DurationConstraintAsLocalPostcondEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DurationConstraintAsLocalPostcondEditPart.java
@@ -18,7 +18,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -40,6 +39,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -285,8 +285,8 @@ public class DurationConstraintAsLocalPostcondEditPart extends AbstractConstrain
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -295,8 +295,8 @@ public class DurationConstraintAsLocalPostcondEditPart extends AbstractConstrain
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DurationConstraintAsLocalPrecondEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DurationConstraintAsLocalPrecondEditPart.java
index 093f8b8f9f7..3f7097b3d6b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DurationConstraintAsLocalPrecondEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DurationConstraintAsLocalPrecondEditPart.java
@@ -18,7 +18,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -40,6 +39,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -285,8 +285,8 @@ public class DurationConstraintAsLocalPrecondEditPart extends AbstractConstraint
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -295,8 +295,8 @@ public class DurationConstraintAsLocalPrecondEditPart extends AbstractConstraint
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionRegionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionRegionEditPart.java
index 0ffa5152da2..79e7a961c16 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionRegionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionRegionEditPart.java
@@ -19,7 +19,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -44,6 +43,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.draw2d.StructuredActivityNodeFigure;

@@ -331,8 +331,8 @@ public class ExpansionRegionEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -341,8 +341,8 @@ public class ExpansionRegionEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionRegionStructuredActivityNodeContentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionRegionStructuredActivityNodeContentCompartmentEditPart.java
index f8a4427c9f4..e9eda154aee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionRegionStructuredActivityNodeContentCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionRegionStructuredActivityNodeContentCompartmentEditPart.java
@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityGroupCustomDragAndDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.activity.activitygroup.editpolicy.ExpansionRegionCompartmentDnDEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CustomExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.RemoveOrphanViewPolicy;

@@ -85,7 +85,7 @@ public class ExpansionRegionStructuredActivityNodeContentCompartmentEditPart ext
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 		// in Papyrus diagrams are not strongly synchronised

 		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.activity.edit.policies.ExpansionRegionStructuredActivityNodeContentCompartmentCanonicalEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ActivityGroupCustomDragAndDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ExpansionRegionCompartmentDnDEditPolicy());

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/FlowFinalNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/FlowFinalNodeEditPart.java
index 63df1991f20..23ddbf5a2c9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/FlowFinalNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/FlowFinalNodeEditPart.java
@@ -19,7 +19,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -49,6 +48,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -275,8 +275,8 @@ public class FlowFinalNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -285,8 +285,8 @@ public class FlowFinalNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ForkNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ForkNodeEditPart.java
index a28a1745994..8d8092f470e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ForkNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ForkNodeEditPart.java
@@ -19,7 +19,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -46,6 +45,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -278,8 +278,8 @@ public class ForkNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -288,8 +288,8 @@ public class ForkNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InitialNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InitialNodeEditPart.java
index e9f5d334c73..7f3f7f96ad6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InitialNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InitialNodeEditPart.java
@@ -19,7 +19,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -49,6 +48,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -275,8 +275,8 @@ public class InitialNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -285,8 +285,8 @@ public class InitialNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InterruptibleActivityRegionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InterruptibleActivityRegionEditPart.java
index 4031b9eeb48..9b1823ad83e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InterruptibleActivityRegionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InterruptibleActivityRegionEditPart.java
@@ -18,7 +18,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -41,6 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InterruptibleActivityRegionItemSemanticEditPolicy;

@@ -230,8 +230,8 @@ public class InterruptibleActivityRegionEditPart extends NodeEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -240,8 +240,8 @@ public class InterruptibleActivityRegionEditPart extends NodeEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/IntervalConstraintAsLocalPostcondEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/IntervalConstraintAsLocalPostcondEditPart.java
index 67e4ac3fe51..1474d8b5013 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/IntervalConstraintAsLocalPostcondEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/IntervalConstraintAsLocalPostcondEditPart.java
@@ -18,7 +18,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -40,6 +39,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -285,8 +285,8 @@ public class IntervalConstraintAsLocalPostcondEditPart extends AbstractConstrain
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -295,8 +295,8 @@ public class IntervalConstraintAsLocalPostcondEditPart extends AbstractConstrain
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/IntervalConstraintAsLocalPrecondEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/IntervalConstraintAsLocalPrecondEditPart.java
index 5bfb0e96e25..41701e3edc7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/IntervalConstraintAsLocalPrecondEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/IntervalConstraintAsLocalPrecondEditPart.java
@@ -18,7 +18,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -40,6 +39,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -285,8 +285,8 @@ public class IntervalConstraintAsLocalPrecondEditPart extends AbstractConstraint
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -295,8 +295,8 @@ public class IntervalConstraintAsLocalPrecondEditPart extends AbstractConstraint
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/JoinNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/JoinNodeEditPart.java
index 29fa2838188..c147eebd551 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/JoinNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/JoinNodeEditPart.java
@@ -19,7 +19,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -46,6 +45,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -282,8 +282,8 @@ public class JoinNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -292,8 +292,8 @@ public class JoinNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/LoopNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/LoopNodeEditPart.java
index 3dcc083718d..c7c29ef254a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/LoopNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/LoopNodeEditPart.java
@@ -19,7 +19,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -45,6 +44,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.draw2d.StructuredActivityNodeFigure;

@@ -351,8 +351,8 @@ public class LoopNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -361,8 +361,8 @@ public class LoopNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/MergeNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/MergeNodeEditPart.java
index 67079bd0c91..38551aaaace 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/MergeNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/MergeNodeEditPart.java
@@ -19,7 +19,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.emf.common.notify.Notification;

@@ -46,6 +45,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -259,8 +259,8 @@ public class MergeNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -269,8 +269,8 @@ public class MergeNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OpaqueActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OpaqueActionEditPart.java
index eb54ef6b6e9..176c4cfa316 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OpaqueActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OpaqueActionEditPart.java
@@ -19,7 +19,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -45,6 +44,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -349,8 +349,8 @@ public class OpaqueActionEditPart extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -359,8 +359,8 @@ public class OpaqueActionEditPart extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadSelfActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadSelfActionEditPart.java
index 7f858cde101..e6c35510ce3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadSelfActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadSelfActionEditPart.java
@@ -6,7 +6,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -32,6 +31,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -305,8 +305,8 @@ public class ReadSelfActionEditPart extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -315,8 +315,8 @@ public class ReadSelfActionEditPart extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadStructuralFeatureActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadStructuralFeatureActionEditPart.java
index 95751584887..763ef4064e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadStructuralFeatureActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadStructuralFeatureActionEditPart.java
@@ -7,7 +7,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.command.CommandStack;

 import org.eclipse.emf.common.notify.Notification;

@@ -38,6 +37,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -311,8 +311,8 @@ public class ReadStructuralFeatureActionEditPart extends AbstractBorderedShapeEd
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -321,8 +321,8 @@ public class ReadStructuralFeatureActionEditPart extends AbstractBorderedShapeEd
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadVariableActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadVariableActionEditPart.java
index f9079109ba4..4338228eec0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadVariableActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadVariableActionEditPart.java
@@ -7,7 +7,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.command.CommandStack;

 import org.eclipse.emf.common.notify.Notification;

@@ -38,6 +37,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -299,8 +299,8 @@ public class ReadVariableActionEditPart extends AbstractBorderedShapeEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -309,8 +309,8 @@ public class ReadVariableActionEditPart extends AbstractBorderedShapeEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SendObjectActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SendObjectActionEditPart.java
index cc2f0230e3d..573f4492877 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SendObjectActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SendObjectActionEditPart.java
@@ -19,7 +19,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -44,6 +43,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -372,8 +372,8 @@ public class SendObjectActionEditPart extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -382,8 +382,8 @@ public class SendObjectActionEditPart extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SendSignalActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SendSignalActionEditPart.java
index 002d52edc2f..851d6540c38 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SendSignalActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SendSignalActionEditPart.java
@@ -19,7 +19,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -44,6 +43,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CreateActionLocalConditionEditPolicy;

@@ -369,8 +369,8 @@ public class SendSignalActionEditPart extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -379,8 +379,8 @@ public class SendSignalActionEditPart extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SequenceNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SequenceNodeEditPart.java
index b346e875894..f06cd10efaa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SequenceNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SequenceNodeEditPart.java
@@ -18,7 +18,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -40,6 +39,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.draw2d.StructuredActivityNodeFigure;

@@ -291,8 +291,8 @@ public class SequenceNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -301,8 +301,8 @@ public class SequenceNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ShapeNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ShapeNamedElementEditPart.java
index b4dac85db72..e6d8914a11a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ShapeNamedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ShapeNamedElementEditPart.java
@@ -18,7 +18,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -44,6 +43,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -263,8 +263,8 @@ public class ShapeNamedElementEditPart extends AbstractShapeEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -273,8 +273,8 @@ public class ShapeNamedElementEditPart extends AbstractShapeEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/StructuredActivityNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/StructuredActivityNodeEditPart.java
index 30cc852d796..c8256b0524c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/StructuredActivityNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/StructuredActivityNodeEditPart.java
@@ -18,7 +18,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -40,6 +39,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.draw2d.StructuredActivityNodeFigure;

@@ -291,8 +291,8 @@ public class StructuredActivityNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -301,8 +301,8 @@ public class StructuredActivityNodeEditPart extends UMLNodeEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/TimeConstraintAsLocalPostcondEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/TimeConstraintAsLocalPostcondEditPart.java
index fe907f47f80..5b42540a2eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/TimeConstraintAsLocalPostcondEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/TimeConstraintAsLocalPostcondEditPart.java
@@ -18,7 +18,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -40,6 +39,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -285,8 +285,8 @@ public class TimeConstraintAsLocalPostcondEditPart extends AbstractConstraintEdi
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -295,8 +295,8 @@ public class TimeConstraintAsLocalPostcondEditPart extends AbstractConstraintEdi
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/TimeConstraintAsLocalPrecondEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/TimeConstraintAsLocalPrecondEditPart.java
index cfa2559ee0c..abc5f1137c8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/TimeConstraintAsLocalPrecondEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/TimeConstraintAsLocalPrecondEditPart.java
@@ -18,7 +18,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -40,6 +39,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -285,8 +285,8 @@ public class TimeConstraintAsLocalPrecondEditPart extends AbstractConstraintEdit
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -295,8 +295,8 @@ public class TimeConstraintAsLocalPrecondEditPart extends AbstractConstraintEdit
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValueSpecificationActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValueSpecificationActionEditPart.java
index afd9bb79e0b..1f919323769 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValueSpecificationActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValueSpecificationActionEditPart.java
@@ -19,7 +19,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -45,6 +44,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

@@ -318,8 +318,8 @@ public class ValueSpecificationActionEditPart extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -328,8 +328,8 @@ public class ValueSpecificationActionEditPart extends NamedElementEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
index 3a5e38a9b5b..339f42de9af 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
@@ -37,12 +37,12 @@ Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.gmf.runtime.diagram.ui.properties,
  org.eclipse.gmf.runtime.diagram.ui.render,
  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",
  org.eclipse.ocl.ecore,
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",
+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.3.0",
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
@@ -55,21 +55,21 @@ Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.uml2.uml,
  org.eclipse.gmf.runtime.draw2d.ui,
  org.eclipse.ui,
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
  com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
  org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",
  org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
  org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",
  org.eclipse.jface,
@@ -87,11 +87,11 @@ Require-Bundle: org.eclipse.core.expressions,
  org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",
  org.w3c.dom.svg,
  org.apache.batik.css;bundle-version="[1.6.0,1.7.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1"
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz;singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/pom.xml
index f8f2c96c513..128f2128d97 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.clazz</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF
index 46f9004b56d..16be1a57e15 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF
@@ -9,15 +9,15 @@ Export-Package: org.eclipse.papyrus.uml.diagram.common.groups.commands,
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.gmf.runtime.diagram.ui.properties,

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

  org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.groups.Activa

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/pom.xml
index 545f0a4672f..3c62875b2c1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.common.groups</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
index ce155ee0fa5..04b6f4f9803 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
@@ -1,26 +1,26 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.ui.forms;bundle-version="3.5.100",

  com.google.guava;bundle-version="11.0.0",

  org.eclipse.emf.ecore;bundle-version="2.8.0",

  org.eclipse.gef;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

  org.eclipse.emf.edit.ui;bundle-version="2.8.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.common.palette.customaction.providers,

  org.eclipse.papyrus.uml.diagram.common.palette.customaction.swt,

  org.eclipse.papyrus.uml.diagram.common.palette.customaction.toolbox,

  org.eclipse.papyrus.uml.diagram.common.palette.customaction.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/pom.xml
index 64e6d6188ae..4b513ae39cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.common.palette.customaction</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
index 8d6c25cb702..56b73d09e3b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
@@ -2,7 +2,6 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.uml.diagram.common,

  org.eclipse.papyrus.uml.diagram.common.actions,

  org.eclipse.papyrus.uml.diagram.common.actions.handlers,

- org.eclipse.papyrus.uml.diagram.common.command.wrappers,

  org.eclipse.papyrus.uml.diagram.common.commands,

  org.eclipse.papyrus.uml.diagram.common.dialogs,

  org.eclipse.papyrus.uml.diagram.common.directedit,

@@ -16,7 +15,6 @@ Export-Package: org.eclipse.papyrus.uml.diagram.common,
  org.eclipse.papyrus.uml.diagram.common.figure.node,

  org.eclipse.papyrus.uml.diagram.common.handlers,

  org.eclipse.papyrus.uml.diagram.common.helper,

- org.eclipse.papyrus.uml.diagram.common.ids,

  org.eclipse.papyrus.uml.diagram.common.layout,

  org.eclipse.papyrus.uml.diagram.common.listeners,

  org.eclipse.papyrus.uml.diagram.common.locator,

@@ -47,46 +45,46 @@ Bundle-Name: %pluginName
 Bundle-Localization: plugin

 Created-By: 1.5.0_06-b05 (Sun Microsystems Inc.)

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor,

  org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.1.0",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.3.0",

  org.eclipse.ui,

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.actions,

  org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.0",

  org.eclipse.core.expressions,

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.navigation;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.navigation;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.printing,

  org.eclipse.gmf.runtime.diagram.ui.providers.ide,

- org.eclipse.papyrus.infra.services.decoration;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.decoration;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.uml.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",

  org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.jface,

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.localizer;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.localizer;bundle-version="1.1.0",

  org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",

  org.w3c.dom.svg,

  org.apache.batik.css;bundle-version="[1.6.0,1.7.0)",

@@ -94,16 +92,16 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
  org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",

  org.eclipse.core.databinding;bundle-version="1.4.1",

  org.eclipse.gmf.tooling.runtime,

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.modelrepair;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.modelrepair;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Ant-Version: Apache Ant 1.7.0

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Eclipse-BuddyPolicy: dependent

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml
index ebb18811b79..b32a0c21d47 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.common</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/Activator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/Activator.java
index bfef83e0a02..a349caecbdc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/Activator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/Activator.java
@@ -72,10 +72,10 @@ public class Activator extends AbstractUIPlugin {
 	protected static FontManager fontManager = /* new FontManager(); */null;
 
 	/** left Stereotype delimiters ('Guillemets francais'). */
-	public static String ST_LEFT = String.valueOf("\u00AB");
+	public static final String ST_LEFT = String.valueOf("\u00AB"); //$NON-NLS-1$
 
 	/** Right Stereotype delimiters ('Guillemets francais'). */
-	public static String ST_RIGHT = String.valueOf("\u00BB");
+	public static final String ST_RIGHT = String.valueOf("\u00BB"); //$NON-NLS-1$
 
 	/**
 	 * The constructor
@@ -557,7 +557,7 @@ public class Activator extends AbstractUIPlugin {
 	 * @return the composed adapter factory
 	 */
 	protected ComposedAdapterFactory createAdapterFactory() {
-		List factories = new ArrayList();
+		List<AdapterFactory> factories = new ArrayList<AdapterFactory>();
 		fillItemProviderFactories(factories);
 		return new ComposedAdapterFactory(factories);
 	}
@@ -571,7 +571,7 @@ public class Activator extends AbstractUIPlugin {
 	 *
 	 * @see org.eclipse.emf.edit.provider.ComposedAdapterFactory#getFactoryForTypes(java.util.Collection)
 	 */
-	protected void fillItemProviderFactories(List factories) {
+	protected void fillItemProviderFactories(List<AdapterFactory> factories) {
 		// custom icons for diagram elements
 		factories.add(new AlternativeUMLItemProviderAdapterFactory(getPreferenceStore()));
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/FilterViewsLabelItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/FilterViewsLabelItemProvider.java
deleted file mode 100644
index b6d61f6d79f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/FilterViewsLabelItemProvider.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte,
- * Generalitat de la Comunitat Valenciana .
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Francisco Javier Cano Muñoz (Prodevelop) - initial API implementation
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.actions;
-
-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider;
-import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IWorkbenchPage;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class FilterViewsLabelItemProvider.
- *
- * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
- */
-public class FilterViewsLabelItemProvider extends AbstractContributionItemProvider {
-
-	/** The Constant FILTER_VIEWS_AND_LABELS. */
-	private static final String FILTER_VIEWS_AND_LABELS = "filter_views_and_labels";
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @seeorg.eclipse.gmf.runtime.common.ui.services.action.contributionitem.
-	 * AbstractContributionItemProvider#createAction(java.lang.String,
-	 * org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor)
-	 */
-	@Override
-	protected IAction createAction(String actionId, IWorkbenchPartDescriptor partDescriptor) {
-		IWorkbenchPage page = partDescriptor.getPartPage();
-		if (FILTER_VIEWS_AND_LABELS.equals(actionId)) {
-			return new FilterViewsLabelsAction(page);
-		}
-		return super.createAction(actionId, partDescriptor);
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/FilterViewsLabelsAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/FilterViewsLabelsAction.java
deleted file mode 100644
index b9b7714bdca..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/FilterViewsLabelsAction.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte,
- * Generalitat de la Comunitat Valenciana .
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Francisco Javier Cano Muñoz (Prodevelop) - initial API implementation
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.actions;
-
-import java.util.Collection;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.uml.diagram.common.dialogs.SelectDiagramViewsFilterDialog;
-import org.eclipse.papyrus.uml.diagram.common.util.MDTUtil;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class FilterViewsLabelsAction.
- *
- * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
- */
-public class FilterViewsLabelsAction extends DiagramAction {
-
-	/**
-	 * Instantiates a new filter views labels action.
-	 *
-	 * @param workbenchPage
-	 *            the workbench page
-	 */
-	public FilterViewsLabelsAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-		setText("Filter views...");
-	}
-
-	/**
-	 * Instantiates a new filter views labels action.
-	 *
-	 * @param workbenchpart
-	 *            the workbenchpart
-	 */
-	// @unused
-	public FilterViewsLabelsAction(IWorkbenchPart workbenchpart) {
-		super(workbenchpart);
-		setText("Filter views...");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest
-	 * ()
-	 */
-	@Override
-	protected Request createTargetRequest() {
-		return new Request("none");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#isSelectionListener
-	 * ()
-	 */
-	@Override
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.jface.action.Action#isEnabled()
-	 */
-	@Override
-	public boolean isEnabled() {
-		return getDiagramEditPart() != null && getTransactionalEditingDomain() != null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#runWithEvent
-	 * (org.eclipse.swt .widgets.Event)
-	 */
-	@Override
-	public void runWithEvent(Event event) {
-		run();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#run()
-	 */
-	@Override
-	public void run() {
-		if (getDiagramEditPart() == null || getTransactionalEditingDomain() == null) {
-			return;
-		}
-		// // show dialog to user
-		SelectDiagramViewsFilterDialog dialog = new SelectDiagramViewsFilterDialog(Display.getCurrent().getActiveShell(), getDiagramEditPart());
-		int result = dialog.open();
-		// // filter the selected elements
-		if (result == Window.OK) {
-			executeCommand(dialog.getSelected());
-		}
-	}
-
-	/**
-	 * Gets the transactional editing domain.
-	 *
-	 * @return the transactional editing domain
-	 */
-	protected TransactionalEditingDomain getTransactionalEditingDomain() {
-		if (getDiagramEditPart() != null) {
-			EObject eObject = getDiagramEditPart().getNotationView();
-			return TransactionUtil.getEditingDomain(eObject);
-		}
-		if (getDiagramEditPart() != null) {
-			if (getDiagramEditPart().getDiagramEditDomain() instanceof TransactionalEditingDomain) {
-				return getDiagramEditPart().getEditingDomain();
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the diagram.
-	 *
-	 * @return the diagram
-	 */
-	protected Diagram getDiagram() {
-		if (getDiagramEditPart() != null) {
-			Diagram diagram = (Diagram) getDiagramEditPart().getNotationView();
-			return diagram;
-		}
-		return null;
-	}
-
-	/**
-	 * Execute command.
-	 *
-	 * @param infos
-	 *            the infos
-	 */
-	protected void executeCommand(final Collection<Integer> infos) {
-		final Diagram diagram = getDiagram();
-		AbstractTransactionalCommand command = new AbstractTransactionalCommand(getTransactionalEditingDomain(), "Add filter references", null) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-				MDTUtil.setElementsToFilterToDiagram(diagram, infos);
-				return null;
-			}
-		};
-		execute(new ICommandProxy(command), new NullProgressMonitor());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/FilterViewsLabelsPopupMenuContributionPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/FilterViewsLabelsPopupMenuContributionPolicy.java
deleted file mode 100644
index e7f161b6439..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/FilterViewsLabelsPopupMenuContributionPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte,
- * Generalitat de la Comunitat Valenciana .
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Francisco Javier Cano Muñoz (Prodevelop) - initial API implementation
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.actions;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.IPopupMenuContributionPolicy;
-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;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class FilterViewsLabelsPopupMenuContributionPolicy.
- *
- * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
- */
-public class FilterViewsLabelsPopupMenuContributionPolicy implements IPopupMenuContributionPolicy {
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.
-	 * IPopupMenuContributionPolicy
-	 * #appliesTo(org.eclipse.jface.viewers.ISelection,
-	 * org.eclipse.core.runtime.IConfigurationElement)
-	 */
-	@Override
-	public boolean appliesTo(ISelection selection, IConfigurationElement configuration) {
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection ss = (IStructuredSelection) selection;
-			for (Object o : ss.toList()) {
-				if (o instanceof IGraphicalEditPart) {
-					if (((IGraphicalEditPart) o).getNotationView() instanceof Diagram) {
-
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/LabelHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/LabelHelper.java
index aed582f15e9..b8ced1c962c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/LabelHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/LabelHelper.java
@@ -12,9 +12,7 @@
 package org.eclipse.papyrus.uml.diagram.common.actions;
 
 import java.util.Collection;
-import java.util.Iterator;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
@@ -105,36 +103,4 @@ public class LabelHelper {
 		// return childEClass.getName() + cpt;
 	}
 
-	/**
-	 * Check if a name is available.
-	 *
-	 * @param parentEObject
-	 *            the parent EObject
-	 * @param childEClass
-	 *            EClass of the new EObject to add
-	 * @param currentCpt
-	 *            the current cpt
-	 *
-	 * @return true if the name is available
-	 *
-	 * @deprecated should not be used.
-	 */
-	// @unused
-	@Deprecated
-	private boolean isNameAvailable(EObject parentEObject, EClass childEClass, int currentCpt) {
-		EList<EObject> list = parentEObject.eContents();
-		for (Iterator<EObject> i = list.iterator(); i.hasNext();) {
-			EObject child = i.next();
-
-			// check if the current child is the same type of the childEObject
-			if (childEClass.getName().equals(child.eClass().getName())) {
-				String nameToMatch = child.eClass().getName() + currentCpt;
-				if (nameToMatch.equals(((NamedElement) child).getName())) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/MoveCompartmentObjectAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/MoveCompartmentObjectAction.java
index 0c34248938d..510ba9db0a2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/MoveCompartmentObjectAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/MoveCompartmentObjectAction.java
@@ -83,7 +83,7 @@ public class MoveCompartmentObjectAction extends DiagramAction {
 
 	/*
 	 * (non-Javadoc)
-	 *
+	 * 
 	 * @see
 	 * org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest
 	 * ()
@@ -95,7 +95,7 @@ public class MoveCompartmentObjectAction extends DiagramAction {
 
 	/*
 	 * (non-Javadoc)
-	 *
+	 * 
 	 * @see
 	 * org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#isSelectionListener
 	 * ()
@@ -146,7 +146,7 @@ public class MoveCompartmentObjectAction extends DiagramAction {
 					pos = viewParent.getPersistedChildren().size() - 1;
 					break;
 				}
-				;
+
 				MoveCommand moveCmd = new MoveCommand(eDomain, viewParent, NotationPackage.eINSTANCE.getView_PersistedChildren(), view, pos);
 				return new EMFtoGEFCommandWrapper(moveCmd);
 			}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/RotateAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/RotateAction.java
index 4b1b5b87711..550ba2949a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/RotateAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/RotateAction.java
@@ -63,6 +63,7 @@ public class RotateAction implements IObjectActionDelegate {
 
 	@Override
 	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+		// Nothing
 	}
 
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/handlers/ClipboardActionHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/handlers/ClipboardActionHandler.java
deleted file mode 100644
index 42292e0ec27..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/handlers/ClipboardActionHandler.java
+++ /dev/null
@@ -1,687 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2007 Conselleria de Infraestructuras y Transporte,
- * Generalitat de la Comunitat Valenciana . All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Mario Cervera Ubeda (Integranova)
- * 				 Marc Gil Sendra (Prodevelop)
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.actions.handlers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.CopyToClipboardCommand;
-import org.eclipse.emf.edit.command.PasteFromClipboardCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandler;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.uml.diagram.common.commands.AbstractCommonTransactionalCommmand;
-import org.eclipse.papyrus.uml.diagram.common.commands.AddEObjectReferencesToDiagram;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ViewAndFeatureResolver;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.common.util.MDTUtil;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * The Class ClipboardActionHandler.
- */
-public/* abstract */class ClipboardActionHandler extends DiagramGlobalActionHandler {
-
-	/*
-	 * Specifies whether the last executed action was a cut action or not. This
-	 * is needed because the paste action will vary depending on it
-	 */
-	/** The is cut. */
-	private static boolean isCut = false;
-
-	/* Container of the objects in the clipboard */
-	/** The container. */
-	private static EObject container = null;
-
-	/* Objects in the clipboard */
-	/** The clipboard. */
-	protected static List<EObject> clipboard = new ArrayList<EObject>();
-
-	/* Edit parts of the objects in the clipboard */
-	/** The edit parts in clipboard. */
-	protected static List<EditPart> editPartsInClipboard = new ArrayList<EditPart>();
-
-	// @unused
-	protected static List<Object> clipboardElements = new ArrayList<Object>();
-
-	// @unused
-	public void setContainer(EObject container) {
-		ClipboardActionHandler.container = container;
-	}
-
-	public EObject getContainer() {
-		return ClipboardActionHandler.container;
-	}
-
-	// @unused
-	public boolean getIsCut() {
-		return isCut;
-	}
-
-	// @unused
-	public void setIsCut(boolean isCut) {
-		ClipboardActionHandler.isCut = isCut;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandler
-	 * #canCopy(org.eclipse.gmf.runtime.common.ui.services.action.global.
-	 * IGlobalActionContext)
-	 */
-	@Override
-	protected boolean canCopy(IGlobalActionContext cntxt) {
-
-		if (cntxt.getSelection() instanceof StructuredSelection) {
-			Object firstElement = ((StructuredSelection) cntxt.getSelection()).getFirstElement();
-			if (firstElement instanceof IGraphicalEditPart) {
-				EObject eobject = ((IGraphicalEditPart) firstElement).resolveSemanticElement();
-				if (eobject != null) {
-					List elements = ((StructuredSelection) cntxt.getSelection()).toList();
-					List<EObject> eobjects = new ArrayList<EObject>();
-					for (Object o : elements) {
-						EObject eobj = ((IGraphicalEditPart) o).resolveSemanticElement();
-						eobjects.add(eobj);
-					}
-					if (!allElementsSameType(eobjects, eobject)) {
-						return false;
-					}
-					IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-					if (editorPart instanceof DiagramEditor) {
-						if (((DiagramEditor) editorPart).getDiagram().getElement().equals(eobject)) {
-							return false;
-						}
-					}
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandler
-	 * #canCut(org.eclipse.gmf.runtime.common.ui.services.action.global.
-	 * IGlobalActionContext)
-	 */
-	@Override
-	protected boolean canCut(IGlobalActionContext cntxt) {
-
-		return canCopy(cntxt);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandler
-	 * #canPaste(org.eclipse.gmf.runtime.common.ui.services.action.global.
-	 * IGlobalActionContext)
-	 */
-	@Override
-	protected boolean canPaste(IGlobalActionContext cntxt) {
-
-		if (cntxt.getSelection() instanceof StructuredSelection) {
-			Object firstElement = ((StructuredSelection) cntxt.getSelection()).getFirstElement();
-			if (firstElement instanceof IGraphicalEditPart) {
-				IGraphicalEditPart pasteDestination = ((IGraphicalEditPart) firstElement);
-				if (pasteDestination != null && pasteDestination.resolveSemanticElement() != null && (!pasteDestination.resolveSemanticElement().equals(container) || !isCut)) {
-					TransactionalEditingDomain domain = pasteDestination.getEditingDomain();
-					if (domain.getClipboard() != null && domain.getClipboard().size() > 0) {
-						// All the elements in the clipboard are of the same
-						// type
-						Object[] objects = domain.getClipboard().toArray();
-						EObject firstObjectToBePasted = (EObject) objects[0];
-						EStructuralFeature feature = getFeature(firstObjectToBePasted, pasteDestination);
-						if (feature != null) {
-							if (feature.getEType().getInstanceClass().isInstance(firstObjectToBePasted)) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandler
-	 * #getCommand(org.eclipse.gmf.runtime.common.ui.services.action.global.
-	 * IGlobalActionContext)
-	 */
-	@Override
-	public ICommand getCommand(IGlobalActionContext cntxt) {
-
-		IWorkbenchPart part = cntxt.getActivePart();
-		if (!(part instanceof IDiagramWorkbenchPart)) {
-			return null;
-		}
-
-		/* Get the model operation context */
-		IDiagramWorkbenchPart diagramPart = (IDiagramWorkbenchPart) part;
-
-		String actionId = cntxt.getActionId();
-
-		if (actionId.equals(GlobalActionId.COPY)) {
-			isCut = false;
-			return getCopyCommand(cntxt, diagramPart, false);
-		} else if (actionId.equals(GlobalActionId.CUT)) {
-			isCut = true;
-			return getCutCommand(cntxt, diagramPart);
-		} else if (actionId.equals(GlobalActionId.PASTE)) {
-			if (isCut) {
-				isCut = false;
-				return getExecutePasteAfterCutCommand(cntxt);
-			} else {
-				isCut = false;
-				return getExecutePasteAfterCopyCommand(cntxt);
-			}
-		}
-
-		return super.getCommand(cntxt);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandler
-	 * #getCopyCommand(org.eclipse.gmf.runtime.common.ui.services.action.global.
-	 * IGlobalActionContext,
-	 * org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart, boolean)
-	 */
-	@Override
-	protected ICommand getCopyCommand(IGlobalActionContext cntxt, IDiagramWorkbenchPart diagramPart, boolean isUndoable) {
-
-		if (cntxt.getSelection() instanceof StructuredSelection) {
-			// All the elements in the selection are supposed to be of the same
-			// time
-			// We couldn't have got here otherwise
-			Object firstElement = ((StructuredSelection) cntxt.getSelection()).getFirstElement();
-			EObject eobject = ((IGraphicalEditPart) firstElement).resolveSemanticElement();
-			TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(eobject);
-			List elements = ((StructuredSelection) cntxt.getSelection()).toList();
-			List<EObject> eobjects = new ArrayList<EObject>();
-			editPartsInClipboard.clear();
-			for (Object o : elements) {
-				EObject eobj = ((IGraphicalEditPart) o).resolveSemanticElement();
-				eobjects.add(eobj);
-				container = eobj.eContainer();
-
-				for (Object view : DiagramEditPartsUtil.getEObjectViews(eobj)) {
-					if (view instanceof View) {
-						EditPart editpart = DiagramEditPartsUtil.getEditPartFromView((View) view, (EditPart) firstElement);
-						editPartsInClipboard.add(editpart);
-					}
-				}
-			}
-
-			clipboard.clear();
-			clipboard.addAll(eobjects);
-
-			final List<EObject> eobjects2 = eobjects;
-			Command copyCommand = new CopyToClipboardCommand(domain, eobjects) {
-
-				@Override
-				public void doExecute() {
-
-					/**
-					 * @author mgil : Don't use a different command to copy
-					 *         every element, use the copy function from
-					 *         EcoreUtil
-					 */
-					ArrayList<Object> list = new ArrayList<Object>();
-					for (EObject eobj : eobjects2) {
-						EObject eo = EcoreUtil.copy(eobj);
-						list.add(eo);
-					}
-
-					oldClipboard = domain.getClipboard();
-					domain.setClipboard(list);
-				}
-			};
-
-			if (copyCommand != null) {
-				return new EMFtoGMFCommandWrapper(copyCommand);
-			}
-		}
-
-		return super.getCopyCommand(cntxt, diagramPart, isUndoable);
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandler
-	 * #getCutCommand(org.eclipse.gmf.runtime.common.ui.services.action.global.
-	 * IGlobalActionContext,
-	 * org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart)
-	 */
-	@Override
-	protected ICommand getCutCommand(IGlobalActionContext cntxt, IDiagramWorkbenchPart diagramPart) {
-
-		if (cntxt.getSelection() instanceof StructuredSelection) {
-			// All the elements in the selection are supposed to be of the same
-			// type
-			// We couldn't have got here otherwise
-			Object firstElement = ((StructuredSelection) cntxt.getSelection()).getFirstElement();
-			EObject eobject = ((IGraphicalEditPart) firstElement).resolveSemanticElement();
-			TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(eobject);
-			List elements = ((StructuredSelection) cntxt.getSelection()).toList();
-			List<EObject> eobjects = new ArrayList<EObject>();
-			editPartsInClipboard.clear();
-			for (Object o : elements) {
-				EObject eobj = ((IGraphicalEditPart) o).resolveSemanticElement();
-				eobjects.add(eobj);
-				container = eobj.eContainer();
-
-				for (Object view : DiagramEditPartsUtil.getEObjectViews(eobj)) {
-					if (view instanceof View) {
-						EditPart editpart = DiagramEditPartsUtil.getEditPartFromView((View) view, (EditPart) firstElement);
-						editPartsInClipboard.add(editpart);
-					}
-				}
-			}
-
-			clipboard.clear();
-			clipboard.addAll(eobjects);
-
-			final List<EObject> eobjects2 = eobjects;
-			Command cutCommand = new CopyToClipboardCommand(domain, eobjects) {
-
-				@Override
-				public void doExecute() {
-
-					/**
-					 * @author mgil : Don't use a different command to copy
-					 *         every element, use the copy function from
-					 *         EcoreUtil
-					 */
-					ArrayList<Object> list = new ArrayList<Object>();
-					for (EObject eobj : eobjects2) {
-						list.add(eobj);
-					}
-
-					oldClipboard = domain.getClipboard();
-					domain.setClipboard(list);
-				}
-			};
-
-			if (cutCommand != null) {
-				return new EMFtoGMFCommandWrapper(cutCommand);
-			}
-		}
-
-		return super.getCutCommand(cntxt, diagramPart);
-	}
-
-	/**
-	 * Do something with the copied EObject
-	 *
-	 * @param eo
-	 */
-	protected void prepareEObject(EObject eObject) {
-	}
-
-	/**
-	 * Execute paste after copy.
-	 *
-	 * @param cntxt
-	 *            the cntxt
-	 */
-	protected ICommand getExecutePasteAfterCopyCommand(IGlobalActionContext cntxt) {
-
-		if (!(cntxt.getSelection() instanceof StructuredSelection)) {
-			return null;
-		}
-
-		Object first = ((StructuredSelection) cntxt.getSelection()).getFirstElement();
-		if (!(first instanceof IGraphicalEditPart)) {
-			return null;
-		}
-
-		IGraphicalEditPart pasteDestination = ((IGraphicalEditPart) first);
-		TransactionalEditingDomain editingDomain = pasteDestination.getEditingDomain();
-
-		final Object firstElement = first;
-		final IGraphicalEditPart editPart = pasteDestination;
-		final TransactionalEditingDomain domain = editingDomain;
-		AbstractCommonTransactionalCommmand command = new AbstractCommonTransactionalCommmand(editingDomain, "Paste after copy", null) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-				if (domain.getClipboard() != null && domain.getClipboard().size() > 0) {
-					// All the objects in the clipboard are supposed to
-					// be of the same type
-					Object[] objects = domain.getClipboard().toArray();
-					EObject firstObjectToBePasted = (EObject) objects[0];
-					EStructuralFeature feature = getFeature(firstObjectToBePasted, editPart);
-
-					// Execute paste
-					Command pasteCommand = PasteFromClipboardCommand.create(domain, editPart.resolveSemanticElement(), feature);
-
-					domain.getCommandStack().execute(pasteCommand);
-
-					// The new elements must be shown on the diagram
-					List<EObject> eobjects = new ArrayList<EObject>();
-
-					for (Object o : pasteCommand.getAffectedObjects()) {
-						if (o instanceof EObject) {
-							prepareEObject((EObject) o);
-							eobjects.add((EObject) o);
-						}
-					}
-
-					ICommand command = new AddEObjectReferencesToDiagram(domain, DiagramEditPartsUtil.findDiagramFromEditPart((IGraphicalEditPart) firstElement), eobjects);
-					domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(command));
-
-					// refresh the affected EditPart
-					DiagramEditPartsUtil.updateEditPart(editPart);
-
-					return CommandResult.newOKCommandResult();
-				}
-				return CommandResult.newCancelledCommandResult();
-			}
-		};
-
-		return command.canExecute() ? command : null;
-	}
-
-	/**
-	 * Execute paste after cut.
-	 *
-	 * @param cntxt
-	 *            the cntxt
-	 */
-	protected ICommand getExecutePasteAfterCutCommand(IGlobalActionContext cntxt) {
-
-		if (!(cntxt.getSelection() instanceof StructuredSelection)) {
-			return null;
-		}
-
-		Object first = ((StructuredSelection) cntxt.getSelection()).getFirstElement();
-		if (!(first instanceof IGraphicalEditPart)) {
-			return null;
-		}
-
-		IGraphicalEditPart pasteDestination = ((IGraphicalEditPart) first);
-		TransactionalEditingDomain editingDomain = pasteDestination.getEditingDomain();
-
-		final Object firstElement = first;
-		final IGraphicalEditPart editPart = pasteDestination;
-		final TransactionalEditingDomain domain = editingDomain;
-		AbstractCommonTransactionalCommmand command = new AbstractCommonTransactionalCommmand(editingDomain, "Paste after cut", null) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-
-				if (domain.getClipboard() != null && domain.getClipboard().size() > 0) {
-
-					// All the objects in the clipboard are supposed to be of
-					// the
-					// same type
-					Object[] objects = domain.getClipboard().toArray();
-					EObject firstObjectToBePasted = (EObject) objects[0];
-					EStructuralFeature feature = getFeature(firstObjectToBePasted, editPart);
-
-					// Execute paste
-					CompoundCommand cc = new CompoundCommand("Paste");
-					Command removeCommand = RemoveCommand.create(domain, container, feature, clipboard);
-					if (!removeCommand.canExecute()) {
-						return CommandResult.newCancelledCommandResult();
-					}
-
-					cc.append(removeCommand);
-
-					for (EditPart ep : editPartsInClipboard) {
-						Command c = getDeleteViewCommand(ep);
-						if (c != null && !c.canExecute()) {
-							return CommandResult.newCancelledCommandResult();
-						}
-
-						cc.append(c);
-					}
-
-					for (Object obj : domain.getClipboard()) {
-						Command addCommand = AddCommand.create(domain, editPart.resolveSemanticElement(), feature, obj);
-						if (!addCommand.canExecute()) {
-							return CommandResult.newCancelledCommandResult();
-						}
-
-						cc.append(addCommand);
-					}
-
-					// The new elements must be shown on the diagram
-					List<EObject> eobjects = new ArrayList<EObject>();
-
-					for (Object o : domain.getClipboard()) {
-						if (o instanceof EObject) {
-							eobjects.add((EObject) o);
-						}
-					}
-
-					ICommand command = new AddEObjectReferencesToDiagram(domain, DiagramEditPartsUtil.findDiagramFromEditPart((IGraphicalEditPart) firstElement), eobjects);
-					if (!command.canExecute()) {
-						return CommandResult.newCancelledCommandResult();
-					}
-
-					cc.append(new GMFtoEMFCommandWrapper(command));
-
-					if (!cc.canExecute()) {
-						return CommandResult.newCancelledCommandResult();
-					}
-
-					domain.getCommandStack().execute(cc);
-
-					// Empty the clipboard
-					domain.setClipboard(new ArrayList<Object>());
-					clipboard.clear();
-					editPartsInClipboard.clear();
-
-					// Refresh the diagram
-					DiagramEditPartsUtil.updateEditPart(editPart);
-
-					return CommandResult.newOKCommandResult();
-				}
-				return CommandResult.newCancelledCommandResult();
-			}
-		};
-
-		return command.canExecute() ? command : null;
-	}
-
-	/**
-	 * Gets the diagram preferences hint.
-	 *
-	 * @param editPart
-	 *            the edit part
-	 *
-	 * @return the diagram preferences hint
-	 */
-	// @unused
-	private PreferencesHint getDiagramPreferencesHint(IGraphicalEditPart editPart) {
-		return editPart.getDiagramPreferencesHint();
-	}
-
-	/*
-	 * Checks if all the objects contained in the list are of the same type than
-	 * the eobject passed as parameter
-	 */
-	/**
-	 * All elements same type.
-	 *
-	 * @param eobjects
-	 *            the eobjects
-	 * @param eobject
-	 *            the eobject
-	 *
-	 * @return true, if successful
-	 */
-	private boolean allElementsSameType(List<EObject> eobjects, EObject eobject) {
-
-		for (EObject o : eobjects) {
-			if (o != null) {
-				if (!o.eClass().equals(eobject.eClass())) {
-					return false;
-				}
-			} else {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Gets the delete view command.
-	 *
-	 * @param editPart
-	 *            the edit part
-	 *
-	 * @return the delete view command
-	 */
-	protected Command getDeleteViewCommand(EditPart editPart) {
-
-		if (editPart == null) {
-			return null;
-		}
-
-		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
-		org.eclipse.gef.commands.Command command = editPart.getCommand(deleteViewRequest);
-		return new GEFtoEMFCommandWrapper(command);
-	}
-
-	/**
-	 * Gets the edits the parts in clipboard.
-	 *
-	 * @param clipboard
-	 *            the clipboard
-	 *
-	 * @return the edits the parts in clipboard
-	 */
-	// @unused
-	protected Collection<EditPart> getEditPartsInClipboard(Collection<Object> clipboard) {
-		if (clipboard != null && clipboard.size() > 0) {
-			Collection<EditPart> editParts = new ArrayList<EditPart>();
-			for (Object object : clipboard) {
-				if (object instanceof EditPart) {
-					editParts.add((EditPart) object);
-				}
-			}
-			return editParts;
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * Gets the feature.
-	 *
-	 * @param objectToBePasted
-	 *            the object to be pasted
-	 * @param pasteDestination
-	 *            the paste destination
-	 *
-	 * @return the feature
-	 */
-	public EStructuralFeature getFeature(EObject objectToBePasted, EditPart pasteDestination) {
-		if (objectToBePasted == null || pasteDestination == null) {
-			return null;
-		}
-		EObject element = MDTUtil.resolveSemantic(pasteDestination);
-		return getFeature(element, objectToBePasted, pasteDestination);
-	}
-
-	/**
-	 * Gets the feature.
-	 *
-	 * @param element
-	 *            the element
-	 * @param objectToBePasted
-	 *            the object to be pasted
-	 * @param editPart
-	 *            the edit part
-	 *
-	 * @return the feature
-	 */
-	protected EStructuralFeature getFeature(EObject element, EObject objectToBePasted, EditPart editPart) {
-
-		if (!(element == MDTUtil.resolveSemantic(editPart))) {
-			return null;
-		}
-
-		EStructuralFeature feature = null;
-
-		Object adapter = editPart.getAdapter(ViewAndFeatureResolver.class);
-		ViewAndFeatureResolver resolver = null;
-		if (adapter instanceof ViewAndFeatureResolver) {
-			resolver = (ViewAndFeatureResolver) adapter;
-		}
-		if (resolver != null) {
-			feature = resolver.getEStructuralFeatureForEClass(objectToBePasted.eClass());
-		}
-		if (feature == null) {
-			for (Object child : editPart.getChildren()) {
-				if (child instanceof EditPart) {
-					feature = getFeature(element, objectToBePasted, (EditPart) child);
-				}
-				if (feature != null) {
-					break;
-				}
-			}
-		}
-		return feature;
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/handlers/ClipboardActionHandlerProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/handlers/ClipboardActionHandlerProvider.java
deleted file mode 100644
index 63f4225842e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/handlers/ClipboardActionHandlerProvider.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2007 Conselleria de Infraestructuras y Transporte,
- * Generalitat de la Comunitat Valenciana . All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Mario Cervera Ubeda (Integranova)
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.actions.handlers;
-
-import java.util.Hashtable;
-
-import org.eclipse.gmf.runtime.common.ui.services.action.global.AbstractGlobalActionHandlerProvider;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandlerContext;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPart;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class ClipboardActionHandlerProvider.
- */
-public class ClipboardActionHandlerProvider extends AbstractGlobalActionHandlerProvider {
-
-	/** List for handlers. */
-	private Hashtable handlerList = new Hashtable();
-
-	/**
-	 * Returns a global action handler that supports operations (cut, copy, and
-	 * paste).
-	 *
-	 * @param context
-	 *            the context
-	 *
-	 * @return the global action handler
-	 */
-	@Override
-	public IGlobalActionHandler getGlobalActionHandler(final IGlobalActionHandlerContext context) {
-
-		/* Create the handler */
-
-		if (!getHandlerList().containsKey(context.getActivePart())) {
-
-			getHandlerList().put(context.getActivePart(), getClipboardActionHandler());
-
-			/*
-			 * Register as a part listener so that the cache can be cleared when
-			 * the part is disposed
-			 */
-			context.getActivePart().getSite().getPage().addPartListener(new IPartListener() {
-
-				private IWorkbenchPart localPart = context.getActivePart();
-
-				/**
-				 * @see org.eclipse.ui.IPartListener#partActivated(IWorkbenchPart)
-				 */
-				@Override
-				public void partActivated(IWorkbenchPart part) {
-					// Do nothing
-				}
-
-				/**
-				 * @see org.eclipse.ui.IPartListener#partBroughtToTop(IWorkbenchPart)
-				 */
-				@Override
-				public void partBroughtToTop(IWorkbenchPart part) {
-					// Do nothing
-				}
-
-				/**
-				 * @see org.eclipse.ui.IPartListener#partClosed(IWorkbenchPart)
-				 */
-				@Override
-				public void partClosed(IWorkbenchPart part) {
-					/* Remove the cache associated with the part */
-					if (part != null && part == localPart && getHandlerList().containsKey(part)) {
-						getHandlerList().remove(part);
-						localPart.getSite().getPage().removePartListener(this);
-						localPart = null;
-					}
-				}
-
-				/**
-				 * @see org.eclipse.ui.IPartListener#partDeactivated(IWorkbenchPart)
-				 */
-				@Override
-				public void partDeactivated(IWorkbenchPart part) {
-					// Do nothing
-				}
-
-				/**
-				 * @see org.eclipse.ui.IPartListener#partOpened(IWorkbenchPart)
-				 */
-				@Override
-				public void partOpened(IWorkbenchPart part) {
-					// Do nothing
-				}
-			});
-		}
-
-		return (ClipboardActionHandler) getHandlerList().get(context.getActivePart());
-	}
-
-	/**
-	 * Returns the handlerList.
-	 *
-	 * @return Hashtable
-	 */
-	private Hashtable getHandlerList() {
-		return handlerList;
-	}
-
-	protected ClipboardActionHandler getClipboardActionHandler() {
-		return new ClipboardActionHandler();
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/handlers/UMLClipboardActionHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/handlers/UMLClipboardActionHandler.java
deleted file mode 100644
index d5ba7b6bcf5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/actions/handlers/UMLClipboardActionHandler.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.actions.handlers;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.uml.diagram.common.actions.LabelHelper;
-import org.eclipse.uml2.uml.NamedElement;
-
-public class UMLClipboardActionHandler extends ClipboardActionHandler {
-
-	@Override
-	protected void prepareEObject(EObject eObject) {
-		if (eObject instanceof NamedElement) {
-			NamedElement namedElement = (NamedElement) eObject;
-			namedElement.setName(LabelHelper.INSTANCE.findName(eObject.eContainer(), namedElement));
-		}
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/command/wrappers/CommandProxyWithResult.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/command/wrappers/CommandProxyWithResult.java
deleted file mode 100644
index 918129ab6da..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/command/wrappers/CommandProxyWithResult.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.command.wrappers;
-
-import org.eclipse.gef.commands.Command;
-
-/**
- * This command proxy wraps a GEF command into a GMF one, with result stored in
- * the CommandResult.
- *
- * @author mvelten
- *
- * @deprecated use {@link org.eclipse.papyrus.commands.wrappers.CommandProxyWithResult} instead
- *
- */
-@Deprecated
-public class CommandProxyWithResult extends org.eclipse.papyrus.commands.wrappers.CommandProxyWithResult {
-
-	public CommandProxyWithResult(Command command, Object result) {
-		super(command, result);
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/command/wrappers/EMFtoGEFCommandWrapper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/command/wrappers/EMFtoGEFCommandWrapper.java
deleted file mode 100644
index 4385163b9b4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/command/wrappers/EMFtoGEFCommandWrapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 AIRBUS FRANCE.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    David Sciamma (Anyware Technologies), Mathieu Garcia (Anyware Technologies),
- *    Jacques Lescot (Anyware Technologies) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.command.wrappers;
-
-// TODO: Auto-generated Javadoc
-/**
- * A GEF Command that wraps an EMF command. Each method is redirected to the EMF
- * one. <br>
- * Adapts an {@link org.eclipse.emf.common.command.Command EMF Command} to be a {@link org.eclipse.gef.commands.Command GEF Command}.
- *
- * Creation : 21 fev. 2006
- *
- * @deprecated use {@link org.eclipse.papyrus.commands.wrappers.EMFtoGEFCommandWrapper} instead
- * @author aarong, <a href="mailto:jacques.lescot@anyware-tech.com">Jacques
- *         LESCOT</a>
- */
-@Deprecated
-public class EMFtoGEFCommandWrapper extends org.eclipse.papyrus.commands.wrappers.EMFtoGEFCommandWrapper {
-
-	/**
-	 * Constructor.
-	 *
-	 * @param command
-	 *            the wrapped EMF command
-	 */
-	public EMFtoGEFCommandWrapper(final org.eclipse.emf.common.command.Command command) {
-		super(command);
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/command/wrappers/EMFtoGMFCommandWrapper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/command/wrappers/EMFtoGMFCommandWrapper.java
deleted file mode 100644
index 1b959a74a80..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/command/wrappers/EMFtoGMFCommandWrapper.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2007 Conselleria de Infraestructuras y Transporte,
- * Generalitat de la Comunitat Valenciana . All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Mario Cervera Ubeda (Prodevelop)
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.command.wrappers;
-
-import org.eclipse.emf.common.command.Command;
-
-// TODO: Auto-generated Javadoc
-/**
- * A GMF Command that wraps an EMF command. Each method is redirected to the EMF
- * one.
- *
- * @deprecated use {@link org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper} instead
- */
-@Deprecated
-public class EMFtoGMFCommandWrapper extends org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper {
-
-	/**
-	 * Constructor.
-	 *
-	 * @param emfCommand
-	 *            the emf command
-	 */
-	public EMFtoGMFCommandWrapper(Command emfCommand) {
-		super(emfCommand);
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/command/wrappers/GEFtoEMFCommandWrapper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/command/wrappers/GEFtoEMFCommandWrapper.java
deleted file mode 100644
index c343d2a5371..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/command/wrappers/GEFtoEMFCommandWrapper.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2007 Conselleria de Infraestructuras y Transporte,
- * Generalitat de la Comunitat Valenciana . All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Mario Cervera Ubeda (Prodevelop)
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.command.wrappers;
-
-import org.eclipse.gef.commands.Command;
-
-// TODO: Auto-generated Javadoc
-/**
- * A EMF Command that wraps a GEF command. Each method is redirected to the GEF
- * one.
- *
- * @deprecated use {@link org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper} instead
- */
-@Deprecated
-public class GEFtoEMFCommandWrapper extends org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper {
-
-	/**
-	 * Constructor.
-	 *
-	 * @param gefCommand
-	 *            the gef command
-	 */
-	public GEFtoEMFCommandWrapper(Command gefCommand) {
-		super(gefCommand);
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/command/wrappers/GMFtoEMFCommandWrapper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/command/wrappers/GMFtoEMFCommandWrapper.java
deleted file mode 100644
index 3e41543a70e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/command/wrappers/GMFtoEMFCommandWrapper.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2007 Conselleria de Infraestructuras y Transporte,
- * Generalitat de la Comunitat Valenciana . All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Mario Cervera Ubeda (Prodevelop)
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.command.wrappers;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-
-// TODO: Auto-generated Javadoc
-/**
- * A EMF Command that wraps a GMF command. Each method is redirected to the GMF
- * one.
- *
- * @deprecated use {@link org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper} instead
- */
-@Deprecated
-public class GMFtoEMFCommandWrapper extends org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper {
-
-	/**
-	 * Constructor.
-	 *
-	 * @param gmfCommand
-	 *            the gmf command
-	 */
-	public GMFtoEMFCommandWrapper(ICommand gmfCommand) {
-		super(gmfCommand);
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/AddEObjectReferencesToDiagram.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/AddEObjectReferencesToDiagram.java
deleted file mode 100644
index 5216e8701f4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/AddEObjectReferencesToDiagram.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte,
- * Generalitat de la Comunitat Valenciana .
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Francisco Javier Cano Muñoz (Prodevelop) - initial API implementation
- *
- ******************************************************************************/
-
-package org.eclipse.papyrus.uml.diagram.common.commands;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.uml.diagram.common.util.MultiDiagramUtil;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class AddEObjectReferencesToDiagram.
- *
- * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
- */
-public class AddEObjectReferencesToDiagram extends AbstractTransactionalCommand {
-
-	/** The diagram. */
-	private Diagram diagram = null;
-
-	/** The e objects. */
-	private List<EObject> eObjects = null;
-
-	/**
-	 * Flag to add the EObject's contents.
-	 */
-	protected boolean addContents = true;
-
-	/**
-	 * Instantiates a new adds the e object references to diagram.
-	 *
-	 * @param domain
-	 *            the domain
-	 * @param diagram
-	 *            the diagram
-	 * @param eObjects
-	 *            the e objects
-	 */
-	public AddEObjectReferencesToDiagram(TransactionalEditingDomain domain, Diagram diagram, List<EObject> eObjects) {
-		super(domain, "Add EObject references to Diagram", null);
-		this.diagram = diagram;
-		this.eObjects = eObjects;
-	}
-
-	// @unused
-	public AddEObjectReferencesToDiagram(TransactionalEditingDomain domain, Diagram diagram, List<EObject> eObjects, boolean addContents) {
-		super(domain, "Add EObject references to Diagram", null);
-		this.diagram = diagram;
-		this.eObjects = eObjects;
-		this.addContents = addContents;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#canExecute()
-	 */
-	@Override
-	public boolean canExecute() {
-		return diagram != null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @seeorg.eclipse.gmf.runtime.emf.commands.core.command.
-	 * AbstractTransactionalCommand
-	 * #doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor,
-	 * org.eclipse.core.runtime.IAdaptable)
-	 */
-	@Override
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		for (EObject eObject : eObjects) {
-			addReferences(eObject);
-		}
-		return CommandResult.newOKCommandResult();
-	}
-
-	/**
-	 * Adds the references.
-	 *
-	 * @param eObject
-	 *            the e object
-	 */
-	private void addReferences(EObject eObject) {
-		if (addContents) {
-			for (EObject e : eObject.eContents()) {
-				addReferences(e);
-			}
-		}
-		MultiDiagramUtil.AddEAnnotationReferenceToDiagram(diagram, eObject);
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/DeleteLinkDuringCreationCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/DeleteLinkDuringCreationCommand.java
index da762ebc7cb..3c228b1a71e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/DeleteLinkDuringCreationCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/DeleteLinkDuringCreationCommand.java
@@ -80,19 +80,19 @@ public class DeleteLinkDuringCreationCommand extends DeleteCommand {
 	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
 
 		// find editpartlistener to remove
-		Map epRegistry = viewer.getEditPartRegistry();
+		Map<?, ?> epRegistry = viewer.getEditPartRegistry();
 		// the listener to remove
 		EditPartListener listenerToRemove = null;
 		// the graphical editpart to delete
 		IGraphicalEditPart editPart = (IGraphicalEditPart) epRegistry.get(edge);
 
 		if (editPart instanceof IEditpartListenerAccess) {
-			Iterator iterlistener = ((UMLConnectionNodeEditPart) editPart).getEventListenerIterator(EditPartListener.class);
+			Iterator<?> iterlistener = ((UMLConnectionNodeEditPart) editPart).getEventListenerIterator(EditPartListener.class);
 			while (iterlistener.hasNext()) {
 				Object currentObject = iterlistener.next();
 
-				Class classobject = currentObject.getClass();
-				Class activeToolClass = AbstractConnectionCreationTool.class;
+				Class<?> classobject = currentObject.getClass();
+				Class<?> activeToolClass = AbstractConnectionCreationTool.class;
 				String activeToolClassName = activeToolClass.getName();
 
 				// compare the name of the listener.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/DuplicateAnythingCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/DuplicateAnythingCommand.java
deleted file mode 100644
index e50379405f3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/DuplicateAnythingCommand.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte, Generalitat
- * de la Comunitat Valenciana. All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Mario Cervera Ubeda (Prodevelop) - initial API and implementation
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.commands.core.commands.DuplicateEObjectsCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.uml.diagram.common.util.MultiDiagramUtil;
-
-// @unused
-public class DuplicateAnythingCommand extends DuplicateEObjectsCommand {
-
-	private final Diagram diagram;
-
-	public DuplicateAnythingCommand(TransactionalEditingDomain editingDomain, DuplicateElementsRequest req, Diagram currentDiagram) {
-
-		super(editingDomain, req.getLabel(), req.getElementsToBeDuplicated(), req.getAllDuplicatedElementsMap());
-
-		this.diagram = currentDiagram;
-	}
-
-	@Override
-	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-
-		CommandResult result = super.doExecuteWithResult(progressMonitor, info);
-
-		for (Object duplicatedObject : this.getAllDuplicatedObjectsMap().keySet()) {
-			if (duplicatedObject instanceof EObject) {
-				if (MultiDiagramUtil.findEObjectReferencedInEAnnotation(diagram, (EObject) duplicatedObject)) {
-					MultiDiagramUtil.AddEAnnotationReferenceToDiagram(diagram, (EObject) this.getAllDuplicatedObjectsMap().get(duplicatedObject));
-				}
-			}
-		}
-
-		return result;
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/DuplicateNamedElementCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/DuplicateNamedElementCommand.java
index a39b038ffb7..664752d5ae7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/DuplicateNamedElementCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/DuplicateNamedElementCommand.java
@@ -49,7 +49,7 @@ public class DuplicateNamedElementCommand extends DuplicateEObjectsCommand {
 	@Override
 	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
 		super.doExecuteWithResult(progressMonitor, info);
-		List objectsToBeDuplicated = getObjectsToBeDuplicated();
+		List<?> objectsToBeDuplicated = getObjectsToBeDuplicated();
 		for (Object object : objectsToBeDuplicated) {
 			if (object instanceof NamedElement) {
 				Object duplicatedObject = getAllDuplicatedObjectsMap().get(object);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/GMFToEMFCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/GMFToEMFCommand.java
deleted file mode 100644
index 11fa100eef8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/GMFToEMFCommand.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte,
- * Generalitat de la Comunitat Valenciana .
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Francisco Javier Cano Muñoz (Prodevelop) - initial API implementation
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.commands;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class GMFToEMFCommand.
- *
- * @deprecated see command.wrapper
- */
-@Deprecated
-public class GMFToEMFCommand implements Command {
-
-	/** The GMF command. */
-	private ICommand GMFCommand = null;
-
-	/**
-	 * Instantiates a new gMF to emf command.
-	 *
-	 * @param gmfCommand
-	 *            the gmf command
-	 */
-	public GMFToEMFCommand(ICommand gmfCommand) {
-		GMFCommand = gmfCommand;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.emf.common.command.Command#canExecute()
-	 */
-	@Override
-	public boolean canExecute() {
-		return GMFCommand != null && GMFCommand.canExecute();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.emf.common.command.Command#canUndo()
-	 */
-	@Override
-	public boolean canUndo() {
-		return GMFCommand != null && GMFCommand.canUndo();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.emf.common.command.Command#chain(org.eclipse.emf.common.command
-	 * .Command)
-	 */
-	@Override
-	public Command chain(Command command) {
-		throw new UnsupportedOperationException("Cannot compose GMF command with EMF command");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.emf.common.command.Command#dispose()
-	 */
-	@Override
-	public void dispose() {
-		if (GMFCommand != null) {
-			GMFCommand.dispose();
-		}
-		GMFCommand = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.emf.common.command.Command#execute()
-	 */
-	@Override
-	public void execute() {
-		if (GMFCommand != null) {
-			try {
-				GMFCommand.execute(new NullProgressMonitor(), null);
-			} catch (ExecutionException ex) {
-				return;
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.emf.common.command.Command#getAffectedObjects()
-	 */
-	@Override
-	public Collection<?> getAffectedObjects() {
-		if (GMFCommand != null) {
-			return GMFCommand.getAffectedFiles();
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.emf.common.command.Command#getDescription()
-	 */
-	@Override
-	public String getDescription() {
-		if (GMFCommand != null) {
-			return GMFCommand.getLabel();
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.emf.common.command.Command#getLabel()
-	 */
-	@Override
-	public String getLabel() {
-		if (GMFCommand != null) {
-			return GMFCommand.getLabel();
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.emf.common.command.Command#getResult()
-	 */
-	@Override
-	public Collection<?> getResult() {
-		if (GMFCommand != null) {
-			CommandResult result = GMFCommand.getCommandResult();
-			Object returnValue = result.getReturnValue();
-			if (result.getStatus().equals(IStatus.OK) && returnValue != null) {
-				java.util.List results = new ArrayList();
-				results.add(returnValue);
-				return results;
-			}
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.emf.common.command.Command#redo()
-	 */
-	@Override
-	public void redo() {
-		if (GMFCommand != null) {
-			try {
-				GMFCommand.redo(new NullProgressMonitor(), null);
-			} catch (ExecutionException ex) {
-				return;
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.emf.common.command.Command#undo()
-	 */
-	@Override
-	public void undo() {
-		if (GMFCommand != null) {
-			try {
-				GMFCommand.undo(new NullProgressMonitor(), null);
-			} catch (ExecutionException ex) {
-				return;
-			}
-		}
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/ModelCreationCommandBase.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/ModelCreationCommandBase.java
index 44631717654..4278bcaf4e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/ModelCreationCommandBase.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/ModelCreationCommandBase.java
@@ -78,7 +78,7 @@ public abstract class ModelCreationCommandBase implements IModelCreationCommand
 	 *            the owner
 	 */
 	protected void initializeModel(EObject owner) {
-
+		// Nothing (Subclasses may override)
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/PapyrusDuplicateWrapperCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/PapyrusDuplicateWrapperCommand.java
index 426dd7ed286..5bcb82ad206 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/PapyrusDuplicateWrapperCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/PapyrusDuplicateWrapperCommand.java
@@ -204,7 +204,7 @@ public class PapyrusDuplicateWrapperCommand extends AbstractTransactionalCommand
 	 *
 	 * @return the list of external objects to duplicate or an empty list if not elements are found to add.
 	 */
-	protected ICommand getExternalObjectsDuplicateCommand(Map duplicatedElementsMap) {
+	protected ICommand getExternalObjectsDuplicateCommand(Map<?, ?> duplicatedElementsMap) {
 		CompositeCommand result = new CompositeCommand("Duplicate External Objects"); //$NON-NLS-1$
 		Set<Object> duplicatedExternalElements = new HashSet<Object>();
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/PreserveAnchorsPositionCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/PreserveAnchorsPositionCommand.java
index fcc42825553..046fbf6249d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/PreserveAnchorsPositionCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/PreserveAnchorsPositionCommand.java
@@ -260,38 +260,38 @@ public class PreserveAnchorsPositionCommand extends AbstractTransactionalCommand
 		PrecisionPoint pp = BaseSlidableAnchor.parseTerminalString(anchor.getId());
 
 		if (getPreserveAxis() == PRESERVE_Y || getPreserveAxis() == PRESERVE_XY) {
-			int anchorYPos = (int) Math.round(figureBounds.height * pp.preciseY);
+			int anchorYPos = (int) Math.round(figureBounds.height * pp.preciseY());
 
-			pp.preciseY = (double) anchorYPos / (figureBounds.height + sizeDelta.height);
+			pp.setPreciseY((double) anchorYPos / (figureBounds.height + sizeDelta.height));
 
 			// If the resize direction is NORTH, the location of the figure
 			// move, but the anchor stay visually at the same location
 			if (PositionConstants.NORTH == resizeDirection || PositionConstants.NORTH_EAST == resizeDirection || PositionConstants.NORTH_WEST == resizeDirection) {
-				pp.preciseY = pp.preciseY + ((double) sizeDelta.height / (figureBounds.height + sizeDelta.height));
+				pp.setPreciseY(pp.preciseY() + ((double) sizeDelta.height / (figureBounds.height + sizeDelta.height)));
 			}
 
-			if (pp.preciseY > 1.0) {
-				pp.preciseY = 1.0;
-			} else if (pp.preciseY < 0.0) {
-				pp.preciseY = 0.0;
+			if (pp.preciseY() > 1.0) {
+				pp.setPreciseY(1.0);
+			} else if (pp.preciseY() < 0.0) {
+				pp.setPreciseY(0.0);
 			}
 		}
 
 		if (getPreserveAxis() == PRESERVE_X || getPreserveAxis() == PRESERVE_XY) {
-			int anchorXPos = (int) Math.round(figureBounds.width * pp.preciseX);
+			int anchorXPos = (int) Math.round(figureBounds.width * pp.preciseX());
 
-			pp.preciseX = (double) anchorXPos / (figureBounds.width + sizeDelta.width);
+			pp.setPreciseX((double) anchorXPos / (figureBounds.width + sizeDelta.width));
 
 			// If the resize direction is WEST, the location of the figure move,
 			// but the anchor stay visually at the same location
 			if (PositionConstants.WEST == resizeDirection || PositionConstants.NORTH_WEST == resizeDirection || PositionConstants.SOUTH_WEST == resizeDirection) {
-				pp.preciseX = pp.preciseX + ((double) sizeDelta.width / (figureBounds.width + sizeDelta.width));
+				pp.setPreciseX(pp.preciseX() + ((double) sizeDelta.width / (figureBounds.width + sizeDelta.width)));
 			}
 
-			if (pp.preciseX > 1.0) {
-				pp.preciseX = 1.0;
-			} else if (pp.preciseX < 0.0) {
-				pp.preciseX = 0.0;
+			if (pp.preciseX() > 1.0) {
+				pp.setPreciseX(1.0);
+			} else if (pp.preciseX() < 0.0) {
+				pp.setPreciseX(0.0);
 			}
 		}
 
@@ -354,7 +354,7 @@ public class PreserveAnchorsPositionCommand extends AbstractTransactionalCommand
 		int margin = 6;
 
 		if (preserveAxis == PRESERVE_Y || preserveAxis == PRESERVE_XY) {
-			int anchorYPos = (int) Math.round(figureBounds.height * pp.preciseY);
+			int anchorYPos = (int) Math.round(figureBounds.height * pp.preciseY());
 
 			int newHeight = figureBounds.height + sizeDelta.height;
 
@@ -364,7 +364,7 @@ public class PreserveAnchorsPositionCommand extends AbstractTransactionalCommand
 		}
 
 		if (preserveAxis == PRESERVE_X || preserveAxis == PRESERVE_XY) {
-			int anchorXPos = (int) Math.round(figureBounds.width * pp.preciseX);
+			int anchorXPos = (int) Math.round(figureBounds.width * pp.preciseX());
 
 			int newWidth = figureBounds.width + sizeDelta.width;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/RemoveEObjectReferencesFromDiagram.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/RemoveEObjectReferencesFromDiagram.java
deleted file mode 100644
index a4afed891c0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/RemoveEObjectReferencesFromDiagram.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte,
- * Generalitat de la Comunitat Valenciana .
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Francisco Javier Cano Muñoz (Prodevelop) - initial API implementation
- *
- ******************************************************************************/
-
-package org.eclipse.papyrus.uml.diagram.common.commands;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.uml.diagram.common.util.MultiDiagramUtil;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class RemoveEObjectReferencesFromDiagram.
- *
- * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
- */
-public class RemoveEObjectReferencesFromDiagram extends AbstractTransactionalCommand {
-
-	/** The diagram. */
-	private Diagram diagram = null;
-
-	/** The e objects. */
-	private List<EObject> eObjects = null;
-
-	/**
-	 * Instantiates a new removes the e object references from diagram.
-	 *
-	 * @param domain
-	 *            the domain
-	 * @param diagram
-	 *            the diagram
-	 * @param eObjects
-	 *            the e objects
-	 */
-	public RemoveEObjectReferencesFromDiagram(TransactionalEditingDomain domain, Diagram diagram, List<EObject> eObjects) {
-		super(domain, "Add EObject references to Diagram", null);
-		this.diagram = diagram;
-		this.eObjects = eObjects;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#canExecute()
-	 */
-	@Override
-	public boolean canExecute() {
-		return diagram != null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @seeorg.eclipse.gmf.runtime.emf.commands.core.command.
-	 * AbstractTransactionalCommand#
-	 * doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor,
-	 * org.eclipse.core.runtime.IAdaptable)
-	 */
-	@Override
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		for (EObject eObject : eObjects) {
-			MultiDiagramUtil.RemoveEAnnotationReferenceFromDiagram(diagram, eObject);
-		}
-		return CommandResult.newOKCommandResult();
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/RemoveValueCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/RemoveValueCommand.java
index 32474477919..62644897ffb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/RemoveValueCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/RemoveValueCommand.java
@@ -69,9 +69,9 @@ public class RemoveValueCommand extends EditElementCommand {
 		EObject elementToEdit = getElementToEdit();
 		boolean many = FeatureMapUtil.isMany(elementToEdit, feature);
 		if (many) {
-			Collection collection = ((Collection) elementToEdit.eGet(feature));
-			if (value instanceof List) {
-				List values = (List) value;
+			Collection<?> collection = ((Collection<?>) elementToEdit.eGet(feature));
+			if (value instanceof List<?>) {
+				List<?> values = (List<?>) value;
 
 				for (Object o : values) {
 					if (collection.contains(o)) {
@@ -105,7 +105,7 @@ public class RemoveValueCommand extends EditElementCommand {
 		if (value == null && many) {
 			return false;
 		}
-		List allFeatures = getElementToEdit().eClass().getEAllStructuralFeatures();
+		List<?> allFeatures = getElementToEdit().eClass().getEAllStructuralFeatures();
 		if (allFeatures.contains(feature) && feature.isChangeable()) {
 			return verifyMany();
 		}
@@ -119,8 +119,8 @@ public class RemoveValueCommand extends EditElementCommand {
 	 */
 	private boolean verifyMany() {
 		if (value instanceof List) {
-			List values = (List) value;
-			for (Iterator iter = values.iterator(); iter.hasNext();) {
+			List<?> values = (List<?>) value;
+			for (Iterator<?> iter = values.iterator(); iter.hasNext();) {
 				Object element = iter.next();
 				if (!feature.getEType().isInstance(element)) {
 					return false;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/RemoveValueRequest.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/RemoveValueRequest.java
index 4f82b3a8bd4..f49402eed4d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/RemoveValueRequest.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/RemoveValueRequest.java
@@ -113,12 +113,12 @@ public class RemoveValueRequest extends AbstractEditCommandRequest {
 	 * getElementsToEdit()
 	 */
 	@Override
-	public List getElementsToEdit() {
+	public List<?> getElementsToEdit() {
 		if (elementToEdit != null) {
 			return Collections.singletonList(elementToEdit);
 		}
 
-		return Collections.EMPTY_LIST;
+		return Collections.emptyList();
 	}
 
 	/*
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/SemanticAdapter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/SemanticAdapter.java
index 7f3ad28f0e2..c3fe5477af8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/SemanticAdapter.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/SemanticAdapter.java
@@ -66,7 +66,6 @@ public class SemanticAdapter implements IAdaptable, IProxyEObject {
 	 * @param element
 	 *            the new element
 	 */
-	// @unused
 	public void setElement(Object element) {
 		this.element = element;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/UpdateLifelineRepresentsCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/UpdateLifelineRepresentsCommand.java
index c7df109b411..8b4dc7c2d2f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/UpdateLifelineRepresentsCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/UpdateLifelineRepresentsCommand.java
@@ -13,9 +13,9 @@
 package org.eclipse.papyrus.uml.diagram.common.commands;
 
 import java.util.Iterator;
+import java.util.List;
 
 import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.ConnectableElement;
@@ -36,7 +36,7 @@ public class UpdateLifelineRepresentsCommand extends AbstractCommand {
 
 	/*
 	 * (non-Javadoc)
-	 *
+	 * 
 	 * @see org.eclipse.emf.common.command.AbstractCommand#canExecute()
 	 */
 	@Override
@@ -100,7 +100,7 @@ public class UpdateLifelineRepresentsCommand extends AbstractCommand {
 	 * @return the ConnectorEnd
 	 */
 	protected ConnectorEnd getConnectorEnd(Interaction interaction, ConnectableElement prop) {
-		EList connectors = interaction.getOwnedConnectors();
+		List<Connector> connectors = interaction.getOwnedConnectors();
 		Connector connector;
 		if (connectors.isEmpty()) {
 			connector = interaction.createOwnedConnector(null);
@@ -109,12 +109,12 @@ public class UpdateLifelineRepresentsCommand extends AbstractCommand {
 			return null;
 		}
 
-		Iterator itconnectors = connectors.iterator();
+		Iterator<Connector> itconnectors = connectors.iterator();
 		ConnectorEnd end = null;
 		while (end == null && itconnectors.hasNext()) {
-			Iterator itends = ((Connector) itconnectors.next()).getEnds().iterator();
+			Iterator<ConnectorEnd> itends = itconnectors.next().getEnds().iterator();
 			while (end == null && itends.hasNext()) {
-				ConnectorEnd e = (ConnectorEnd) itends.next();
+				ConnectorEnd e = itends.next();
 				if (e.getRole() == prop) {
 					end = e;
 				}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/CreateOrShowExistingLinkDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/CreateOrShowExistingLinkDialog.java
index 1fd8687f706..2a3e6fd48ab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/CreateOrShowExistingLinkDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/CreateOrShowExistingLinkDialog.java
@@ -30,7 +30,7 @@ import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.jface.viewers.ViewerColumn;

 import org.eclipse.papyrus.infra.widgets.Activator;

 import org.eclipse.papyrus.uml.diagram.common.messages.Messages;

-import org.eclipse.papyrus.uml.diagram.common.util.EdgeEndsMapper;

+import org.eclipse.papyrus.uml.diagram.common.util.LinkEndsMapper;

 import org.eclipse.papyrus.uml.tools.providers.UMLLabelProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Image;

@@ -96,7 +96,7 @@ public class CreateOrShowExistingLinkDialog extends MessageDialog {
 	/**

 	 * the list of the elements to display in the Table

 	 */

-	private final List<EdgeEndsMapper> existingLinks;

+	private final List<LinkEndsMapper> existingLinks;

 

 

 	final UMLLabelProvider labelProvider = new UMLLabelProvider();

@@ -137,7 +137,7 @@ public class CreateOrShowExistingLinkDialog extends MessageDialog {
 	 * @param elements

 	 *            the list of the possible elements

 	 */

-	public CreateOrShowExistingLinkDialog(final String dialogTitle, final String dialogMessage, final List<EdgeEndsMapper> elements) {

+	public CreateOrShowExistingLinkDialog(final String dialogTitle, final String dialogMessage, final List<LinkEndsMapper> elements) {

 		super(Display.getDefault().getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.QUESTION, new String[] { CREATE_STRING, RESTORE_SELECTION, CANCEL_STRING }, RESTORE_SELECTED_LINK);

 		this.existingLinks = elements;

 	}

@@ -201,7 +201,7 @@ public class CreateOrShowExistingLinkDialog extends MessageDialog {
 				if (checkboxCellEditor.getValue() == Boolean.TRUE) {

 					selectedElementIndex = existingLinks.indexOf(element);

 				}

-				for (final EdgeEndsMapper current : existingLinks) {

+				for (final LinkEndsMapper current : existingLinks) {

 					viewer.update(current, null);

 				}

 			}

@@ -228,8 +228,8 @@ public class CreateOrShowExistingLinkDialog extends MessageDialog {
 

 			@Override

 			public String getText(Object element) {

-				if (element instanceof EdgeEndsMapper) {

-					return labelProvider.getText(((EdgeEndsMapper) element).getLink());

+				if (element instanceof LinkEndsMapper) {

+					return labelProvider.getText(((LinkEndsMapper) element).getLink());

 				}

 				// not possible

 				return NOT_AVAILABLE;

@@ -249,8 +249,8 @@ public class CreateOrShowExistingLinkDialog extends MessageDialog {
 

 			@Override

 			public String getText(Object element) {

-				if (element instanceof EdgeEndsMapper) {

-					return getLabel(((EdgeEndsMapper) element).getEnds());

+				if (element instanceof LinkEndsMapper) {

+					return getLabel(((LinkEndsMapper) element).getEnds());

 				}

 				return NOT_AVAILABLE;

 			}

@@ -263,8 +263,8 @@ public class CreateOrShowExistingLinkDialog extends MessageDialog {
 

 			@Override

 			public String getText(Object element) {

-				if (element instanceof EdgeEndsMapper) {

-					return getLabel(((EdgeEndsMapper) element).getSources());

+				if (element instanceof LinkEndsMapper) {

+					return getLabel(((LinkEndsMapper) element).getSources());

 				}

 				return NOT_AVAILABLE;

 			}

@@ -276,8 +276,8 @@ public class CreateOrShowExistingLinkDialog extends MessageDialog {
 

 			@Override

 			public String getText(Object element) {

-				if (element instanceof EdgeEndsMapper) {

-					return getLabel(((EdgeEndsMapper) element).getTargets());

+				if (element instanceof LinkEndsMapper) {

+					return getLabel(((LinkEndsMapper) element).getTargets());

 				}

 				return NOT_AVAILABLE;

 			}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/SelectDiagramViewsFilterDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/SelectDiagramViewsFilterDialog.java
deleted file mode 100644
index e196e91ad76..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/SelectDiagramViewsFilterDialog.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte, Generalitat
- * de la Comunitat Valenciana . All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Francisco Javier Cano Muñoz (Prodevelop) – initial API and
- * implementation
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.dialogs;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.window.IShellProvider;
-import org.eclipse.papyrus.uml.diagram.common.providers.BaseViewInfoContentProvider;
-import org.eclipse.papyrus.uml.diagram.common.providers.BaseViewInfoLabelProvider;
-import org.eclipse.papyrus.uml.diagram.common.providers.ViewInfo;
-import org.eclipse.papyrus.uml.diagram.common.util.MDTUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TreeItem;
-
-/**
- * The Class SelectDiagramViewsFilterDialog.
- *
- * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
- */
-public class SelectDiagramViewsFilterDialog extends Dialog {
-
-	/** The diagram. */
-	private DiagramEditPart diagram = null;
-
-	/** The view info. */
-	private ViewInfo viewInfo = null;
-
-	/** The tree viewer. */
-	private TreeViewer treeViewer = null;
-
-	/** The selected. */
-	private Collection<Integer> selected = null;
-
-	/**
-	 * Instantiates a new select diagram views filter dialog.
-	 *
-	 * @param parentShell
-	 *            the parent shell
-	 * @param diagram
-	 *            the diagram
-	 */
-	public SelectDiagramViewsFilterDialog(IShellProvider parentShell, DiagramEditPart diagram) {
-		super(parentShell);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * Instantiates a new select diagram views filter dialog.
-	 *
-	 * @param parentShell
-	 *            the parent shell
-	 * @param diagram
-	 *            the diagram
-	 */
-	public SelectDiagramViewsFilterDialog(Shell parentShell, DiagramEditPart diagram) {
-		super(parentShell);
-		this.diagram = diagram;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	@Override
-	protected void okPressed() {
-		buildSelected();
-		super.okPressed();
-	}
-
-	/**
-	 * Gets the diagram edit part.
-	 *
-	 * @return the diagram edit part
-	 */
-	public DiagramEditPart getDiagramEditPart() {
-		return diagram;
-	}
-
-	/**
-	 * Gets the view info.
-	 *
-	 * @return the view info
-	 */
-	public ViewInfo getViewInfo() {
-		if (viewInfo == null) {
-			Object adapter = getDiagramEditPart().getAdapter(ViewInfo.class);
-			if (adapter instanceof ViewInfo) {
-				viewInfo = (ViewInfo) adapter;
-			}
-		}
-		return viewInfo;
-	}
-
-	/**
-	 * Gets the tree viewer.
-	 *
-	 * @return the tree viewer
-	 */
-	public TreeViewer getTreeViewer() {
-		return treeViewer;
-	}
-
-	/**
-	 * Gets the selected.
-	 *
-	 * @return the selected
-	 */
-	public Collection<Integer> getSelected() {
-		if (selected == null) {
-			buildSelected();
-		}
-		return selected;
-	}
-
-	/**
-	 * Builds the selected.
-	 */
-	protected void buildSelected() {
-		selected = new ArrayList<Integer>();
-		if (getTreeViewer() == null || getTreeViewer().getTree() == null || getTreeViewer().getTree().getItems().length <= 0) {
-			return;
-		}
-		for (TreeItem item : getTreeViewer().getTree().getItems()) {
-			if (item.getChecked() == false) {
-				Object data = item.getData();
-				if (data instanceof ViewInfo) {
-					selected.add(((ViewInfo) data).getVisualID());
-				}
-			}
-			addViewInfos(item, selected);
-		}
-		return;
-	}
-
-	/**
-	 * Adds the view infos.
-	 *
-	 * @param root
-	 *            the root
-	 * @param infos
-	 *            the infos
-	 */
-	protected void addViewInfos(TreeItem root, Collection<Integer> infos) {
-		for (TreeItem item : root.getItems()) {
-			if (item.getChecked() == false) {
-				Object data = item.getData();
-				if (data instanceof ViewInfo) {
-					infos.add(((ViewInfo) data).getVisualID());
-				}
-			}
-			addViewInfos(item, infos);
-		}
-	}
-
-	/**
-	 * Gets the diagram.
-	 *
-	 * @return the diagram
-	 */
-	protected Diagram getDiagram() {
-		if (getDiagramEditPart() != null) {
-			return (Diagram) getDiagramEditPart().getNotationView();
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets
-	 * .Composite)
-	 */
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		getShell().setText("Select the views to filter");
-		// create a checked treeviewer
-		Composite composite = new Composite(parent, 0);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL, GridData.FILL_VERTICAL, true, true);
-		data.widthHint = 600;
-		data.heightHint = 400;
-		composite.setLayoutData(data);
-		composite.setLayout(new GridLayout());
-		treeViewer = new TreeViewer(composite, SWT.CHECK | SWT.BORDER);
-		treeViewer.setLabelProvider(new BaseViewInfoLabelProvider());
-		treeViewer.setContentProvider(new BaseViewInfoContentProvider());
-		treeViewer.setInput(getViewInfo());
-		treeViewer.getTree().addSelectionListener(new SelectionListener() {
-
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// should not be called
-			}
-
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				treeItemSelected(e);
-			}
-		});
-		data = new GridData(GridData.FILL_HORIZONTAL, GridData.FILL_VERTICAL, true, true);
-		data.widthHint = 600;
-		data.heightHint = 400;
-		treeViewer.getTree().setLayoutData(data);
-		getTreeViewer().expandAll();
-		populateTree();
-		return composite;
-	}
-
-	/**
-	 * Populate tree.
-	 */
-	protected void populateTree() {
-		if (getTreeViewer() == null || getTreeViewer().getTree() == null || getViewInfo() == null || getDiagram() == null) {
-			return;
-		}
-		Diagram diagram = getDiagram();
-		Collection<Integer> filters = MDTUtil.getAllViewsToFilterFromDiagram(diagram);
-		for (TreeItem item : getTreeViewer().getTree().getItems()) {
-			Object data = item.getData();
-			if (data instanceof ViewInfo) {
-				ViewInfo info = (ViewInfo) data;
-				if (filters.contains(info.getVisualID())) {
-					item.setChecked(false);
-				} else {
-					item.setChecked(true);
-				}
-				if (((ViewInfo) data).isSelectable() == false) {
-					item.setForeground(ColorConstants.gray);
-				}
-			}
-			setChecked(item, filters);
-		}
-	}
-
-	/**
-	 * Sets the checked.
-	 *
-	 * @param root
-	 *            the root
-	 * @param filters
-	 *            the filters
-	 */
-	protected void setChecked(TreeItem root, Collection<Integer> filters) {
-		for (TreeItem item : root.getItems()) {
-			Object data = item.getData();
-			if (data instanceof ViewInfo) {
-				ViewInfo info = (ViewInfo) data;
-				if (filters.contains(info.getVisualID())) {
-					item.setChecked(false);
-				} else {
-					item.setChecked(true);
-				}
-			}
-			setChecked(item, filters);
-		}
-	}
-
-	protected boolean isChecking = false;
-
-	protected void treeItemSelected(SelectionEvent e) {
-		if (e.detail == SWT.CHECK && isChecking == false) {
-			isChecking = true;
-			try {
-				Object data = e.item.getData();
-				ViewInfo viewInfo = (ViewInfo) Platform.getAdapterManager().getAdapter(data, ViewInfo.class);
-				TreeItem item = (TreeItem) Platform.getAdapterManager().getAdapter(e.item, TreeItem.class);
-				if (viewInfo != null && item != null && getTreeViewer().getTree().getItems() != null) {
-					if (viewInfo.isSelectable()) {
-						setAllVisualIDsChecked(getTreeViewer().getTree().getItems(), viewInfo.getVisualID(), item.getChecked());
-					} else {
-						item.setChecked(!item.getChecked());
-					}
-				}
-			} finally {
-				isChecking = false;
-			}
-		}
-	}
-
-	/**
-	 * When one element from the tree is selected, all elements with the same
-	 * VisualID are put into the same state (checked or unchecked).
-	 *
-	 * @param items
-	 * @param visualID
-	 * @param check
-	 */
-	protected void setAllVisualIDsChecked(TreeItem[] items, int visualID, boolean check) {
-		ViewInfo viewInfo = null;
-		for (TreeItem item : items) {
-			if (item != null) {
-				viewInfo = (ViewInfo) Platform.getAdapterManager().getAdapter(item.getData(), ViewInfo.class);
-				if (viewInfo != null && visualID == viewInfo.getVisualID()) {
-					item.setChecked(check);
-				}
-				if (item.getItems() != null) {
-					setAllVisualIDsChecked(item.getItems(), visualID, check);
-				}
-			}
-		}
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/directedit/LabelDirectEditManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/directedit/LabelDirectEditManager.java
index 72587206dcf..b11f0562b1d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/directedit/LabelDirectEditManager.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/directedit/LabelDirectEditManager.java
@@ -9,7 +9,7 @@
  *
  * Contributors:
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
+ *  Benoit Maggi    (CEA LIST) benoit.maggi@cea.fr - Bug 444063 Use static to avoid concurrency problem on restore 
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.common.directedit;
 
@@ -37,7 +37,7 @@ public class LabelDirectEditManager extends DirectEditManager {
 	/**
 	 *
 	 */
-	protected IActionBars actionBars;
+	protected static IActionBars actionBars;
 
 	/**
 	 *
@@ -47,7 +47,7 @@ public class LabelDirectEditManager extends DirectEditManager {
 	/**
 	 *
 	 */
-	protected IAction copy, cut, paste, undo, redo, find, selectAll, delete;
+	protected static IAction copy, cut, paste, undo, redo, find, selectAll, delete;
 
 	/**
 	 * The label to be edited.
@@ -141,8 +141,14 @@ public class LabelDirectEditManager extends DirectEditManager {
 		// Hook the cell editor's copy/paste actions to the actionBars so that
 		// they can
 		// be invoked via keyboard shortcuts.
-		actionBars = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor().getEditorSite().getActionBars();
-		saveCurrentActions(actionBars);
+		IActionBars editorActionBars = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+				.getActivePage().getActiveEditor().getEditorSite()
+				.getActionBars();
+		if (actionBars != null){
+			restoreSavedActions(editorActionBars);
+		}
+		saveCurrentActions(editorActionBars);
+		actionBars = editorActionBars;
 		actionHandler = new CellEditorActionHandler(actionBars);
 		actionHandler.addCellEditor(getCellEditor());
 		actionBars.updateActionBars();
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/directedit/MultilineLabelDirectEditManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/directedit/MultilineLabelDirectEditManager.java
index b5e130e71f3..81558d2188f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/directedit/MultilineLabelDirectEditManager.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/directedit/MultilineLabelDirectEditManager.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
+ * Copyright (c) 2014 CEA LIST.
  *
  *
  * All rights reserved. This program and the accompanying materials
@@ -9,27 +9,50 @@
  *
  * Contributors:
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Benoit Maggi  benoit.maggi@cea.fr - Bug 444063
  *
  *****************************************************************************/
+
 package org.eclipse.papyrus.uml.diagram.common.directedit;
 
 import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.PositionConstants;
 import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.gef.tools.CellEditorLocator;
+import org.eclipse.gmf.runtime.common.ui.contentassist.ContentAssistantHelper;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;
+import org.eclipse.gmf.runtime.diagram.ui.tools.DirectEditManagerBase;
 import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.gef.ui.internal.parts.TextCellEditorEx;
+import org.eclipse.gmf.runtime.gef.ui.internal.parts.WrapTextCellEditor;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.papyrus.uml.diagram.common.figure.node.IMultilineEditableFigure;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.actions.ActionFactory;
+import org.eclipse.ui.part.CellEditorActionHandler;
 
 /**
- * DirectEdit manager for multi lines label managed by a LabelControlerManager.
- * It is intended to be used in conjunction with LabelDirectEditPolicy and
- * LabelControler.
+ * Inspired from {@link org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager}
+ * but use static to avoid concurrency problem on restore (Bug 444063)
  */
-public class MultilineLabelDirectEditManager extends TextDirectEditManager {
+public class MultilineLabelDirectEditManager extends DirectEditManagerBase {
+
+	private static IAction copy, cut, paste, undo, redo, find, selectAll, delete;
+
+	private static IActionBars actionBars;
 
+	private CellEditorActionHandler actionHandler;
+	
 	protected boolean multiLine = false;
 
 	/**
@@ -39,7 +62,6 @@ public class MultilineLabelDirectEditManager extends TextDirectEditManager {
 	 * @param editorType
 	 * @param locator
 	 */
-	@SuppressWarnings("unchecked")
 	public MultilineLabelDirectEditManager(GraphicalEditPart source, Class editorType, CellEditorLocator locator) {
 		super(source, editorType, locator);
 		if (editorType != null && MultiLineCellEditor.class.isAssignableFrom(editorType)) {
@@ -79,6 +101,146 @@ public class MultilineLabelDirectEditManager extends TextDirectEditManager {
 			return new TextCellEditor(composite, SWT.MULTI | SWT.WRAP);
 		}
 		return super.createCellEditorOn(composite);
+	}	
+	
+	/**
+	 * constructor
+	 * 
+	 * @param source
+	 *            <code>GraphicalEditPart</code> to support direct edit of. The
+	 *            figure of the <code>source</code> edit part must be of type
+	 *            <code>WrapLabel</code>.
+	 */
+	public MultilineLabelDirectEditManager(ITextAwareEditPart source) {
+		super(source);
+	}
+
+	/**
+	 * @param source
+	 *            the <code>ITextAwareEditPart</code> to determine the cell
+	 *            editor for
+	 * @return the <code>CellEditorLocator</code> that is appropriate for the
+	 *         source <code>EditPart</code>
+	 */
+	public static CellEditorLocator getTextCellEditorLocator(final ITextAwareEditPart source) {
+		return getCellEditorLocator(source);
+	}
 
+	protected CellEditor doCreateCellEditorOn(Composite composite) {
+
+		ILabelDelegate label = (ILabelDelegate) getEditPart().getAdapter(ILabelDelegate.class);
+		if (label != null && label.isTextWrapOn()) {
+			int style = SWT.WRAP | SWT.MULTI;
+
+			switch (label.getTextJustification()) {
+			case PositionConstants.LEFT:
+				style = style | SWT.LEAD;
+				break;
+			case PositionConstants.RIGHT:
+				style = style | SWT.TRAIL;
+				break;
+			case PositionConstants.CENTER:
+				style = style | SWT.CENTER;
+				break;
+			default:
+				break;
+			}
+			return new WrapTextCellEditor(composite, style);
+		} else {
+			return new TextCellEditorEx(composite);
+		}
 	}
-}
+
+	/**
+	 * This method is used to set the cell editors text
+	 * 
+	 * @param toEdit
+	 *            String to be set in the cell editor
+	 */
+	@Override
+	public void setEditText(String toEdit) {
+		super.setEditText(toEdit);
+
+		// Get the cell editor
+		CellEditor cellEditor = getCellEditor();
+
+		// IF the cell editor doesn't exist yet...
+		if (cellEditor == null) {
+			// Do nothing
+			return;
+		}
+
+		// Get the Text control
+		Text textControl = (Text) cellEditor.getControl();
+
+		// Set the controls text and position the caret at the end of the text
+		textControl.setSelection(toEdit.length());
+	}
+
+	@Override
+	protected void createContentAssistant(Control control, Color proposalPopupForegroundColor, Color proposalPopupBackgroundColor, IContentAssistProcessor processor) {
+		ContentAssistantHelper.createTextContentAssistant((Text) control, proposalPopupForegroundColor, proposalPopupBackgroundColor, processor);
+	}
+
+	@Override
+	protected void initCellEditor() {
+		super.initCellEditor();
+
+		//Hook the cell editor's copy/paste actions to the actionBars so that they can
+		// be invoked via keyboard shortcuts.
+		
+		IActionBars editorActionBars = PlatformUI.getWorkbench()
+				.getActiveWorkbenchWindow().getActivePage().getActiveEditor()
+				.getEditorSite().getActionBars();
+		if (actionBars != null) {
+			restoreSavedActions(editorActionBars);
+		}
+		saveCurrentActions(editorActionBars);
+		actionBars = editorActionBars;
+		actionHandler = new CellEditorActionHandler(actionBars);
+		actionHandler.addCellEditor(getCellEditor());
+		actionBars.updateActionBars();
+
+	}
+	
+	/**
+	 * @see org.eclipse.gef.tools.DirectEditManager#bringDown()
+	 */
+	@Override
+	protected void bringDown() {
+		super.bringDown();
+
+		if (actionHandler != null) {
+			actionHandler.dispose();
+			actionHandler = null;
+		}
+		if (actionBars != null) {
+			restoreSavedActions(actionBars);
+			actionBars.updateActionBars();
+			actionBars = null;
+		}
+	}
+
+	private void saveCurrentActions(IActionBars _actionBars) {
+		copy = _actionBars.getGlobalActionHandler(ActionFactory.COPY.getId());
+		paste = _actionBars.getGlobalActionHandler(ActionFactory.PASTE.getId());
+		delete = _actionBars.getGlobalActionHandler(ActionFactory.DELETE.getId());
+		selectAll = _actionBars.getGlobalActionHandler(ActionFactory.SELECT_ALL.getId());
+		cut = _actionBars.getGlobalActionHandler(ActionFactory.CUT.getId());
+		find = _actionBars.getGlobalActionHandler(ActionFactory.FIND.getId());
+		undo = _actionBars.getGlobalActionHandler(ActionFactory.UNDO.getId());
+		redo = _actionBars.getGlobalActionHandler(ActionFactory.REDO.getId());
+	}
+
+	private void restoreSavedActions(IActionBars _actionBars) {
+		_actionBars.setGlobalActionHandler(ActionFactory.COPY.getId(), copy);
+		_actionBars.setGlobalActionHandler(ActionFactory.PASTE.getId(), paste);
+		_actionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(), delete);
+		_actionBars.setGlobalActionHandler(ActionFactory.SELECT_ALL.getId(), selectAll);
+		_actionBars.setGlobalActionHandler(ActionFactory.CUT.getId(), cut);
+		_actionBars.setGlobalActionHandler(ActionFactory.FIND.getId(), find);
+		_actionBars.setGlobalActionHandler(ActionFactory.UNDO.getId(), undo);
+		_actionBars.setGlobalActionHandler(ActionFactory.REDO.getId(), redo);
+	}
+
+}
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/draw2d/LaneLayout.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/draw2d/LaneLayout.java
index 0c2e631903f..c72b70f4ce0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/draw2d/LaneLayout.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/draw2d/LaneLayout.java
@@ -23,9 +23,9 @@ import org.eclipse.draw2d.geometry.Transposer;
 
 public class LaneLayout extends AbstractHintLayout {
 
-	public static int HORIZONTAL = 0;
+	public static final int HORIZONTAL = 0;
 
-	public static int VERTICAL = 1;
+	public static final int VERTICAL = 1;
 
 	private static final Insets NO_INSETS = new Insets(0, 0, 0, 0);
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/UMLConnectionNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/UMLConnectionNodeEditPart.java
index c59b62df1ee..bb6cae5ec2b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/UMLConnectionNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/UMLConnectionNodeEditPart.java
@@ -252,8 +252,8 @@ public abstract class UMLConnectionNodeEditPart extends ConnectionEditPart imple
 
 		// Get the preference from PreferenceStore. there should be an assert
 		final IPreferenceStore store = Activator.getDefault().getPreferenceStore();
-		assert store != null : "The preference store was not found";
 		if (store == null) {
+			Activator.log.warn("The preference store was not found");
 			return "";
 		}
 		String sNameAppearance = store.getString(UMLVisualInformationPapyrusConstant.P_STEREOTYPE_NAME_APPEARANCE);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AppliedStereotypeLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AppliedStereotypeLabelDisplayEditPolicy.java
index ee2e063eaff..4ec0b7b67eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AppliedStereotypeLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/AppliedStereotypeLabelDisplayEditPolicy.java
@@ -121,8 +121,8 @@ public abstract class AppliedStereotypeLabelDisplayEditPolicy extends AbstractAp
 	public String stereotypesAndPropertiesToDisplay(String separator, String stereotypesToDisplay, String stereotypeWithQualifiedName, String stereotypesPropertiesToDisplay) {
 		// Get the preference from PreferenceStore. there should be an assert
 		final IPreferenceStore store = Activator.getDefault().getPreferenceStore();
-		assert store != null : "The preference store was not found";
 		if (store == null) {
+			Activator.log.warn("The preference store was not found");
 			return "";
 		}
 		// retrieve if the name of the stereotype has to put to lower case or
@@ -266,8 +266,8 @@ public abstract class AppliedStereotypeLabelDisplayEditPolicy extends AbstractAp
 
 		// Get the preference from PreferenceStore. there should be an assert
 		final IPreferenceStore store = Activator.getDefault().getPreferenceStore();
-		assert store != null : "The preference store was not found";
 		if (store == null) {
+			Activator.log.warn("The preference store was not found");
 			return "";
 		}
 		String sNameAppearance = store.getString(UMLVisualInformationPapyrusConstant.P_STEREOTYPE_NAME_APPEARANCE);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DeleteOnlyViewComponentEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DeleteOnlyViewComponentEditPolicy.java
deleted file mode 100644
index 8ae9646a9a5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DeleteOnlyViewComponentEditPolicy.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte, Generalitat
- * de la Comunitat Valenciana . All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Francisco Javier Cano Muñoz (Prodevelop) – Initial implementation.
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.editpolicies;
-
-import java.util.Collections;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ComponentEditPolicy;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.commands.RemoveEObjectReferencesFromDiagram;
-
-// TODO: Auto-generated Javadoc
-/**
- * A ComponentEditPolicy that prevents the deletion of the underlying models. Will delete the view
- * and remove the element's reference from the diagram upon a delete request.
- *
- * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
- */
-public class DeleteOnlyViewComponentEditPolicy extends ComponentEditPolicy {
-
-	/**
-	 * Gets the graphical host.
-	 *
-	 * @return the graphical host
-	 */
-	protected IGraphicalEditPart getGraphicalHost() {
-		if (getHost() instanceof IGraphicalEditPart) {
-			return (IGraphicalEditPart) getHost();
-		}
-		return null;
-	}
-
-	/**
-	 * Won't delete the underlying model element.
-	 *
-	 * @return true, if should delete semantic
-	 */
-	@Override
-	protected boolean shouldDeleteSemantic() {
-		return false;
-	}
-
-	/**
-	 * Will delete the view and remove the EObject's reference from the
-	 * diagram's list of elements to show.
-	 *
-	 * @param request
-	 *            the request
-	 *
-	 * @return the delete command
-	 */
-	@Override
-	protected Command getDeleteCommand(GroupRequest request) {
-		IGraphicalEditPart editPart = getGraphicalHost();
-		TransactionalEditingDomain domain = editPart != null ? editPart.getEditingDomain() : null;
-		View view = editPart != null ? editPart.getNotationView() : null;
-		Diagram diagram = view != null ? view.getDiagram() : null;
-		EObject element = editPart != null ? editPart.resolveSemanticElement() : null;
-		Command command = super.getDeleteCommand(request);
-		if (domain != null && diagram != null && element != null) {
-			command = command.chain(new ICommandProxy(new RemoveEObjectReferencesFromDiagram(domain, diagram, Collections.singletonList(element))));
-		}
-		return command;
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DiagramDragDropEditPolicy.java
deleted file mode 100644
index 140cf080926..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DiagramDragDropEditPolicy.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte, Generalitat
- * de la Comunitat Valenciana . All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Francisco Javier Cano Muñoz (Prodevelop) – Initial implementation.
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.editpolicies;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.commands.AddEObjectReferencesToDiagram;
-import org.eclipse.papyrus.uml.diagram.common.commands.UpdateDiagramCommand;
-
-// TODO: Auto-generated Javadoc
-/**
- * A DragAndDropEditPolicy for <Diagram>s. Checks whether the dropped elements can be shown as views
- * in the canvas and if so, creates their views and add their references to the diagram's list of
- * references.
- *
- * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
- * @deprecated
- */
-@Deprecated
-public class DiagramDragDropEditPolicy extends org.eclipse.gmf.runtime.diagram.ui.editpolicies.DiagramDragDropEditPolicy {
-
-	/** The resolver. */
-	private ViewResolver resolver = null;
-
-	/**
-	 * Instantiates a new diagram drag drop edit policy.
-	 *
-	 * @param resolver
-	 *            the resolver
-	 */
-	public DiagramDragDropEditPolicy(ViewResolver resolver) {
-		this.resolver = resolver;
-	}
-
-	/**
-	 * Gets the graphical host.
-	 *
-	 * @return the graphical host
-	 */
-	public IGraphicalEditPart getGraphicalHost() {
-		if (getHost() instanceof IGraphicalEditPart) {
-			return (IGraphicalEditPart) getHost();
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.gmf.runtime.diagram.ui.editpolicies.DiagramDragDropEditPolicy
-	 * #getDropObjectsCommand
-	 * (org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest)
-	 */
-	@Override
-	public Command getDropObjectsCommand(DropObjectsRequest dropRequest) {
-		// get nodes and edges to add to this Diagram.
-		List<EObject> nodeObjects = findNodesInDrop(dropRequest);
-		List<ViewDescriptor> viewDescriptors = createViewDescriptors(nodeObjects);
-		List<EObject> edgeObjects = findEdgesInDrop(dropRequest);
-		// build commands that add references to the diagram.
-		Command command = buildAddEObjectsReferencesCommand(nodeObjects);
-		Command edgesCommand = buildAddEObjectsReferencesCommand(edgeObjects);
-		command = command == null ? edgesCommand : command.chain(edgesCommand);
-		// if no nodes or edges are to be added, there is nothing to do.
-		if (command == null) {
-			return null;
-		}
-		// build the create views commands.
-		Command viewsCommand = createViewsAndArrangeCommand(dropRequest, viewDescriptors);
-		if (viewsCommand != null && viewsCommand.canExecute()) {
-			command = command.chain(viewsCommand);
-		}
-		// update diagram.
-		command = command.chain(new UpdateDiagramCommand(getGraphicalHost()));
-		// return command
-		return command;
-	}
-
-	/**
-	 * Find nodes in drop.
-	 *
-	 * @param request
-	 *            the request
-	 *
-	 * @return the list< e object>
-	 */
-	protected List<EObject> findNodesInDrop(DropObjectsRequest request) {
-		List<EObject> nodes = new ArrayList<EObject>();
-		for (Object object : request.getObjects()) {
-			if (object instanceof EObject) {
-				EObject element = (EObject) object;
-				if (resolver.isEObjectNode(element)) {
-					nodes.add(element);
-				}
-			}
-		}
-		return nodes;
-	}
-
-	/**
-	 * Find edges in drop.
-	 *
-	 * @param request
-	 *            the request
-	 *
-	 * @return the list< e object>
-	 */
-	protected List<EObject> findEdgesInDrop(DropObjectsRequest request) {
-		List<EObject> edges = new ArrayList<EObject>();
-		for (Object object : request.getObjects()) {
-			if (object instanceof EObject) {
-				EObject element = (EObject) object;
-				if (resolver.isEObjectLink(element)) {
-					edges.add(element);
-				}
-			}
-		}
-		return edges;
-	}
-
-	/**
-	 * Creates the view descriptors.
-	 *
-	 * @param elements
-	 *            the elements
-	 *
-	 * @return the list< view descriptor>
-	 */
-	protected List<ViewDescriptor> createViewDescriptors(List<EObject> elements) {
-		List<ViewDescriptor> viewDescriptors = new ArrayList<ViewDescriptor>();
-		for (EObject element : elements) {
-			int semanticHint = resolver.getEObjectSemanticHint(element);
-			if (semanticHint > -1) {
-				ViewDescriptor viewDescriptor = new ViewDescriptor(new EObjectAdapter(element), Node.class, String.valueOf(semanticHint), getGraphicalHost().getDiagramPreferencesHint());
-				viewDescriptors.add(viewDescriptor);
-			}
-		}
-		return viewDescriptors;
-	}
-
-	/**
-	 * Builds the add e objects references command.
-	 *
-	 * @param elements
-	 *            the elements
-	 *
-	 * @return the command
-	 */
-	protected Command buildAddEObjectsReferencesCommand(List<EObject> elements) {
-		if (elements != null && elements.size() > 0) {
-			TransactionalEditingDomain domain = getGraphicalHost().getEditingDomain();
-			View view = getGraphicalHost().getNotationView();
-			Diagram diagram = view instanceof Diagram ? (Diagram) view : null;
-			if (diagram != null) {
-				return new ICommandProxy(new AddEObjectReferencesToDiagram(domain, diagram, elements));
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DragDropEditPolicy.java
deleted file mode 100644
index b4a00529222..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DragDropEditPolicy.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte, Generalitat
- * de la Comunitat Valenciana . All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Francisco Javier Cano Muñoz (Prodevelop) – Initial implementation.
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.editpolicies;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ArrangeRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RefreshConnectionsRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.commands.AddEObjectReferencesToDiagram;
-import org.eclipse.papyrus.uml.diagram.common.commands.UpdateDiagramCommand;
-import org.eclipse.papyrus.uml.diagram.common.util.MDTUtil;
-
-// TODO: Auto-generated Javadoc
-/**
- * A DragAndDropEditPolicy for compartment nodes. Checks whether the dropped elements can be shown
- * as views in the compartment and if so, created their views and add their references to the
- * diagram's list of references.
- *
- * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
- * @deprecated
- */
-@Deprecated
-public class DragDropEditPolicy extends org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy {
-
-	/** The view resolver. */
-	private ViewResolver viewResolver = null;
-
-	/**
-	 * Instantiates a new drag drop edit policy.
-	 *
-	 * @param resolver
-	 *            the resolver
-	 */
-	public DragDropEditPolicy(ViewResolver resolver) {
-		this.viewResolver = resolver;
-	}
-
-	/**
-	 * Gets the view resolver.
-	 *
-	 * @return the view resolver
-	 */
-	protected ViewResolver getViewResolver() {
-		return viewResolver;
-	}
-
-	/**
-	 * Gets the graphical host.
-	 *
-	 * @return the graphical host
-	 */
-	public IGraphicalEditPart getGraphicalHost() {
-		if (getHost() instanceof IGraphicalEditPart) {
-			return (IGraphicalEditPart) getHost();
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @seeorg.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy#
-	 * getDropCommand(org.eclipse .gef.requests.ChangeBoundsRequest)
-	 */
-	@Override
-	protected Command getDropCommand(ChangeBoundsRequest request) {
-		if (request.getType() != null && request.getType().equals(RequestConstants.REQ_DROP)) {
-			// for each EditPart, get its semantic element and check if there's
-			// any View available for that kind of element in this container.
-			for (Object o : request.getEditParts()) {
-				EObject element = MDTUtil.resolveSemantic(o);
-				if (getViewResolver().isEObjectNode(element) == false) {
-					return UnexecutableCommand.INSTANCE;
-				}
-			}
-		}
-		return super.getDropCommand(request);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @seeorg.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy#
-	 * getDropObjectsCommand(
-	 * org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest)
-	 */
-	@Override
-	public Command getDropObjectsCommand(DropObjectsRequest dropRequest) {
-		// get nodes and edges to add to this Diagram.
-		List<EObject> nodeObjects = findNodesInDrop(dropRequest);
-		List<ViewDescriptor> viewDescriptors = createViewDescriptors(nodeObjects);
-		List<EObject> edgeObjects = findEdgesInDrop(dropRequest);
-		Command command = buildDropCommand(dropRequest, nodeObjects, viewDescriptors, edgeObjects);
-		return command;
-	}
-
-	/**
-	 * Find nodes in drop.
-	 *
-	 * @param request
-	 *            the request
-	 *
-	 * @return the list< e object>
-	 */
-	protected List<EObject> findNodesInDrop(DropObjectsRequest request) {
-		List<EObject> nodes = new ArrayList<EObject>();
-		for (Object object : request.getObjects()) {
-			if (object instanceof EObject) {
-				EObject element = (EObject) object;
-				if (getViewResolver().isEObjectNode(element)) {
-					nodes.add(element);
-				}
-			}
-		}
-		return nodes;
-	}
-
-	/**
-	 * Find edges in drop.
-	 *
-	 * @param request
-	 *            the request
-	 *
-	 * @return the list< e object>
-	 */
-	protected List<EObject> findEdgesInDrop(DropObjectsRequest request) {
-		List<EObject> edges = new ArrayList<EObject>();
-		for (Object object : request.getObjects()) {
-			if (object instanceof EObject) {
-				EObject element = (EObject) object;
-				if (getViewResolver().isEObjectLink(element)) {
-					edges.add(element);
-				}
-			}
-		}
-		return edges;
-	}
-
-	/**
-	 * Creates the view descriptors.
-	 *
-	 * @param elements
-	 *            the elements
-	 *
-	 * @return the list< view descriptor>
-	 */
-	protected List<ViewDescriptor> createViewDescriptors(List<EObject> elements) {
-		List<ViewDescriptor> viewDescriptors = new ArrayList<ViewDescriptor>();
-		for (EObject element : elements) {
-			int semanticHint = viewResolver.getEObjectSemanticHint(element);
-			if (semanticHint > -1) {
-				ViewDescriptor viewDescriptor = new ViewDescriptor(new EObjectAdapter(element), Node.class, String.valueOf(semanticHint), getGraphicalHost().getDiagramPreferencesHint());
-				viewDescriptors.add(viewDescriptor);
-			}
-		}
-		return viewDescriptors;
-	}
-
-	/**
-	 * Builds the drop command.
-	 *
-	 * @param request
-	 *            the request
-	 * @param nodes
-	 *            the nodes
-	 * @param views
-	 *            the views
-	 * @param edges
-	 *            the edges
-	 *
-	 * @return the command
-	 */
-	protected Command buildDropCommand(DropObjectsRequest request, List<EObject> nodes, List<ViewDescriptor> views, List<EObject> edges) {
-		// build commands that add references to the diagram.
-		Command command = buildAddEObjectsReferencesCommand(nodes);
-		Command edgesCommand = buildAddEObjectsReferencesCommand(edges);
-		command = command == null ? edgesCommand : command.chain(edgesCommand);
-		// if no nodes or edges are to be added, there is nothing to do.
-		if (command == null) {
-			return null;
-		}
-		// build the create views commands.
-		Command viewsCommand = createViewsAndArrangeCommand(request, views);
-		if (viewsCommand != null && viewsCommand.canExecute()) {
-			command = command.chain(viewsCommand);
-		}
-		// update diagram.
-		command = command.chain(new UpdateDiagramCommand(getGraphicalHost()));
-		// return command
-		return command;
-	}
-
-	/**
-	 * Builds the add e objects references command.
-	 *
-	 * @param elements
-	 *            the elements
-	 *
-	 * @return the command
-	 */
-	protected Command buildAddEObjectsReferencesCommand(List<EObject> elements) {
-		if (elements != null && elements.size() > 0) {
-			TransactionalEditingDomain domain = getGraphicalHost().getEditingDomain();
-			View view = getGraphicalHost().getNotationView();
-			if (view != null) {
-				return new ICommandProxy(new AddEObjectReferencesToDiagram(domain, view.getDiagram(), elements));
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * createViewsAndArrangeCommand Method to create all the view based on the
-	 * viewDescriptors list and provide a default arrangement of them.
-	 *
-	 * @param dropRequest
-	 *            the drop request
-	 * @param viewDescriptors
-	 *            the view descriptors
-	 *
-	 * @return command
-	 */
-	protected Command createViewsAndArrangeCommand(DropObjectsRequest dropRequest, List viewDescriptors) {
-		CreateViewRequest createViewRequest = new CreateViewRequest(viewDescriptors);
-		createViewRequest.setLocation(dropRequest.getLocation());
-		Command createCommand = getHost().getCommand(createViewRequest);
-
-		if (createCommand != null) {
-			List result = (List) createViewRequest.getNewObject();
-			dropRequest.setResult(result);
-
-			RefreshConnectionsRequest refreshRequest = new RefreshConnectionsRequest(result);
-			Command refreshCommand = getHost().getCommand(refreshRequest);
-
-			ArrangeRequest arrangeRequest = new ArrangeRequest(RequestConstants.REQ_ARRANGE_DEFERRED);
-			arrangeRequest.setViewAdaptersToArrange(result);
-			Command arrangeCommand = getHost().getCommand(arrangeRequest);
-
-			CompoundCommand cc = new CompoundCommand(createCommand.getLabel());
-			cc.add(createCommand.chain(refreshCommand));
-			cc.add(arrangeCommand);
-
-			return cc;
-		}
-		return null;
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/QualifiedNameDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/QualifiedNameDisplayEditPolicy.java
index 336273b08a3..1c9989e98b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/QualifiedNameDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/QualifiedNameDisplayEditPolicy.java
@@ -182,7 +182,7 @@ public class QualifiedNameDisplayEditPolicy extends GraphicalEditPolicy implemen
 			return;
 		}
 
-		if (UMLPackage.eINSTANCE.getNamedElement_Name().equals(notification.getFeatureID(NamedElement.class)) || notification.getNotifier() instanceof EAnnotation) {
+		if (UMLPackage.eINSTANCE.getNamedElement_Name().equals(notification.getFeature()) || notification.getNotifier() instanceof EAnnotation) {
 			refreshQualifiedNameDisplay();
 		} else if (UMLPackage.eINSTANCE.getNamedElement_Name().equals(notification.getFeature())) {
 			if (parentListeners.contains(notification.getNotifier()) || getNamedElement().equals(notification.getNotifier())) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/layout/PropertiesCompartmentLayoutManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/layout/PropertiesCompartmentLayoutManager.java
index cffe7e7b39b..360a7691b6a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/layout/PropertiesCompartmentLayoutManager.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/layout/PropertiesCompartmentLayoutManager.java
@@ -20,9 +20,9 @@ import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeCompa
 
 public class PropertiesCompartmentLayoutManager extends AbstractLayout {
 
-	protected static int MARGIN_X = 5;
+	protected static final int MARGIN_X = 5;
 
-	protected static int MARGIN_Y = 10;
+	protected static final int MARGIN_Y = 10;
 
 	/**
 	 *
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/CornerBentFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/CornerBentFigure.java
index 683bb6d7709..62a1472bf13 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/CornerBentFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/CornerBentFigure.java
@@ -201,7 +201,7 @@ public class CornerBentFigure extends NoteFigure implements IPapyrusNodeUMLEleme
 	 */
 	@Override
 	public void setStereotypePropertiesInCompartment(String stereotypeProperties) {
-		if (stereotypeProperties == null || stereotypeProperties == "") {
+		if (stereotypeProperties == null || "".equals(stereotypeProperties)) {
 			// remove figure of stereotype properties compartment
 			if (this.stereotypePropertiesContent != null) {
 				this.remove(this.stereotypePropertiesContent);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/NodeNamedElementFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/NodeNamedElementFigure.java
index df888337696..07e908b111c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/NodeNamedElementFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/NodeNamedElementFigure.java
@@ -14,11 +14,9 @@
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.common.figure.node;
 
-import java.util.Iterator;
 import java.util.StringTokenizer;
 
 import org.eclipse.draw2d.Border;
-import org.eclipse.draw2d.FigureListener;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.Label;
 import org.eclipse.draw2d.LayoutManager;
@@ -432,21 +430,6 @@ public class NodeNamedElementFigure extends PapyrusNodeFigure implements IPapyru
 	}
 
 	/**
-	 * Copy context to.
-	 *
-	 * @param fig
-	 *            the fig
-	 */
-	// @unused
-	public void copyContextTo(IFigure fig) {
-		Iterator it = this.getListeners(FigureListener.class);
-		while (it.hasNext()) {
-			fig.addFigureListener((FigureListener) it.next());
-		}
-
-	}
-
-	/**
 	 * used to create a label that contains the icon.
 	 */
 	protected void createIconLabel() {
@@ -1031,7 +1014,7 @@ public class NodeNamedElementFigure extends PapyrusNodeFigure implements IPapyru
 	 */
 	@Override
 	public void setStereotypePropertiesInCompartment(String stereotypeProperties) {
-		if (stereotypeProperties == null || stereotypeProperties.trim() == "") {
+		if (stereotypeProperties == null || "".equals(stereotypeProperties.trim())) {
 			// remove figure of stereotype properties compartment
 			if (this.stereotypePropertiesContent != null) {
 				getStereotypePropertiesCompartmentContainer().remove(this.stereotypePropertiesContent);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/AlignmentLinkHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/AlignmentLinkHelper.java
index 950b4a490c4..07acada97b2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/AlignmentLinkHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/AlignmentLinkHelper.java
@@ -66,6 +66,7 @@ public class AlignmentLinkHelper {
 	 *         </ul>
 	 */
 	public Command createCommand() {
+		// Only TOP, BOTTOM, LEFT, and RIGHT align are allowed
 		if (this.alignment == PositionConstants.MIDDLE || this.alignment == PositionConstants.CENTER || this.linkEditparts.size() == 0) {
 			return UnexecutableCommand.INSTANCE;
 		}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/BasicClassifierCompartmentLayoutHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/BasicClassifierCompartmentLayoutHelper.java
index a8d92fd13e3..39952a8c057 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/BasicClassifierCompartmentLayoutHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/BasicClassifierCompartmentLayoutHelper.java
@@ -27,7 +27,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.layout.ManualCompartmentToo
 public class BasicClassifierCompartmentLayoutHelper extends ClassifierCompartmentLayoutHelper {
 
 	/** The e instance. */
-	protected static BasicClassifierCompartmentLayoutHelper eInstance = new BasicClassifierCompartmentLayoutHelper();
+	protected static final BasicClassifierCompartmentLayoutHelper eInstance = new BasicClassifierCompartmentLayoutHelper();
 
 	/** The manualtool box. */
 	protected ILayoutToolBox manualtoolBox;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/CreateOrShowExistingElementHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/CreateOrShowExistingElementHelper.java
index 27ddd395245..e6ae1ae2e21 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/CreateOrShowExistingElementHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/CreateOrShowExistingElementHelper.java
@@ -34,7 +34,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.osgi.util.NLS;

 import org.eclipse.papyrus.uml.diagram.common.dialogs.CreateOrShowExistingLinkDialog;

 import org.eclipse.papyrus.uml.diagram.common.messages.Messages;

-import org.eclipse.papyrus.uml.diagram.common.util.EdgeEndsMapper;

+import org.eclipse.papyrus.uml.diagram.common.util.LinkEndsMapper;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.UMLPackage;

 

@@ -105,7 +105,7 @@ public class CreateOrShowExistingElementHelper {
 		if (showDialogAccordingPreferences() && defaultCommand.canExecute()) {

 			final EObject container = req.getContainer();

 			if (container instanceof Element) {

-				final List<EdgeEndsMapper> existingElements = getExistingLinksBetweenSourceAndTarget(req, linkElementType);

+				final List<LinkEndsMapper> existingElements = getExistingLinksBetweenSourceAndTarget(req, linkElementType);

 				if (existingElements.size() > 0) {

 					final String className = getIElementTypeNameToDisplay(linkElementType);

 					final String dialogTitle = NLS.bind(Messages.CreateOrShowExistingElementHelper_CreateOrRestoreX, className);

@@ -166,8 +166,8 @@ public class CreateOrShowExistingElementHelper {
 	 * @return

 	 *         a list of {@link EdgeEndsMapper} referencing the existing links between the source and the target

 	 */

-	protected List<EdgeEndsMapper> getExistingLinksBetweenSourceAndTarget(final CreateRelationshipRequest request, final IElementType wantedElementType) {

-		final List<EdgeEndsMapper> existingElement = new ArrayList<EdgeEndsMapper>();

+	protected List<LinkEndsMapper> getExistingLinksBetweenSourceAndTarget(final CreateRelationshipRequest request, final IElementType wantedElementType) {

+		final List<LinkEndsMapper> existingElement = new ArrayList<LinkEndsMapper>();

 		for (final Element current : ((Element) request.getContainer()).getOwnedElements()) {

 			if (hasWantedType(current, wantedElementType)) {

 				final Collection<?> sources = this.linkMappingHelper.getSource(current);

@@ -175,9 +175,9 @@ public class CreateOrShowExistingElementHelper {
 				if (sources.contains(request.getSource()) && targets.contains(request.getTarget())) {

 					final EClass wantedEClass = wantedElementType.getEClass();

 					if ((wantedEClass == UMLPackage.eINSTANCE.getConnector()) || (wantedEClass == UMLPackage.eINSTANCE.getAssociation())) {

-						existingElement.add(new EdgeEndsMapper(current, sources, null, null));

+						existingElement.add(new LinkEndsMapper(current, sources, null, null));

 					} else {

-						existingElement.add(new EdgeEndsMapper(current, null, sources, targets));

+						existingElement.add(new LinkEndsMapper(current, null, sources, targets));

 					}

 				}

 			}

@@ -198,7 +198,7 @@ public class CreateOrShowExistingElementHelper {
 	 * @return

 	 *         the command to open the dialog AND do the selected action

 	 */

-	public static final ICommand getOpenLinkDialogCommand(final CreateRelationshipRequest request, final Command defaultCommand, final CreateOrShowExistingLinkDialog dialog, final List<EdgeEndsMapper> existingEObject) {

+	public static final ICommand getOpenLinkDialogCommand(final CreateRelationshipRequest request, final Command defaultCommand, final CreateOrShowExistingLinkDialog dialog, final List<LinkEndsMapper> existingEObject) {

 		final AbstractTransactionalCommand compoundCommand = new AbstractTransactionalCommand(request.getEditingDomain(), "", null) { //$NON-NLS-1$

 

 			/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/StereotypedElementLabelHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/StereotypedElementLabelHelper.java
index 48e3e4376c6..8f88dd069b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/StereotypedElementLabelHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/StereotypedElementLabelHelper.java
@@ -128,8 +128,8 @@ public abstract class StereotypedElementLabelHelper {
 	public String stereotypesAndPropertiesToDisplay(GraphicalEditPart editPart, String separator, String stereotypesToDisplay, String stereotypeWithQualifiedName, String stereotypesPropertiesToDisplay) {
 		// Get the preference from PreferenceStore. there should be an assert
 		final IPreferenceStore store = Activator.getDefault().getPreferenceStore();
-		assert store != null : "The preference store was not found";
 		if (store == null) {
+			Activator.log.warn("The preference store was not found");
 			return "";
 		}
 		// retrieve if the name of the stereotype has to put to lower case or
@@ -261,8 +261,8 @@ public abstract class StereotypedElementLabelHelper {
 		// or kept as entered by user (user controlled)
 		// Get the preference from PreferenceStore. there should be an assert
 		final IPreferenceStore store = Activator.getDefault().getPreferenceStore();
-		assert store != null : "The preference store was not found";
 		if (store == null) {
+			Activator.log.warn("The preference store was not found");
 			return "";
 		}
 		String sNameAppearance = store.getString(UMLVisualInformationPapyrusConstant.P_STEREOTYPE_NAME_APPEARANCE);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ids/MOSKittEditorIDs.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ids/MOSKittEditorIDs.java
deleted file mode 100644
index 8c2001dd239..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ids/MOSKittEditorIDs.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte,
- * Generalitat de la Comunitat Valenciana .
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Francisco Javier Cano Muñoz (Prodevelop) - initial API implementation
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.ids;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class MOSKittEditorIDs.
- *
- * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
- * @deprecated now it is papyrus editor id
- */
-@Deprecated
-public class MOSKittEditorIDs {
-
-	/** Extension Point functionality. */
-
-	private static final String mapModelToEditorExtensionPoint = "org.eclipse.papyrus.uml.diagram.common.modelToEditorMap";
-
-	/** The Constant ATT_MODELID. */
-	private static final String ATT_MODELID = "modelID";
-
-	/** The Constant ATT_EDITORID. */
-	private static final String ATT_EDITORID = "editorID";
-
-	/** The Constant ATT_LABEL. */
-	private static final String ATT_LABEL = "label";
-
-	/** The cached map model to editor. */
-	private static Map<String, String> cachedMapModelToEditor = null;
-
-	/** The cached map model to label. */
-	private static Map<String, String> cachedMapModelToLabel = null;
-
-	/**
-	 * Gets the all extension model to editor.
-	 *
-	 * @return the all extension model to editor
-	 */
-	public static Map<String, String> getAllExtensionModelToEditor() {
-		return getExtensionsMapModelToEditor();
-	}
-
-	/**
-	 * Gets the all extensions editor i ds.
-	 *
-	 * @return the all extensions editor i ds
-	 */
-	// @unused
-	public static List<String> getAllExtensionsEditorIDs() {
-		return new ArrayList<String>(getExtensionsMapModelToEditor().values());
-	}
-
-	/**
-	 * Gets the extensions map model to editor.
-	 *
-	 * @return the extensions map model to editor
-	 */
-	protected static Map<String, String> getExtensionsMapModelToEditor() {
-		if (cachedMapModelToEditor == null) {
-			buildModelToEditorMap();
-		}
-		return cachedMapModelToEditor;
-	}
-
-	/**
-	 * Builds the model to editor map.
-	 */
-	protected static void buildModelToEditorMap() {
-		cachedMapModelToEditor = new HashMap<String, String>();
-		IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-		IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(mapModelToEditorExtensionPoint);
-		for (IExtension extension : extensionPoint.getExtensions()) {
-			processExtensionEditor(extension, cachedMapModelToEditor);
-		}
-	}
-
-	/**
-	 * Process extension editor.
-	 *
-	 * @param extension
-	 *            the extension
-	 * @param map
-	 *            the map
-	 */
-	protected static void processExtensionEditor(IExtension extension, Map<String, String> map) {
-		for (IConfigurationElement configElement : extension.getConfigurationElements()) {
-			String model = configElement.getAttribute(ATT_MODELID);
-			String editor = configElement.getAttribute(ATT_EDITORID);
-			map.put(model, editor);
-		}
-	}
-
-	/**
-	 * Gets the extensions map model to label.
-	 *
-	 * @return the extensions map model to label
-	 */
-	public static Map<String, String> getExtensionsMapModelToLabel() {
-		if (cachedMapModelToLabel == null) {
-			buildMapModelToLabel();
-		}
-		return cachedMapModelToLabel;
-	}
-
-	/**
-	 * Builds the map model to label.
-	 */
-	protected static void buildMapModelToLabel() {
-		cachedMapModelToLabel = new HashMap<String, String>();
-		IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-		IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(mapModelToEditorExtensionPoint);
-		for (IExtension extension : extensionPoint.getExtensions()) {
-			processExtensionLabel(extension, cachedMapModelToLabel);
-		}
-	}
-
-	/**
-	 * Process extension label.
-	 *
-	 * @param extension
-	 *            the extension
-	 * @param map
-	 *            the map
-	 */
-	protected static void processExtensionLabel(IExtension extension, Map<String, String> map) {
-		for (IConfigurationElement configElement : extension.getConfigurationElements()) {
-			String model = configElement.getAttribute(ATT_MODELID);
-			String label = configElement.getAttribute(ATT_LABEL);
-			if (label != null) {
-				map.put(model, label);
-			}
-		}
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ids/ReorientLinkIDs.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ids/ReorientLinkIDs.java
deleted file mode 100644
index ede8aea0196..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ids/ReorientLinkIDs.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte,
- * Generalitat de la Comunitat Valenciana .
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Francisco Javier Cano Muñoz (Prodevelop) - initial API implementation
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.ids;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class ReorientLinkIDs.
- *
- * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
- */
-public class ReorientLinkIDs {
-
-	/** The node edit part. */
-	public static String nodeEditPart = "nodeEditPart";
-
-	/** The link edit part. */
-	public static String linkEditPart = "linkEditPart";
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ids/UMLDiagramEditorIDs.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ids/UMLDiagramEditorIDs.java
deleted file mode 100644
index adba7fde847..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ids/UMLDiagramEditorIDs.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte,
- * Generalitat de la Comunitat Valenciana .
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Francisco Javier Cano Muñoz (Prodevelop) - initial API implementation
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.ids;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Groups all UML Diagram Editors' IDs.
- *
- * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
- * @deprecated
- */
-@Deprecated
-public class UMLDiagramEditorIDs {
-
-	/** Model IDs. */
-	public static final String ClazzModelID = "MOSKitt UMLClass";
-
-	/** The Constant ActivityModelID. */
-	public static final String ActivityModelID = "MOSKitt UMLActivity";
-
-	/** The Constant UseCaseModelID. */
-	public static final String UseCaseModelID = "MOSKitt UMLUseCase";
-
-	/** The Constant StateMachineModelID. */
-	public static final String StateMachineModelID = "MOSKitt UMLStateMachine";
-
-	/** The Constant SequenceModelID. */
-	public static final String SequenceModelID = "MOSKitt UMLSequence";
-
-	/** The Constant ProfileModelID. */
-	// @unused
-	public static final String ProfileModelID = "MOSKitt UMLProfile";
-
-	/** The all model i ds. */
-	private static List<String> allModelIDs = null;
-
-	/**
-	 * Gets the all model i ds.
-	 *
-	 * @return the all model i ds
-	 */
-	// @unused
-	public static List<String> getAllModelIDs() {
-		if (allModelIDs == null) {
-			allModelIDs = new ArrayList<String>();
-			allModelIDs.add(ClazzModelID);
-			allModelIDs.add(ActivityModelID);
-			allModelIDs.add(UseCaseModelID);
-			allModelIDs.add(StateMachineModelID);
-			allModelIDs.add(SequenceModelID);
-		}
-		return allModelIDs;
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/layout/AlignmentTree.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/layout/AlignmentTree.java
deleted file mode 100644
index b425b93b131..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/layout/AlignmentTree.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.layout;
-
-import java.util.List;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.tools.ToolUtilities;
-
-/**
- *
- * A special tree for the alignment action
- *
- */
-public class AlignmentTree extends EditPartTree {
-
-	/**
-	 * this UDI can be used to serialize this class
-	 */
-	private static final long serialVersionUID = 3095221342551975246L;
-
-	/**
-	 *
-	 * Constructor.
-	 *
-	 * @param editpart
-	 *            the editpart represented by this tree
-	 * @param isSelected
-	 *            Indicates if the represented editpart is selected or not
-	 *
-	 */
-	public AlignmentTree(Object editpart, boolean isSelected) {
-		super(editpart, isSelected);
-	}
-
-	/**
-	 *
-	 * Constructor.
-	 *
-	 * @param editparts
-	 *            the editparts used to build the tree
-	 */
-	public AlignmentTree(List<EditPart> editparts) {
-		super(editparts);
-	}
-
-	/**
-	 * The new position for this element
-	 */
-	private PrecisionRectangle newPosition = null;
-
-	/**
-	 * Gets the new alignment position for the editpart.
-	 *
-	 * @return the new alignment position for the editpart
-	 */
-	public PrecisionRectangle getNewPosition() {
-		return newPosition;
-	}
-
-	/**
-	 * Returns the new bounds of the container
-	 *
-	 * @return <ul>
-	 *         <li>{@link EditPartTree#diagramRect} if the container is the diagram</li>
-	 *         <li>the bounds of the container after the shift</li>
-	 *         </ul>
-	 */
-	public PrecisionRectangle getNewContainerBounds() {
-		AlignmentTree treeParent = (AlignmentTree) this.getParent();
-		PrecisionRectangle newContainerBounds;
-
-		if (treeParent.getEditPart() != null) {
-			Point oldParentLocation = LayoutUtils.getAbsolutePosition(treeParent.getEditPart()).getLocation();
-			Point newParentLocation = treeParent.getNewPosition().getLocation();
-
-			// shift between the two positions
-			Point shift = newParentLocation.getTranslated(oldParentLocation.getNegated());
-
-			// we want know the final position for the container
-			PrecisionRectangle oldContainerBounds = LayoutUtils.getAbsolutePosition(this.getEditPart().getParent());
-			newContainerBounds = new PrecisionRectangle(oldContainerBounds);
-			newContainerBounds.translate(shift);
-		} else {// treeParent is the root of the tree
-			EditPart containerEditPart = this.getEditPart().getParent();
-			newContainerBounds = LayoutUtils.getAbsolutePosition(containerEditPart);
-		}
-		return newContainerBounds;
-	}
-
-	/**
-	 * Returns the absolute position for the editpart in the new container
-	 *
-	 * @return the absolute position for the editpart in the new container.
-	 *         That's to say the intermediate position, when the container has
-	 *         moved, and the editpart hasn't moved
-	 */
-	public PrecisionRectangle getAbsolutePositionInTheNewContainerPosition() {
-		PrecisionRectangle newPosition = new PrecisionRectangle(LayoutUtils.getAbsolutePosition(getEditPart()));
-		PrecisionRectangle newContainerPosition = getNewContainerBounds();
-		PrecisionRectangle oldContainerPosition = LayoutUtils.getAbsolutePosition(getEditPart().getParent());
-		PrecisionRectangle distance = (PrecisionRectangle) newContainerPosition.translate(oldContainerPosition.getLocation().getNegated());
-		return (PrecisionRectangle) newPosition.translate(distance.getLocation());
-	}
-
-	/**
-	 * Sets the alignment position for the editpart
-	 *
-	 * @param newPosition
-	 *            the new alignment position for the editpart
-	 */
-	public void setNewPosition(PrecisionRectangle newPosition) {
-		this.newPosition = newPosition;
-	}
-
-	/**
-	 *
-	 * @see org.eclipse.papyrus.uml.diagram.common.layout.EditPartTree#createChildrenTree(java.util.List, java.util.List)
-	 *
-	 * @param editparts
-	 *            the selected editpart
-	 * @param parentsList
-	 *            parents of editparts which could be interesting to add to the
-	 *            tree
-	 * @return
-	 */
-	@Override
-	protected EditPartTree createChildrenTree(List<EditPart> editparts, List<EditPart> parentsList) {
-		EditPartTree childTree = null;
-		for (EditPart editpart : parentsList) {
-
-			/*
-			 * the editparts are interesting only if they are selected or if its
-			 * parent is selected!
-			 */
-			if (editparts.contains(editpart) || ((!editparts.contains(editpart)) && ToolUtilities.isAncestorContainedIn(editparts, editpart))) {
-				boolean isSelected = editparts.contains(editpart);
-				AlignmentTree parentTree = new AlignmentTree(editpart, isSelected);
-				if (!isSelected) {
-					// this editpart won't move, so we can precise now its
-					// position
-					parentTree.setNewPosition(LayoutUtils.getAbsolutePosition(editpart));
-				}
-				if (childTree != null) {
-					parentTree.add(childTree);
-				}
-				childTree = parentTree;
-			}
-		}
-		return childTree;
-	}
-
-	/**
-	 * Specifies in the tree which editpart in the selected editpart is used
-	 * like reference to do the alignment action
-	 *
-	 * @see org.eclipse.papyrus.uml.diagram.common.layout.EditPartTree#postBuildOperations(java.util.List)
-	 *
-	 * @param editparts
-	 *            the editparts list
-	 */
-	@Override
-	protected void postBuildOperations(List<EditPart> editparts) {
-		// the reference for the alignment is the last selected element
-		((AlignmentTree) this.getTree(editparts.get(editparts.size() - 1))).setNewPosition(LayoutUtils.getAbsolutePosition(editparts.get(editparts.size() - 1)));
-
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/layout/EditPartTree.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/layout/EditPartTree.java
index 2cb9058bd3e..2a589b6b9f6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/layout/EditPartTree.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/layout/EditPartTree.java
@@ -223,11 +223,13 @@ public abstract class EditPartTree extends DefaultMutableTreeNode {
 	}
 
 	/**
-	 * Gets the child level.
+	 * Get all the children of a specific level.
 	 *
 	 * @param level
 	 *            the level
 	 * @return the child level
+	 *        the level we wants children
+	 * @return the children of the specific level
 	 */
 	public List<EditPartTree> getChildLevel(int level) {
 		List<EditPartTree> epList = new ArrayList<EditPartTree>();
@@ -278,6 +280,7 @@ public abstract class EditPartTree extends DefaultMutableTreeNode {
 	public int getLevelForFirstSelectedElement() {
 		// We search the first level in the tree
 		TreeNode[] path = this.getPath();
+		
 		if (path.length > 1) {
 			EditPartTree result = getSelectedFirstEditPart((EditPartTree) path[1]);
 			if (result != null) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/locator/TemplateBorderItemLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/locator/TemplateBorderItemLocator.java
index ed18e64d090..bc0cd127115 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/locator/TemplateBorderItemLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/locator/TemplateBorderItemLocator.java
@@ -39,11 +39,6 @@ import org.eclipse.draw2d.geometry.Rectangle;
  * </pre>
  */
 public class TemplateBorderItemLocator extends PortPositionLocator {
-	/**
-	 * the width of the area surrounding the parent figure where border item can
-	 * be put
-	 */
-	protected int borderItemOffset = 10;
 
 	public TemplateBorderItemLocator(IFigure parentFigure, int preferredSide) {
 		super(parentFigure, preferredSide);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/HTMLCleaner.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/HTMLCleaner.java
index c85a0c32c91..79ad21ca723 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/HTMLCleaner.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/HTMLCleaner.java
@@ -31,7 +31,7 @@ public class HTMLCleaner {
 	/** map of special html strings and their real value */

 	protected static final Map<String, String> xmlSpecials = new HashMap<String, String>();

 

-	protected static List<String> htmlTags = new ArrayList<String>();

+	protected static final List<String> htmlTags = new ArrayList<String>();

 

 	static {

 		// initialize the special character map

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/CachedResourcesDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/CachedResourcesDiagramEditor.java
deleted file mode 100644
index 843fe8c5ddb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/CachedResourcesDiagramEditor.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte,
- * Generalitat de la Comunitat Valenciana .
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Francisco Javier Cano Muñoz (Prodevelop) - initial API implementation
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.part;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.ui.URIEditorInput;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor;
-import org.eclipse.papyrus.uml.diagram.common.util.MDTUtil;
-import org.eclipse.papyrus.uml.diagram.common.util.PathsUtil;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.FileEditorInput;
-
-/**
- * The Class CachedResourcesDiagramEditor.
- *
- * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
- */
-public abstract class CachedResourcesDiagramEditor extends DiagramDocumentEditor {
-
-	/**
-	 * Instantiates a new cached resources diagram editor.
-	 *
-	 * @param hasFlyoutPalette
-	 *            the has flyout palette
-	 */
-	// @unused
-	public CachedResourcesDiagramEditor(boolean hasFlyoutPalette) {
-		super(hasFlyoutPalette);
-	}
-
-	/**
-	 * Gets the cached resources document provider.
-	 *
-	 * @return the cached resources document provider
-	 */
-	protected CachedResourcesDocumentProvider getCachedResourcesDocumentProvider() {
-		if (getDocumentProvider() != null && getDocumentProvider() instanceof CachedResourcesDocumentProvider == true) {
-			return (CachedResourcesDocumentProvider) getDocumentProvider();
-		}
-		return null;
-	}
-
-	/**
-	 * We want the EditingDomainRegistry to listen to editors closing. At each
-	 * initialization we add the EditingDomainRegistry as a PartListener.
-	 *
-	 * @param site
-	 *            the site
-	 * @param input
-	 *            the input
-	 *
-	 * @throws PartInitException
-	 *             the part init exception
-	 */
-	@Override
-	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-		super.init(site, input);
-		site.getPage().addPartListener(EditingDomainRegistry.getInstance());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @seeorg.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.
-	 * DiagramDocumentEditor#doSetInput (org.eclipse.ui.IEditorInput, boolean)
-	 */
-	@Override
-	public void doSetInput(IEditorInput input, boolean releaseEditorContents) throws CoreException {
-		IEditorInput editorInput = getEditorInput();
-
-		if (editorInput == null) {
-			// check if theres is a previously opened diagram set as a property
-			// and open that diagram instead
-			String filePath = PathsUtil.getRelativeWorkspaceFromEditorInput(input);
-			String diagramFragment = MDTUtil.getLastOpenedDiagramProperty(filePath);
-			if (diagramFragment != null) {
-				URI uri = URI.createURI(filePath).appendFragment(diagramFragment);
-				input = MDTUtil.copyEditorInputButUri(input, uri);
-			}
-		}
-
-		if (checkSameEditorInput(input, editorInput)) {
-			return;
-		}
-		CachedResourcesDocumentProvider documentProvider = getCachedResourcesDocumentProvider();
-		if (documentProvider != null) {
-			if (input instanceof CachedResourcesEditorInput) {
-				if (((CachedResourcesEditorInput) input).isUnload()) {
-					documentProvider.setUnloadOnDispose(true);
-					removeEditingDomainFromRegistry();
-				} else {
-					documentProvider.setUnloadOnDispose(false);
-				}
-			} else {
-				documentProvider.setUnloadOnDispose(true);
-				removeEditingDomainFromRegistry();
-			}
-		}
-		super.doSetInput(input, releaseEditorContents);
-	}
-
-	/**
-	 * Check same editor input.
-	 *
-	 * @param input1
-	 *            the input1
-	 * @param input2
-	 *            the input2
-	 *
-	 * @return true, if successful
-	 */
-	protected boolean checkSameEditorInput(IEditorInput input1, IEditorInput input2) {
-		String uri1 = "", uri2 = "";
-		if (input1 instanceof FileEditorInput) {
-			uri1 = ((FileEditorInput) input1).getURI().toString();
-		}
-		if (input1 instanceof URIEditorInput) {
-			uri1 = ((URIEditorInput) input1).getURI().toString();
-		}
-		if (input2 instanceof FileEditorInput) {
-			uri2 = ((FileEditorInput) input2).getURI().toString();
-		}
-		if (input2 instanceof URIEditorInput) {
-			uri2 = ((URIEditorInput) input2).getURI().toString();
-		}
-		if (uri1.equals(uri2)) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Removes the editing domain from registry.
-	 */
-	protected void removeEditingDomainFromRegistry() {
-		CachedResourcesDocumentProvider documentProvider = getCachedResourcesDocumentProvider();
-		if (documentProvider != null) {
-			EditingDomainRegistry.getInstance().remove(documentProvider.getEditingDomainID());
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @seeorg.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.
-	 * DiagramDocumentEditor#close(boolean )
-	 */
-	@Override
-	public void close(boolean save) {
-		CachedResourcesDocumentProvider documentProvider = getCachedResourcesDocumentProvider();
-		if (documentProvider != null) {
-			documentProvider.setUnloadOnDispose(false);
-			// fjcano : the EditingDomainRegistriy takes care of disposing
-			// unused EditingDomains.
-			// removeEditingDomainFromRegistry();
-		}
-		super.close(save);
-	}
-
-	/**
-	 * Close but unload.
-	 *
-	 * @param save
-	 *            the save
-	 */
-	// @unused
-	public void closeButUnload(boolean save) {
-		CachedResourcesDocumentProvider documentProvider = getCachedResourcesDocumentProvider();
-		if (documentProvider != null) {
-			documentProvider.setUnloadOnDispose(false);
-		}
-		super.close(save);
-	}
-
-	/**
-	 * Gets the editor id.
-	 *
-	 * @return the editor id
-	 */
-	public abstract String getEditorID();
-
-	/**
-	 * Sets the unload on dispose.
-	 *
-	 * @param unload
-	 *            the new unload on dispose
-	 */
-	public void setUnloadOnDispose(boolean unload) {
-		IDocumentProvider documentProvider = getDocumentProvider();
-		if (documentProvider instanceof CachedResourcesDocumentProvider) {
-			((CachedResourcesDocumentProvider) documentProvider).setUnloadOnDispose(unload);
-		}
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/CachedResourcesDocumentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/CachedResourcesDocumentProvider.java
deleted file mode 100644
index 653667957bf..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/CachedResourcesDocumentProvider.java
+++ /dev/null
@@ -1,1081 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte,
- * Generalitat de la Comunitat Valenciana .
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Francisco Javier Cano Muñoz (Prodevelop) - initial API implementation
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.part;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.MultiRule;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.ui.URIEditorInput;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EContentAdapter;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.transaction.NotificationFilter;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.AbstractDocumentProvider;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DiagramDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocumentProvider;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.util.DiagramIOUtil;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.uml.diagram.common.Activator;
-import org.eclipse.papyrus.uml.diagram.common.util.MDTUtil;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.part.FileEditorInput;
-
-// TODO: Auto-generated Javadoc
-/**
- * Provides support to keep the <ResourceSet> unloaded when changing the <IEditorInput> or contents
- * of the <Document>. Will be shared among several <IEditorPart>s using the same <EditingDomain> and
- * the same <Resource>.
- *
- * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
- */
-public class CachedResourcesDocumentProvider extends AbstractDocumentProvider implements IDiagramDocumentProvider {
-
-	// //
-	// XXX: keep resource in dispose
-	/** The unload on dispose. */
-	private boolean unloadOnDispose = true;
-
-	/**
-	 * The editing domain identifier.
-	 */
-	private String editingDomainID = null;
-
-	/**
-	 * Resource changes because of a save
-	 */
-	private boolean changingResourceBySave = true;
-
-	@Deprecated
-	public CachedResourcesDocumentProvider() {
-		editingDomainID = "";
-		return;
-	}
-
-	public CachedResourcesDocumentProvider(String editingDomainID) {
-		this.editingDomainID = editingDomainID;
-	}
-
-	/**
-	 * Checks if is unload on dispose.
-	 *
-	 * @return true, if is unload on dispose
-	 */
-	// @unused
-	public boolean isUnloadOnDispose() {
-		return unloadOnDispose;
-	}
-
-	/**
-	 * Sets the unload on dispose.
-	 *
-	 * @param unloadOnDispose
-	 *            the new unload on dispose
-	 */
-	public void setUnloadOnDispose(boolean unloadOnDispose) {
-		this.unloadOnDispose = unloadOnDispose;
-	}
-
-	synchronized public void setChangingResourceBySave(boolean changingResourceBySave) {
-		this.changingResourceBySave = changingResourceBySave;
-	}
-
-	public boolean isChangingResourceBySave() {
-		return changingResourceBySave;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @seeorg.eclipse.gmf.runtime.diagram.ui.resources.editor.document.
-	 * AbstractDocumentProvider#disposeElementInfo(java.lang.Object,
-	 * org.eclipse.
-	 * gmf.runtime.diagram.ui.resources.editor.document.AbstractDocumentProvider
-	 * .ElementInfo)
-	 */
-	@Override
-	protected void disposeElementInfo(Object element, ElementInfo info) {
-		if (info instanceof CachedResourceSetInfo) {
-			CachedResourceSetInfo resourceSetInfo = (CachedResourceSetInfo) info;
-			resourceSetInfo.disposeButUnload();
-		}
-		super.disposeElementInfo(element, info);
-	}
-
-	/**
-	 * Creates the editing domain.
-	 *
-	 * @param editorInput
-	 *            the editor input
-	 *
-	 * @return the transactional editing domain
-	 */
-	protected TransactionalEditingDomain createEditingDomain(IEditorInput editorInput) {
-		String id = getEditingDomainID();
-		String uri = null;
-
-		if (editorInput instanceof FileEditorInput) {
-			uri = ((FileEditorInput) editorInput).getPath().toString();
-			uri = MDTUtil.fullFilePathToResourceURI(uri).toString();
-		} else if (editorInput instanceof URIEditorInput) {
-			uri = ((URIEditorInput) editorInput).getURI().trimFragment().toString();
-		}
-		TransactionalEditingDomain editingDomain = EditingDomainRegistry.getInstance().get(id, uri);
-		return editingDomain;
-	}
-
-	/**
-	 * Compute modification stamp.
-	 *
-	 * @param info
-	 *            the info
-	 *
-	 * @return the long
-	 */
-	protected long computeModificationStamp(CachedResourceSetInfo info) {
-		int result = 0;
-		for (Object element : info.getResourceSet().getResources()) {
-			Resource nextResource = (Resource) element;
-			IFile file = WorkspaceSynchronizer.getFile(nextResource);
-			if (file != null) {
-				if (file.getLocation() != null) {
-					result += file.getLocation().toFile().lastModified();
-				} else {
-					result += file.getModificationStamp();
-				}
-			}
-		}
-		return result;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @seeorg.eclipse.gmf.runtime.diagram.ui.resources.editor.document.
-	 * AbstractDocumentProvider#createEmptyDocument()
-	 */
-	@Override
-	protected IDocument createEmptyDocument() {
-		DiagramDocument document = new DiagramDocument();
-		document.setEditingDomain(createEditingDomain(null));
-		return document;
-	}
-
-	/**
-	 * Creates the empty document.
-	 *
-	 * @param editorInput
-	 *            the editor input
-	 *
-	 * @return the i document
-	 */
-	protected IDocument createEmptyDocument(IEditorInput editorInput) {
-		DiagramDocument document = new DiagramDocument();
-		document.setEditingDomain(createEditingDomain(editorInput));
-		return document;
-	}
-
-	// //
-	// XXX:
-	/**
-	 * The Class CachedResourceSetInfo.
-	 */
-	protected class CachedResourceSetInfo extends AbstractDocumentProvider.ElementInfo {
-
-		/** The my modification stamp. */
-		private long myModificationStamp = IResource.NULL_STAMP;
-
-		/** The my synchronizer. */
-		private WorkspaceSynchronizer mySynchronizer;
-
-		/** The my un synchronized resources. */
-		private final Collection myUnSynchronizedResources = new ArrayList();
-
-		/** The my document. */
-		private final IDiagramDocument myDocument;
-
-		/** The my editor input. */
-		private final IEditorInput myEditorInput;
-
-		/** The my update cache. */
-		private boolean myUpdateCache = true;
-
-		/** The my modifiable. */
-		private boolean myModifiable = false;
-
-		/** The my read only. */
-		private boolean myReadOnly = true;
-
-		/** The my resource set listener. */
-		private final ResourceSetModificationListener myResourceSetListener;
-
-		/**
-		 * Instantiates a new cached resource set info.
-		 *
-		 * @param document
-		 *            the document
-		 * @param editorInput
-		 *            the editor input
-		 */
-		public CachedResourceSetInfo(IDiagramDocument document, IEditorInput editorInput) {
-			super(document);
-			myDocument = document;
-			myEditorInput = editorInput;
-			startResourceListening();
-			myResourceSetListener = new ResourceSetModificationListener(this);
-			getResourceSet().eAdapters().add(myResourceSetListener);
-		}
-
-		/**
-		 * Gets the modification stamp.
-		 *
-		 * @return the modification stamp
-		 */
-		// @unused
-		public long getModificationStamp() {
-			return myModificationStamp;
-		}
-
-		/**
-		 * Sets the modification stamp.
-		 *
-		 * @param modificationStamp
-		 *            the modification stamp
-		 */
-		public void setModificationStamp(long modificationStamp) {
-			myModificationStamp = modificationStamp;
-		}
-
-		/**
-		 * Gets the editing domain.
-		 *
-		 * @return the editing domain
-		 */
-		public TransactionalEditingDomain getEditingDomain() {
-			return myDocument.getEditingDomain();
-		}
-
-		/**
-		 * Gets the resource set.
-		 *
-		 * @return the resource set
-		 */
-		public ResourceSet getResourceSet() {
-			return getEditingDomain().getResourceSet();
-		}
-
-		/**
-		 * Gets the editor input.
-		 *
-		 * @return the editor input
-		 */
-		public IEditorInput getEditorInput() {
-			return myEditorInput;
-		}
-
-		/**
-		 * Dispose.
-		 */
-		public void disposeButUnload() {
-			stopResourceListening();
-			getResourceSet().eAdapters().remove(myResourceSetListener);
-		}
-
-		/**
-		 * Dispose.
-		 */
-		// @unused
-		public void dispose() {
-			stopResourceListening();
-			getResourceSet().eAdapters().remove(myResourceSetListener);
-			for (Object element : getResourceSet().getResources()) {
-				Resource resource = (Resource) element;
-				resource.unload();
-			}
-		}
-
-		/**
-		 * Checks if is synchronized.
-		 *
-		 * @return true, if checks if is synchronized
-		 */
-		public boolean isSynchronized() {
-			return myUnSynchronizedResources.size() == 0;
-		}
-
-		/**
-		 * Sets the un synchronized.
-		 *
-		 * @param resource
-		 *            the resource
-		 */
-		public void setUnSynchronized(Resource resource) {
-			myUnSynchronizedResources.add(resource);
-		}
-
-		/**
-		 * Sets the synchronized.
-		 *
-		 * @param resource
-		 *            the resource
-		 */
-		public void setSynchronized(Resource resource) {
-			myUnSynchronizedResources.remove(resource);
-		}
-
-		/**
-		 * Stop resource listening.
-		 */
-		public final void stopResourceListening() {
-			mySynchronizer.dispose();
-			mySynchronizer = null;
-		}
-
-		/**
-		 * Start resource listening.
-		 */
-		public final void startResourceListening() {
-			mySynchronizer = new WorkspaceSynchronizer(getEditingDomain(), new SynchronizerDelegate());
-		}
-
-		/**
-		 * Checks if is update cache.
-		 *
-		 * @return true, if checks if is update cache
-		 */
-		public boolean isUpdateCache() {
-			return myUpdateCache;
-		}
-
-		/**
-		 * Sets the update cache.
-		 *
-		 * @param update
-		 *            the update
-		 */
-		public void setUpdateCache(boolean update) {
-			myUpdateCache = update;
-		}
-
-		/**
-		 * Checks if is modifiable.
-		 *
-		 * @return true, if checks if is modifiable
-		 */
-		public boolean isModifiable() {
-			return myModifiable;
-		}
-
-		/**
-		 * Sets the modifiable.
-		 *
-		 * @param modifiable
-		 *            the modifiable
-		 */
-		public void setModifiable(boolean modifiable) {
-			myModifiable = modifiable;
-		}
-
-		/**
-		 * Checks if is read only.
-		 *
-		 * @return true, if checks if is read only
-		 */
-		public boolean isReadOnly() {
-			return myReadOnly;
-		}
-
-		/**
-		 * Sets the read only.
-		 *
-		 * @param readOnly
-		 *            the read only
-		 */
-		public void setReadOnly(boolean readOnly) {
-			myReadOnly = readOnly;
-		}
-
-		/**
-		 * Gets the loaded resources iterator.
-		 *
-		 * @return the loaded resources iterator
-		 */
-		public Iterator getLoadedResourcesIterator() {
-			return new ArrayList(getResourceSet().getResources()).iterator();
-		}
-
-		/**
-		 * The Class SynchronizerDelegate.
-		 */
-		private class SynchronizerDelegate implements WorkspaceSynchronizer.Delegate {
-
-			/**
-			 * Dispose.
-			 */
-			@Override
-			public void dispose() {
-			}
-
-			/**
-			 * Handle resource changed.
-			 *
-			 * @param resource
-			 *            the resource
-			 *
-			 * @return true, if handle resource changed
-			 */
-			@Override
-			public boolean handleResourceChanged(final Resource resource) {
-				synchronized (CachedResourceSetInfo.this) {
-					// fjcano : if we are changing the resource in an internal
-					// save, we need not mark it as unsynchronized or reload the
-					// resource.
-					if (CachedResourcesDocumentProvider.this.isChangingResourceBySave()) {
-						return true;
-					}
-					// fjcano : if we get here the resource was modified
-					// externally.
-					if (CachedResourceSetInfo.this.fCanBeSaved) {
-						CachedResourceSetInfo.this.setUnSynchronized(resource);
-						return true;
-					}
-				}
-				Display.getDefault().asyncExec(new Runnable() {
-
-					@Override
-					public void run() {
-						handleElementChanged(CachedResourceSetInfo.this, resource, null);
-					}
-				});
-				return true;
-			}
-
-			/**
-			 * Handle resource deleted.
-			 *
-			 * @param resource
-			 *            the resource
-			 *
-			 * @return true, if handle resource deleted
-			 */
-			@Override
-			public boolean handleResourceDeleted(Resource resource) {
-				synchronized (CachedResourceSetInfo.this) {
-					if (CachedResourceSetInfo.this.fCanBeSaved) {
-						CachedResourceSetInfo.this.setUnSynchronized(resource);
-						return true;
-					}
-				}
-				Display.getDefault().asyncExec(new Runnable() {
-
-					@Override
-					public void run() {
-						fireElementDeleted(CachedResourceSetInfo.this.getEditorInput());
-					}
-				});
-				return true;
-			}
-
-			/**
-			 * Handle resource moved.
-			 *
-			 * @param resource
-			 *            the resource
-			 * @param newURI
-			 *            the new uri
-			 *
-			 * @return true, if handle resource moved
-			 */
-			@Override
-			public boolean handleResourceMoved(Resource resource, final URI newURI) {
-				synchronized (CachedResourceSetInfo.this) {
-					if (CachedResourceSetInfo.this.fCanBeSaved) {
-						CachedResourceSetInfo.this.setUnSynchronized(resource);
-						return true;
-					}
-				}
-				if (myDocument.getDiagram().eResource() == resource) {
-					Display.getDefault().asyncExec(new Runnable() {
-
-						@Override
-						public void run() {
-							handleElementMoved(CachedResourceSetInfo.this.getEditorInput(), newURI);
-						}
-					});
-				} else {
-					handleResourceDeleted(resource);
-				}
-				return true;
-			}
-
-		}
-
-	}
-
-	/**
-	 * The listener interface for receiving resourceSetModification events. The
-	 * class that is interested in processing a resourceSetModification event
-	 * implements this interface, and the object created with that class is
-	 * registered with a component using the component's <code>addResourceSetModificationListener<code> method. When
-	 * the resourceSetModification event occurs, that object's appropriate
-	 * method is invoked.
-	 *
-	 * @see ResourceSetModificationEvent
-	 */
-	private class ResourceSetModificationListener extends EContentAdapter {
-
-		/** The my modified filter. */
-		private final NotificationFilter myModifiedFilter;
-
-		/** The my info. */
-		private final CachedResourceSetInfo myInfo;
-
-		/**
-		 * The Constructor.
-		 *
-		 * @param info
-		 *            the info
-		 */
-		public ResourceSetModificationListener(CachedResourceSetInfo info) {
-			myInfo = info;
-			myModifiedFilter = NotificationFilter.createEventTypeFilter(Notification.SET).or(NotificationFilter.createEventTypeFilter(Notification.UNSET)).and(NotificationFilter.createFeatureFilter(Resource.class, Resource.RESOURCE__IS_MODIFIED));
-		}
-
-		/**
-		 * Notify changed.
-		 *
-		 * @param notification
-		 *            the notification
-		 */
-		@Override
-		public void notifyChanged(Notification notification) {
-			if (notification.getNotifier() instanceof ResourceSet) {
-				super.notifyChanged(notification);
-			}
-			if (!notification.isTouch() && myModifiedFilter.matches(notification)) {
-				if (notification.getNotifier() instanceof Resource) {
-					Resource resource = (Resource) notification.getNotifier();
-					if (resource.isLoaded()) {
-						boolean modified = false;
-						for (Iterator it = myInfo.getResourceSet().getResources().iterator(); it.hasNext() && !modified;) {
-							Resource nextResource = (Resource) it.next();
-							if (nextResource.isLoaded()) {
-								modified = nextResource.isModified();
-							}
-						}
-						boolean dirtyStateChanged = false;
-						synchronized (myInfo) {
-							if (modified != myInfo.fCanBeSaved) {
-								myInfo.fCanBeSaved = modified;
-								dirtyStateChanged = true;
-							}
-							if (!resource.isModified()) {
-								myInfo.setSynchronized(resource);
-							}
-						}
-						if (dirtyStateChanged) {
-							fireElementDirtyStateChanged(myInfo.getEditorInput(), modified);
-
-							if (!modified) {
-								myInfo.setModificationStamp(computeModificationStamp(myInfo));
-							}
-						}
-					}
-				}
-			}
-		}
-
-	}
-
-	// // General and common DocumentProvider code for GMF diagrams ////
-
-	@Override
-	protected ElementInfo createElementInfo(Object element) throws CoreException {
-		if (false == element instanceof FileEditorInput && false == element instanceof URIEditorInput) {
-			throw new CoreException(new Status(IStatus.ERROR, Activator.ID, 0, NLS.bind("Messages.SqlmodelDocumentProvider_IncorrectInputError", new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$
-					null));
-		}
-		IEditorInput editorInput = (IEditorInput) element;
-		IDiagramDocument document = (IDiagramDocument) createDocument(editorInput);
-
-		CachedResourceSetInfo info = new CachedResourceSetInfo(document, editorInput);
-		info.setModificationStamp(computeModificationStamp(info));
-		info.fStatus = null;
-		return info;
-	}
-
-	@Override
-	protected IDocument createDocument(Object element) throws CoreException {
-		if (false == element instanceof FileEditorInput && false == element instanceof URIEditorInput) {
-			throw new CoreException(new Status(IStatus.ERROR, Activator.ID, 0, NLS.bind("Messages.SqlmodelDocumentProvider_IncorrectInputError", new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$
-					null));
-		}
-		IDocument document = createEmptyDocument((IEditorInput) element);
-		setDocumentContent(document, (IEditorInput) element);
-		setupDocument(element, document);
-		return document;
-	}
-
-	/**
-	 * Sets up the given document as it would be provided for the given element.
-	 * The content of the document is not changed. This default implementation
-	 * is empty. Subclasses may reimplement.
-	 */
-	protected void setupDocument(Object element, IDocument document) {
-		// for subclasses
-	}
-
-	protected void setDocumentContent(IDocument document, IEditorInput element) throws CoreException {
-		IDiagramDocument diagramDocument = (IDiagramDocument) document;
-		TransactionalEditingDomain domain = diagramDocument.getEditingDomain();
-		if (element instanceof FileEditorInput) {
-			IStorage storage = ((FileEditorInput) element).getStorage();
-			Diagram diagram = DiagramIOUtil.load(domain, storage, true, getProgressMonitor());
-			document.setContent(diagram);
-		} else if (element instanceof URIEditorInput) {
-			URI uri = ((URIEditorInput) element).getURI();
-			Resource resource = null;
-			try {
-				resource = domain.getResourceSet().getResource(uri.trimFragment(), false);
-				if (resource == null) {
-					resource = domain.getResourceSet().createResource(uri.trimFragment());
-				}
-				if (!resource.isLoaded()) {
-					try {
-						Map options = new HashMap(GMFResourceFactory.getDefaultLoadOptions());
-						resource.load(options);
-					} catch (IOException e) {
-						resource.unload();
-						throw e;
-					}
-				}
-				if (uri.fragment() != null) {
-					EObject rootElement = resource.getEObject(uri.fragment());
-					if (rootElement instanceof Diagram) {
-						document.setContent(rootElement);
-						return;
-					}
-				} else {
-					for (Object rootElement : resource.getContents()) {
-						if (rootElement instanceof Diagram) {
-							document.setContent(rootElement);
-							return;
-						}
-					}
-				}
-				throw new RuntimeException("Messages.SqlmodelDocumentProvider_NoDiagramInResourceError");
-			} catch (Exception e) {
-				CoreException thrownExcp = null;
-				if (e instanceof CoreException) {
-					thrownExcp = (CoreException) e;
-				} else {
-					String msg = e.getLocalizedMessage();
-					thrownExcp = new CoreException(new Status(IStatus.ERROR, Activator.ID, 0, msg != null ? msg : "Messages.SqlmodelDocumentProvider_DiagramLoadingError", e));
-				}
-				throw thrownExcp;
-			}
-		} else {
-			throw new CoreException(new Status(IStatus.ERROR, Activator.ID, 0, NLS.bind("Messages.SqlmodelDocumentProvider_IncorrectInputError", new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$
-					null));
-		}
-	}
-
-	@Override
-	public long getModificationStamp(Object element) {
-		CachedResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			return computeModificationStamp(info);
-		}
-		return super.getModificationStamp(element);
-	}
-
-	@Override
-	public boolean isDeleted(Object element) {
-		IDiagramDocument document = getDiagramDocument(element);
-		if (document != null) {
-			Resource diagramResource = document.getDiagram().eResource();
-			if (diagramResource != null) {
-				IFile file = WorkspaceSynchronizer.getFile(diagramResource);
-				return file == null || file.getLocation() == null || !file.getLocation().toFile().exists();
-			}
-		}
-		return super.isDeleted(element);
-	}
-
-	public CachedResourceSetInfo getResourceSetInfo(Object editorInput) {
-		return (CachedResourceSetInfo) super.getElementInfo(editorInput);
-	}
-
-	@Override
-	protected void doValidateState(Object element, Object computationContext) throws CoreException {
-		CachedResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			Collection files2Validate = new ArrayList();
-			for (Iterator it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = (Resource) it.next();
-				IFile file = WorkspaceSynchronizer.getFile(nextResource);
-				if (file != null && file.isReadOnly()) {
-					files2Validate.add(file);
-				}
-			}
-			ResourcesPlugin.getWorkspace().validateEdit((IFile[]) files2Validate.toArray(new IFile[files2Validate.size()]), computationContext);
-		}
-
-		super.doValidateState(element, computationContext);
-	}
-
-	@Override
-	public boolean isReadOnly(Object element) {
-		CachedResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			if (info.isUpdateCache()) {
-				try {
-					updateCache(element);
-				} catch (CoreException ex) {
-					Activator.getDefault().logError("Messages.SqlmodelDocumentProvider_isModifiable", ex);
-				}
-			}
-			return info.isReadOnly();
-		}
-		return super.isReadOnly(element);
-	}
-
-	@Override
-	public boolean isModifiable(Object element) {
-		if (!isStateValidated(element)) {
-			if (element instanceof FileEditorInput || element instanceof URIEditorInput) {
-				return true;
-			}
-		}
-		CachedResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			if (info.isUpdateCache()) {
-				try {
-					updateCache(element);
-				} catch (CoreException ex) {
-					Activator.getDefault().logError("Messages.SqlmodelDocumentProvider_isModifiable", ex);
-				}
-			}
-			return info.isModifiable();
-		}
-		return super.isModifiable(element);
-	}
-
-	protected void updateCache(Object element) throws CoreException {
-		CachedResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			for (Iterator it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = (Resource) it.next();
-				IFile file = WorkspaceSynchronizer.getFile(nextResource);
-				if (file != null && file.isReadOnly()) {
-					info.setReadOnly(true);
-					info.setModifiable(false);
-					return;
-				}
-			}
-			info.setReadOnly(false);
-			info.setModifiable(true);
-			return;
-		}
-	}
-
-	@Override
-	protected void doUpdateStateCache(Object element) throws CoreException {
-		CachedResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			info.setUpdateCache(true);
-		}
-		super.doUpdateStateCache(element);
-	}
-
-	@Override
-	public boolean isSynchronized(Object element) {
-		CachedResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			return info.isSynchronized();
-		}
-		return super.isSynchronized(element);
-	}
-
-	@Override
-	protected ISchedulingRule getResetRule(Object element) {
-		CachedResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			Collection rules = new ArrayList();
-			for (Iterator it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = (Resource) it.next();
-				IFile file = WorkspaceSynchronizer.getFile(nextResource);
-				if (file != null) {
-					rules.add(ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(file));
-				}
-			}
-			return new MultiRule((ISchedulingRule[]) rules.toArray(new ISchedulingRule[rules.size()]));
-		}
-		return null;
-	}
-
-	@Override
-	protected ISchedulingRule getSaveRule(Object element) {
-		CachedResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			Collection rules = new ArrayList();
-			for (Iterator it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = (Resource) it.next();
-				IFile file = WorkspaceSynchronizer.getFile(nextResource);
-				if (file != null) {
-					rules.add(computeSchedulingRule(file));
-				}
-			}
-			return new MultiRule((ISchedulingRule[]) rules.toArray(new ISchedulingRule[rules.size()]));
-		}
-		return null;
-	}
-
-	@Override
-	protected ISchedulingRule getSynchronizeRule(Object element) {
-		CachedResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			Collection rules = new ArrayList();
-			for (Iterator it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = (Resource) it.next();
-				IFile file = WorkspaceSynchronizer.getFile(nextResource);
-				if (file != null) {
-					rules.add(ResourcesPlugin.getWorkspace().getRuleFactory().refreshRule(file));
-				}
-			}
-			return new MultiRule((ISchedulingRule[]) rules.toArray(new ISchedulingRule[rules.size()]));
-		}
-		return null;
-	}
-
-	@Override
-	protected ISchedulingRule getValidateStateRule(Object element) {
-		CachedResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			Collection files = new ArrayList();
-			for (Iterator it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = (Resource) it.next();
-				IFile file = WorkspaceSynchronizer.getFile(nextResource);
-				if (file != null) {
-					files.add(file);
-				}
-			}
-			return ResourcesPlugin.getWorkspace().getRuleFactory().validateEditRule((IFile[]) files.toArray(new IFile[files.size()]));
-		}
-		return null;
-	}
-
-	private ISchedulingRule computeSchedulingRule(IResource toCreateOrModify) {
-		if (toCreateOrModify.exists()) {
-			return ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(toCreateOrModify);
-		}
-
-		IResource parent = toCreateOrModify;
-		do {
-			toCreateOrModify = parent;
-			parent = toCreateOrModify.getParent();
-		} while (parent != null && !parent.exists());
-
-		return ResourcesPlugin.getWorkspace().getRuleFactory().createRule(toCreateOrModify);
-	}
-
-	@Override
-	protected void doSynchronize(Object element, IProgressMonitor monitor) throws CoreException {
-		CachedResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			for (Iterator it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = (Resource) it.next();
-				handleElementChanged(info, nextResource, monitor);
-			}
-			return;
-		}
-		super.doSynchronize(element, monitor);
-	}
-
-	@Override
-	protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException {
-		try {
-			// fjcano : we are modifying the resource by an internal save.
-			setChangingResourceBySave(true);
-			CachedResourceSetInfo info = getResourceSetInfo(element);
-			if (info != null) {
-				if (!overwrite && !info.isSynchronized()) {
-					throw new CoreException(new Status(IStatus.ERROR, Activator.ID, IResourceStatus.OUT_OF_SYNC_LOCAL, "Messages.SqlmodelDocumentProvider_UnsynchronizedFileSaveError", null));
-				}
-				info.stopResourceListening();
-				fireElementStateChanging(element);
-				try {
-					monitor.beginTask("Messages.SqlmodelDocumentProvider_SaveDiagramTask", info.getResourceSet().getResources().size() + 1); // "Saving diagram"
-					for (Iterator it = info.getLoadedResourcesIterator(); it.hasNext();) {
-						Resource nextResource = (Resource) it.next();
-						monitor.setTaskName(NLS.bind("Messages.SqlmodelDocumentProvider_SaveNextResourceTask", nextResource.getURI()));
-						if (nextResource.isLoaded() && !info.getEditingDomain().isReadOnly(nextResource)) {
-							try {
-								nextResource.save(MDTUtil.getSaveOptions());
-							} catch (IOException e) {
-								fireElementStateChangeFailed(element);
-								throw new CoreException(new Status(IStatus.ERROR, Activator.ID, EditorStatusCodes.RESOURCE_FAILURE, e.getLocalizedMessage(), null));
-							}
-						}
-						monitor.worked(1);
-					}
-					monitor.done();
-					info.setModificationStamp(computeModificationStamp(info));
-				} catch (RuntimeException x) {
-					fireElementStateChangeFailed(element);
-					throw x;
-				} finally {
-					info.startResourceListening();
-				}
-			} else {
-				URI newResoruceURI;
-				List affectedFiles = null;
-				if (element instanceof FileEditorInput) {
-					IFile newFile = ((FileEditorInput) element).getFile();
-					affectedFiles = Collections.singletonList(newFile);
-					newResoruceURI = URI.createPlatformResourceURI(newFile.getFullPath().toString(), true);
-				} else if (element instanceof URIEditorInput) {
-					newResoruceURI = ((URIEditorInput) element).getURI();
-				} else {
-					fireElementStateChangeFailed(element);
-					throw new CoreException(new Status(IStatus.ERROR, Activator.ID, 0, NLS.bind(
-							"Messages.SqlmodelDocumentProvider_IncorrectInputError", new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$
-							null));
-				}
-				if (false == document instanceof IDiagramDocument) {
-					fireElementStateChangeFailed(element);
-					throw new CoreException(new Status(IStatus.ERROR, Activator.ID, 0, "Incorrect document used: " + document + " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", null)); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-				IDiagramDocument diagramDocument = (IDiagramDocument) document;
-				final Resource newResource = diagramDocument.getEditingDomain().getResourceSet().createResource(newResoruceURI);
-				final Diagram diagramCopy = EcoreUtil.copy(diagramDocument.getDiagram());
-				try {
-					new AbstractTransactionalCommand(diagramDocument.getEditingDomain(), NLS.bind("Messages.SqlmodelDocumentProvider_SaveAsOperation", diagramCopy.getName()), affectedFiles) {
-
-						@Override
-						protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-							newResource.getContents().add(diagramCopy);
-							return CommandResult.newOKCommandResult();
-						}
-					}.execute(monitor, null);
-					newResource.save(MDTUtil.getSaveOptions());
-				} catch (ExecutionException e) {
-					fireElementStateChangeFailed(element);
-					throw new CoreException(new Status(IStatus.ERROR, Activator.ID, 0, e.getLocalizedMessage(), null));
-				} catch (IOException e) {
-					fireElementStateChangeFailed(element);
-					throw new CoreException(new Status(IStatus.ERROR, Activator.ID, 0, e.getLocalizedMessage(), null));
-				}
-				newResource.unload();
-			}
-		} finally {
-			// fjcano : the internal modification ended.
-			setChangingResourceBySave(false);
-		}
-	}
-
-	protected void handleElementChanged(CachedResourceSetInfo info, Resource changedResource, IProgressMonitor monitor) {
-		if (isChangingResourceBySave() == false) {
-			IFile file = WorkspaceSynchronizer.getFile(changedResource);
-			if (file != null) {
-				try {
-					file.refreshLocal(IResource.DEPTH_INFINITE, monitor);
-				} catch (CoreException ex) {
-					Activator.getDefault().logError("Messages.SqlmodelDocumentProvider_handleElementContentChanged", ex);
-				}
-			}
-			changedResource.unload();
-
-			fireElementContentAboutToBeReplaced(info.getEditorInput());
-			removeUnchangedElementListeners(info.getEditorInput(), info);
-			info.fStatus = null;
-			try {
-				setDocumentContent(info.fDocument, info.getEditorInput());
-			} catch (CoreException e) {
-				info.fStatus = e.getStatus();
-			}
-			if (!info.fCanBeSaved) {
-				info.setModificationStamp(computeModificationStamp(info));
-			}
-			addUnchangedElementListeners(info.getEditorInput(), info);
-			fireElementContentReplaced(info.getEditorInput());
-		}
-	}
-
-	protected void handleElementMoved(IEditorInput input, URI uri) {
-		if (input instanceof FileEditorInput) {
-			IFile newFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(URI.decode(uri.path())).removeFirstSegments(1));
-			fireElementMoved(input, newFile == null ? null : new FileEditorInput(newFile));
-			return;
-		}
-		// TODO: append suffix to the URI! (use diagram as a parameter)
-		fireElementMoved(input, new URIEditorInput(uri));
-	}
-
-	@Override
-	public IEditorInput createInputWithEditingDomain(IEditorInput editorInput, TransactionalEditingDomain domain) {
-		return editorInput;
-	}
-
-	@Override
-	public IDiagramDocument getDiagramDocument(Object element) {
-		IDocument doc = getDocument(element);
-		if (doc instanceof IDiagramDocument) {
-			return (IDiagramDocument) doc;
-		}
-		return null;
-	}
-
-	@Override
-	protected IRunnableContext getOperationRunner(IProgressMonitor monitor) {
-		return null;
-	}
-
-	protected String getEditingDomainID() {
-		return editingDomainID;
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/DocumentProviderRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/DocumentProviderRegistry.java
deleted file mode 100644
index 7adc858c730..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/DocumentProviderRegistry.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte,
- * Generalitat de la Comunitat Valenciana .
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Francisco Javier Cano Muñoz (Prodevelop) - initial API implementation
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.part;
-
-import java.util.HashMap;
-
-import org.eclipse.papyrus.uml.diagram.common.util.PathsUtil;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.part.FileEditorInput;
-
-/**
- * A registry to store and get <CachedResourceDocumentProvider>s based on <EditingDomain>s and
- * <IEditorInput>s.
- *
- * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
- *
- */
-public class DocumentProviderRegistry extends HashMap<String, CachedResourcesDocumentProvider> {
-
-	private static DocumentProviderRegistry instance = new DocumentProviderRegistry();
-
-	public static DocumentProviderRegistry getInstance() {
-		return instance;
-	}
-
-	private DocumentProviderRegistry() {
-		return;
-	}
-
-	@Override
-	public CachedResourcesDocumentProvider get(Object arg0) {
-		throw new UnsupportedOperationException("Operation not supported. Use #get(String domainID, IEditorInput input)");
-	}
-
-	// @unused
-	public CachedResourcesDocumentProvider get(String domainID, IEditorInput input) {
-		String key = calculateKey(domainID, input);
-		if (containsKey(key)) {
-			return super.get(key);
-		} else {
-			CachedResourcesDocumentProvider documentProvider = new CachedResourcesDocumentProvider(domainID);
-			put(key, documentProvider);
-			return documentProvider;
-		}
-	}
-
-	private String calculateKey(String domainID, IEditorInput input) {
-		String key = domainID;
-		if (input instanceof FileEditorInput || input instanceof CachedResourcesEditorInput) {
-			key += PathsUtil.getRelativeWorkspaceFromEditorInput(input);
-		}
-		return key;
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/EditingDomainRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/EditingDomainRegistry.java
deleted file mode 100644
index 97367f9514a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/EditingDomainRegistry.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte,
- * Generalitat de la Comunitat Valenciana .
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Francisco Javier Cano Muñoz (Prodevelop) - initial API implementation
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.part;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map.Entry;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.ui.URIEditorInput;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.transaction.NotificationFilter;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.diagram.core.DiagramEditingDomainFactory;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider;
-import org.eclipse.papyrus.uml.diagram.common.util.MDTUtil;
-import org.eclipse.papyrus.uml.diagram.common.util.PathsUtil;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IPartListener2;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class EditingDomainRegistry.
- *
- * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
- */
-public class EditingDomainRegistry extends HashMap<String, TransactionalEditingDomain> implements IPartListener2 {
-
-	/** The instance. */
-	private static EditingDomainRegistry instance = null;
-
-	/** The listening. */
-	private boolean listening = false;
-
-	/** The changing cached editors. */
-	private boolean changingCachedEditors = false;
-
-	/**
-	 * Instantiates a new editing domain registry.
-	 */
-	private EditingDomainRegistry() {
-		return;
-	}
-
-	/**
-	 * Gets the single instance of EditingDomainRegistry.
-	 *
-	 * @return single instance of EditingDomainRegistry
-	 */
-	public static EditingDomainRegistry getInstance() {
-		if (instance == null) {
-			instance = new EditingDomainRegistry();
-		}
-		return instance;
-	}
-
-	/**
-	 * Start listening.
-	 */
-	private void startListening() {
-		if (listening) {
-			return;
-		}
-		try {
-			PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().addPartListener(instance);
-			listening = true;
-		} catch (NullPointerException e) {
-			;
-		}
-	}
-
-	// //
-
-	/**
-	 * Calculate key.
-	 *
-	 * @param editorID
-	 *            the editor id
-	 * @param uri
-	 *            the uri
-	 *
-	 * @return the string
-	 */
-	protected String calculateKey(String editorID, String uri) {
-		uri = PathsUtil.fromAbsoluteFileSystemToAbsoluteWorkspace(uri);
-		String key = ((uri != null) ? (editorID + uri) : editorID);
-		return key;
-	}
-
-	/**
-	 * Gets the.
-	 *
-	 * @param editorID
-	 *            the editor id
-	 * @param uri
-	 *            the uri
-	 *
-	 * @return the transactional editing domain
-	 */
-	public TransactionalEditingDomain get(String editorID, String uri) {
-		// we need to listen to editors closing
-		startListening();
-		// new get method
-		String key = calculateKey(editorID, uri);
-		TransactionalEditingDomain oldDomain = null;
-		TransactionalEditingDomain newDomain = null;
-		if (containsKey(key)) {
-			oldDomain = super.get(key);
-			oldDomain.getCommandStack().flush();
-			return oldDomain;
-		}
-		newDomain = DiagramEditingDomainFactory.getInstance().createEditingDomain();
-		newDomain.setID(editorID);
-		final NotificationFilter diagramResourceModifiedFilter = NotificationFilter.createNotifierFilter(newDomain.getResourceSet()).and(NotificationFilter.createEventTypeFilter(Notification.ADD))
-				.and(NotificationFilter.createFeatureFilter(ResourceSet.class, ResourceSet.RESOURCE_SET__RESOURCES));
-		newDomain.getResourceSet().eAdapters().add(new Adapter() {
-
-			private Notifier myTarget;
-
-			@Override
-			public Notifier getTarget() {
-				return myTarget;
-			}
-
-			@Override
-			public boolean isAdapterForType(Object type) {
-				return false;
-			}
-
-			@Override
-			public void notifyChanged(Notification notification) {
-				if (diagramResourceModifiedFilter.matches(notification)) {
-					Object value = notification.getNewValue();
-					if (value instanceof Resource) {
-						((Resource) value).setTrackingModification(true);
-					}
-				}
-			}
-
-			@Override
-			public void setTarget(Notifier newTarget) {
-				myTarget = newTarget;
-			}
-
-		});
-		put(key, newDomain);
-		return newDomain;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see java.util.HashMap#get(java.lang.Object)
-	 */
-	@Override
-	public TransactionalEditingDomain get(Object okey) {
-		if (okey == null || okey instanceof String == false) {
-			return null;
-		}
-		return get((String) okey, null);
-	}
-
-	/**
-	 * Gets the uri from i editor input.
-	 *
-	 * @param input
-	 *            the input
-	 *
-	 * @return the uri from i editor input
-	 */
-	private String getUriFromIEditorInput(IEditorInput input) {
-		String uri = null;
-		if (input instanceof FileEditorInput) {
-			uri = ((FileEditorInput) input).getPath().toString();
-			uri = MDTUtil.fullFilePathToResourceURI(uri).toString();
-		} else if (input instanceof URIEditorInput) {
-			uri = ((URIEditorInput) input).getURI().trimFragment().toString();
-		}
-		return uri;
-	}
-
-	/**
-	 * Gets the iD from editor.
-	 *
-	 * @param editor
-	 *            the editor
-	 *
-	 * @return the iD from editor
-	 */
-	private String getIDFromEditor(IEditorPart editor) {
-		if (editor instanceof CachedResourcesDiagramEditor) {
-			IDocumentProvider documentProvider = ((CachedResourcesDiagramEditor) editor).getDocumentProvider();
-			if (documentProvider instanceof CachedResourcesDocumentProvider) {
-				return ((CachedResourcesDocumentProvider) documentProvider).getEditingDomainID();
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Clean registry.
-	 *
-	 * @param partReference
-	 *            the part reference
-	 */
-	private void cleanRegistry(IWorkbenchPartReference partReference) {
-		if (isChangingCachedEditors()) {
-			return;
-		}
-		if (partReference instanceof IEditorReference) {
-			List<IEditorReference> editors = new ArrayList<IEditorReference>();
-			for (IEditorReference editorReference : partReference.getPage().getEditorReferences()) {
-				editors.add(editorReference);
-			}
-			// editors.add((IEditorReference) partReference);
-			cleanRegistry(editors);
-		}
-	}
-
-	/**
-	 * Clean registry.
-	 *
-	 * @param editors
-	 *            the editors
-	 */
-	private void cleanRegistry(List<IEditorReference> editors) {
-		// get keys list from open editors
-		List<String> keys = new ArrayList<String>();
-		for (IEditorReference editor : editors) {
-			IEditorPart editorPart = editor.getEditor(false);
-			if (editorPart != null) {
-				String uri = getUriFromIEditorInput(editorPart.getEditorInput());
-				String id = getIDFromEditor(editorPart);
-				String key = calculateKey(id, uri);
-				keys.add(key);
-			}
-		}
-		// find keys that are no longer in use
-		List<String> keysToRemove = new ArrayList<String>();
-		for (String key : keySet()) {
-			if (keys.contains(key) == false) {
-				keysToRemove.add(key);
-			}
-		}
-		// remove unused keys
-		for (Entry<String, TransactionalEditingDomain> entry : entrySet()) {
-			if (keysToRemove.contains(entry.getKey())) {
-				entry.getValue().dispose();
-			}
-		}
-		for (String key : keysToRemove) {
-			remove(key);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.IPartListener2#partActivated(org.eclipse.ui.
-	 * IWorkbenchPartReference)
-	 */
-	@Override
-	public void partActivated(IWorkbenchPartReference partRef) {
-		// nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.IPartListener2#partBroughtToTop(org.eclipse.ui.
-	 * IWorkbenchPartReference)
-	 */
-	@Override
-	public void partBroughtToTop(IWorkbenchPartReference partRef) {
-		// nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.
-	 * IWorkbenchPartReference)
-	 */
-	@Override
-	public void partClosed(IWorkbenchPartReference partRef) {
-		cleanRegistry(partRef);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.IPartListener2#partDeactivated(org.eclipse.ui.
-	 * IWorkbenchPartReference)
-	 */
-	@Override
-	public void partDeactivated(IWorkbenchPartReference partRef) {
-		// nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.IPartListener2#partHidden(org.eclipse.ui.
-	 * IWorkbenchPartReference)
-	 */
-	@Override
-	public void partHidden(IWorkbenchPartReference partRef) {
-		// nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.
-	 * IWorkbenchPartReference)
-	 */
-	@Override
-	public void partInputChanged(IWorkbenchPartReference partRef) {
-		cleanRegistry(partRef);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.IPartListener2#partOpened(org.eclipse.ui.
-	 * IWorkbenchPartReference)
-	 */
-	@Override
-	public void partOpened(IWorkbenchPartReference partRef) {
-		// nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.IPartListener2#partVisible(org.eclipse.ui.
-	 * IWorkbenchPartReference)
-	 */
-	@Override
-	public void partVisible(IWorkbenchPartReference partRef) {
-		// nothing to do
-	}
-
-	/**
-	 * Checks if is changing cached editors.
-	 *
-	 * @return true, if is changing cached editors
-	 */
-	public boolean isChangingCachedEditors() {
-		return changingCachedEditors;
-	}
-
-	/**
-	 * Sets the changing cached editors.
-	 *
-	 * @param changingCachedEditors
-	 *            the new changing cached editors
-	 */
-	public void setChangingCachedEditors(boolean changingCachedEditors) {
-		this.changingCachedEditors = changingCachedEditors;
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/ApplyStereotypeRequest.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/ApplyStereotypeRequest.java
index fad82b016b5..c83363c14b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/ApplyStereotypeRequest.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/ApplyStereotypeRequest.java
@@ -26,7 +26,7 @@ import org.eclipse.uml2.uml.Element;
 public class ApplyStereotypeRequest extends CreateRequest {
 
 	/** type of the Apply stereotype request */
-	public static String APPLY_STEREOTYPE_REQUEST = "applyStereotype";
+	public static final String APPLY_STEREOTYPE_REQUEST = "applyStereotype";
 
 	/** stereotypes to apply */
 	final protected List<String> stereotypes;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/AspectUnspecifiedTypeConnectionTool.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/AspectUnspecifiedTypeConnectionTool.java
index 29a042c0217..a183c9ef425 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/AspectUnspecifiedTypeConnectionTool.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/AspectUnspecifiedTypeConnectionTool.java
@@ -513,7 +513,7 @@ public class AspectUnspecifiedTypeConnectionTool extends UnspecifiedTypeConnecti
 		 * type and adds it to the map of requests.
 		 */
 		protected void createRequests() {
-			for (IElementType elementType : (List<IElementType>) getElementTypes()) {
+			for (IElementType elementType : (List<IElementType>) CreateAspectUnspecifiedTypeConnectionRequest.this.getElementTypes()) {
 				CreateConnectionRequest request = PapyrusCreateViewRequestFactory.getCreateConnectionRequest(elementType, getPreferencesHint());
 				request.setType(getType());
 				requests.put(elementType, request);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/AspectUnspecifiedTypeCreationTool.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/AspectUnspecifiedTypeCreationTool.java
index cf873eead90..42c3ffa7046 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/AspectUnspecifiedTypeCreationTool.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/AspectUnspecifiedTypeCreationTool.java
@@ -273,7 +273,7 @@ public class AspectUnspecifiedTypeCreationTool extends UnspecifiedTypeCreationTo
 		 */
 		@Override
 		protected void createRequests() {
-			for (IElementType elementType : (List<IElementType>) getElementTypes()) {
+			for (IElementType elementType : (List<IElementType>) CreateAspectUnspecifiedTypeRequest.this.getElementTypes()) {
 				Request request = null;
 				if (elementType instanceof INotationType) {
 					ViewDescriptor viewDescriptor = new ViewDescriptor(null, Node.class, ((INotationType) elementType).getSemanticHint(), getPreferencesHint());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/ExtendedPluginPaletteProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/ExtendedPluginPaletteProvider.java
index 4c7b929e8e9..9f7e8c328f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/ExtendedPluginPaletteProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/ExtendedPluginPaletteProvider.java
@@ -103,7 +103,7 @@ public class ExtendedPluginPaletteProvider extends AbstractProvider implements I
 	protected static final ImageDescriptor DEFAULT_STACK_IMAGE_DESCRIPTOR = Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "/icons/stack.gif");

 

 	/** default icon for drawers */

-	protected static ImageDescriptor DEFAULT_DRAWER_IMAGE_DESCRIPTOR = Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "/icons/drawer.gif");

+	protected static final ImageDescriptor DEFAULT_DRAWER_IMAGE_DESCRIPTOR = Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "/icons/drawer.gif");

 

 	/** cached list of required profiles for this palette to be shown. this will be <code>null</code> until initialized */

 	protected Collection<String> requiredProfiles = null;

@@ -176,7 +176,6 @@ public class ExtendedPluginPaletteProvider extends AbstractProvider implements I
 	 * @param predefinedEntries

 	 *            predefined existing entries

 	 */

-	@SuppressWarnings("restriction")

 	protected PaletteDrawer generateDrawer(PaletteRoot root, DrawerConfiguration drawerConfiguration, Map predefinedEntries) {

 		String id = drawerConfiguration.getId();

 		// retrieve drawer or create one if necessary

@@ -235,7 +234,7 @@ public class ExtendedPluginPaletteProvider extends AbstractProvider implements I
 				@Override

 				public ImageDescriptor caseDrawerConfiguration(DrawerConfiguration object) {

 					return ExtendedPluginPaletteProvider.DEFAULT_DRAWER_IMAGE_DESCRIPTOR;

-				};

+				}

 

 				/**

 				 * {@inheritDoc}

@@ -243,7 +242,7 @@ public class ExtendedPluginPaletteProvider extends AbstractProvider implements I
 				@Override

 				public ImageDescriptor caseToolConfiguration(ToolConfiguration object) {

 					return ExtendedPluginPaletteProvider.DEFAULT_TOOL_IMAGE_DESCRIPTOR;

-				};

+				}

 

 				/**

 				 * {@inheritDoc}

@@ -251,7 +250,7 @@ public class ExtendedPluginPaletteProvider extends AbstractProvider implements I
 				@Override

 				public ImageDescriptor caseStackConfiguration(StackConfiguration object) {

 					return ExtendedPluginPaletteProvider.DEFAULT_STACK_IMAGE_DESCRIPTOR;

-				};

+				}

 

 				/**

 				 * {@inheritDoc}

@@ -259,7 +258,7 @@ public class ExtendedPluginPaletteProvider extends AbstractProvider implements I
 				@Override

 				public ImageDescriptor defaultCase(org.eclipse.emf.ecore.EObject object) {

 					return null;

-				};

+				}

 			}.doSwitch(configuration);

 		}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/ChangeStereotypeDisplayPostAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/ChangeStereotypeDisplayPostAction.java
index ebd87d57b19..937ba07dd1f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/ChangeStereotypeDisplayPostAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/ChangeStereotypeDisplayPostAction.java
@@ -96,12 +96,6 @@ public class ChangeStereotypeDisplayPostAction extends GraphicalPostAction {
 	/** list of available items in the stereotype place combo */
 	protected static final List<String> PLACE_LIST = Arrays.asList(COMMENT, COMPARTMENT, BRACE);
 
-	/** entry proxy "parent" of this action when configuring the action */
-	protected IPaletteEntryProxy entryProxy;
-
-	/** list of applied profiles */
-	protected List<Profile> appliedProfiles;
-
 	/**
 	 * @{inheritDoc
 	 */
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/DisplayAppliedStereotypePostAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/DisplayAppliedStereotypePostAction.java
index 58e2df3d7ce..10f43428c7b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/DisplayAppliedStereotypePostAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/DisplayAppliedStereotypePostAction.java
@@ -61,12 +61,6 @@ public class DisplayAppliedStereotypePostAction extends GraphicalPostAction {
 	/** list of stereotypes to display with their qualified names */
 	protected List<String> stereotypesQNToDisplay = new ArrayList<String>();
 
-	/** entry proxy "parent" of this action when configuring the action */
-	protected IPaletteEntryProxy entryProxy;
-
-	/** list of applied profiles */
-	protected List<Profile> appliedProfiles;
-
 	/** add icon path */
 	protected static final String ICONS_ADD = "/icons/obj16/Add_16x16.gif"; //$NON-NLS-1$
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/DisplayAppliedStereotypePropertiesInCompartmentPostAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/DisplayAppliedStereotypePropertiesInCompartmentPostAction.java
index 59370df8e78..03d4b3eeeae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/DisplayAppliedStereotypePropertiesInCompartmentPostAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/DisplayAppliedStereotypePropertiesInCompartmentPostAction.java
@@ -64,12 +64,6 @@ public class DisplayAppliedStereotypePropertiesInCompartmentPostAction extends G
 	/** map of stereotypes / properties to display with their qualified names */
 	protected Map<String, String> stereotypePropertiesToDisplay = new HashMap<String, String>();
 
-	/** entry proxy "parent" of this action when configuring the action */
-	protected IPaletteEntryProxy entryProxy;
-
-	/** list of applied profiles */
-	protected List<Profile> appliedProfiles;
-
 	/** add icon path */
 	protected static final String ICONS_ADD = "/icons/obj16/Add_16x16.gif"; //$NON-NLS-1$
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/PropertyRepresentation.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/PropertyRepresentation.java
index 79fbe649af5..06175be0e66 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/PropertyRepresentation.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/palette/PropertyRepresentation.java
@@ -58,7 +58,7 @@ public class PropertyRepresentation {
 	 * separator used in the {@link #propID}. It's not useful, it's only to
 	 * facilitate debug!
 	 */
-	static public String separator = "|";; //$NON-NLS-1$
+	static public final String separator = "|"; //$NON-NLS-1$
 
 	/**
 	 *
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ui/helper/HelpComponentFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ui/helper/HelpComponentFactory.java
index 6c98bd61065..9d0003d2bd2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ui/helper/HelpComponentFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/ui/helper/HelpComponentFactory.java
@@ -17,8 +17,8 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.forms.events.HyperlinkAdapter;
 import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ImageHyperlink;
 
@@ -28,15 +28,16 @@ import org.eclipse.ui.forms.widgets.ImageHyperlink;
 public class HelpComponentFactory {
 
 	/** The image. */
-	public static Image image = null;
+	public static final Image image = loadImage();
 
 	// Load only one time the help icon
-	static {
+	private static Image loadImage() {
 		try {
-			image = new Image(Display.getDefault(), Activator.getDefault().getBundle().getResource("icons/help/help_contents-1.gif").openStream());
+			return new Image(Display.getDefault(), Activator.getDefault().getBundle().getResource("icons/help/help_contents-1.gif").openStream());
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
+		return null;
 	}
 
 	/**
@@ -64,7 +65,7 @@ public class HelpComponentFactory {
 		helpImage.setBackground(null);
 		final String toolTip = (pToolTip == null) ? "Help" : pToolTip;
 		helpImage.setToolTipText(toolTip);
-		helpImage.addHyperlinkListener(new IHyperlinkListener() {
+		helpImage.addHyperlinkListener(new HyperlinkAdapter() {
 
 			// create the HelpDialog that displays the help description
 			@Override
@@ -73,14 +74,6 @@ public class HelpComponentFactory {
 				dialog.open();
 			}
 
-			@Override
-			public void linkEntered(HyperlinkEvent e) {
-			}
-
-			@Override
-			public void linkExited(HyperlinkEvent e) {
-			}
-
 		});
 		return helpImage;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/EdgeEndsMapper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/EdgeEndsMapper.java
deleted file mode 100644
index cedd2d46f63..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/EdgeEndsMapper.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.diagram.common.util;

-

-import java.util.Collection;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.Connector;

-

-/**

- * @deprecated : use LinkEndsMapper instead

- *             A utils class to map links, with their sources and targets OR with ends, when source/target have no sense for the link (example for {@link Connector})

- *

- */

-@Deprecated

-public class EdgeEndsMapper {

-

-	/**

-	 * the link

-	 */

-	private final EObject link;

-

-	/**

-	 * the ends of the links

-	 */

-	private final Collection<?> ends;

-

-	/**

-	 * the targets of the links

-	 */

-	private final Collection<?> targets;

-

-	/**

-	 * the sources of the links

-	 */

-	private final Collection<?> sources;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param link

-	 *            the represented link

-	 * @param ends

-	 *            the ends for this link (could be <code>null</code>)

-	 * @param sources

-	 *            the sources for this link (could be <code>null</code>)

-	 * @param targets

-	 *            the targets for this link (could be <code>null</code>)

-	 */

-	public EdgeEndsMapper(final EObject link, final Collection<?> ends, final Collection<?> sources, final Collection<?> targets) {

-		this.link = link;

-		this.ends = ends;

-		this.targets = targets;

-		this.sources = sources;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the link represented by the instance of this class

-	 */

-	public EObject getLink() {

-		return link;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the ends for the links

-	 */

-	public Collection<?> getEnds() {

-		return ends;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the targets for the links

-	 */

-	public Collection<?> getTargets() {

-		return targets;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the sources for the link

-	 */

-	public Collection<?> getSources() {

-		return sources;

-	}

-

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/MDTUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/MDTUtil.java
index e98092ecac9..6560d0330ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/MDTUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/MDTUtil.java
@@ -17,63 +17,30 @@ package org.eclipse.papyrus.uml.diagram.common.util;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.EcoreFactory;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
 import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.gmf.runtime.emf.core.resources.GMFResource;
-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.tools.util.EditorHelper;
 import org.eclipse.papyrus.uml.diagram.common.Activator;
-import org.eclipse.papyrus.uml.diagram.common.ids.MOSKittEditorIDs;
-import org.eclipse.papyrus.uml.diagram.common.part.CachedResourcesDiagramEditor;
-import org.eclipse.papyrus.uml.diagram.common.part.CachedResourcesEditorInput;
-import org.eclipse.papyrus.uml.diagram.common.part.EditingDomainRegistry;
-import org.eclipse.papyrus.uml.diagram.common.providers.ViewInfo;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.IURIEditorInput;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
 import org.eclipse.uml2.common.util.CacheAdapter;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
@@ -219,24 +186,6 @@ public class MDTUtil {
 	}
 
 	/**
-	 * Gets the diagram name.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 *
-	 * @return the diagram name
-	 */
-	public static String getDiagramName(Diagram diagram) {
-		if (diagram != null) {
-			String type = diagram.getType();
-			String label = MOSKittEditorIDs.getExtensionsMapModelToLabel().get(type);
-			label = label != null ? label : "";
-			return label + " : " + diagram.getName();
-		}
-		return null;
-	}
-
-	/**
 	 * Retieves the <Diagram> from the given <IEditorPart>.
 	 *
 	 * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
@@ -257,43 +206,6 @@ public class MDTUtil {
 		return null;
 	}
 
-	// @unused
-	public static IEditorPart getActiveEditor() {
-		try {
-			return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-		} catch (NullPointerException ex) {
-			return null;
-		}
-	}
-
-	/**
-	 * Gets the preferences hint.
-	 *
-	 * @param kind
-	 *            the kind
-	 *
-	 * @return the preferences hint
-	 *
-	 * @throws ExecutionException
-	 *             the execution exception
-	 */
-	public static PreferencesHint getPreferencesHint(String kind) throws ExecutionException {
-		String editor = MOSKittEditorIDs.getAllExtensionModelToEditor().get(kind);
-		return new PreferencesHint(editor);
-	}
-
-	/**
-	 * Gets the save options.
-	 *
-	 * @return the save options
-	 */
-	public static Map getSaveOptions() {
-		Map saveOptions = new HashMap();
-		saveOptions.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
-		return saveOptions;
-	}
-
 	/**
 	 * Gets the root element resource.
 	 *
@@ -333,47 +245,6 @@ public class MDTUtil {
 	}
 
 	/**
-	 * Gets the host diagram.
-	 *
-	 * @param policy
-	 *            the policy
-	 *
-	 * @return the host diagram
-	 */
-	// @unused
-	public static Diagram getHostDiagram(EditPolicy policy) {
-		if (policy.getHost() instanceof IGraphicalEditPart) {
-			View view = ((IGraphicalEditPart) policy.getHost()).getNotationView();
-			if (view != null) {
-				view = view.getDiagram();
-			}
-			if (view instanceof Diagram) {
-				return (Diagram) view;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Gets a Diagram from the Request looking for it in the extended data with
-	 * key <MultiDiagramUtil.BelongToDiagramSource>
-	 *
-	 * @param request
-	 * @return
-	 */
-	// @unused
-	public static Diagram getDiagramFromRequest(IEditCommandRequest request) {
-		Diagram diagram = null;
-		if (request != null) {
-			Object data = request.getParameters().get(MultiDiagramUtil.BelongToDiagramSource);
-			if (data instanceof Diagram) {
-				diagram = (Diagram) data;
-			}
-		}
-		return diagram;
-	}
-
-	/**
 	 * @deprecated This creates a new resource set, which will leak UML model content forever in the {@link CacheAdapter}. Use the {@link #getRootElementsFromFile(IEditorInput, ResourceSet)} method, instead. Note that if the JVM has assertions
 	 *             enabled for this package, then this method will throw an assertion error
 	 */
@@ -496,355 +367,6 @@ public class MDTUtil {
 		return null;
 	}
 
-	private static final String LastOpenedDiagramPropertyBase = "lastOpenedDiagram";
-
-	/** The Constant LastOpenedDiagramProperty. */
-	public static final QualifiedName LastOpenedDiagramProperty = new QualifiedName(Activator.ID, LastOpenedDiagramPropertyBase);
-
-	/**
-	 * A QualifiedName for a specific editor.
-	 *
-	 * @param editorID
-	 * @return
-	 */
-	public static QualifiedName getLastOpenedDiagramPropertyQualifiedNameForEditor(String editorID) {
-		return new QualifiedName(Activator.ID, LastOpenedDiagramPropertyBase + (editorID != null ? editorID : ""));
-	}
-
-	// @unused
-	public static CachedResourcesDiagramEditor getCachedResourcesDiagramEditorFromEditorRef(IEditorReference reference) {
-		if (reference == null) {
-			return null;
-		}
-		IWorkbenchPart part = reference.getEditor(false);
-
-		if (part == null) {
-			return null;
-		}
-
-		CachedResourcesDiagramEditor editor = (CachedResourcesDiagramEditor) Platform.getAdapterManager().getAdapter(part, CachedResourcesDiagramEditor.class);
-		if (editor != null) {
-			return editor;
-		}
-		return null;
-	}
-
-	/**
-	 * Sets the last opened diagram property.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 *
-	 * @return true, if successful
-	 */
-	public static boolean setLastOpenedDiagramProperty(Diagram diagram) {
-		return setLastOpenedDiagramProperty(diagram, null);
-	}
-
-	/**
-	 * Sets the last opened diagram property.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 *
-	 * @return true, if successful
-	 */
-	public static boolean setLastOpenedDiagramProperty(Diagram diagram, String editorID) {
-		return setLastOpenedDiagramProperty(diagram, editorID, true);
-	}
-
-	/**
-	 * Sets the last opened diagram property.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 *
-	 * @return true, if successful
-	 */
-	public static boolean setLastOpenedDiagramProperty(Diagram diagram, String editorID, boolean setEditorForFileProperty) {
-		if (editorID == null) {
-			editorID = MOSKittEditorIDs.getAllExtensionModelToEditor().get(diagram.getType());
-		}
-		// get Diagram fragment
-		String fragment = diagram.eResource().getURIFragment(diagram);
-		// get Diagram IFile
-		URI uri = diagram.eResource().getURI();
-		uri = uri != null ? uri.trimFragment() : null;
-		String path = PathsUtil.fromAbsoluteFileSystemToAbsoluteWorkspace(uri.toPlatformString(true));
-		return setLastOpenedDiagramProperty(path, fragment, editorID, setEditorForFileProperty);
-	}
-
-	/**
-	 * Sets the last opened diagram property.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 *
-	 * @return true, if successful
-	 */
-	public static boolean setLastOpenedDiagramProperty(String path, String fragment, String editorID, boolean setEditorForFileProperty) {
-		IPath filePath = new Path(path);
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
-		// set IFile property
-		if (file != null) {
-			try {
-				QualifiedName propertyQualifiedName = getLastOpenedDiagramPropertyQualifiedNameForEditor(editorID);
-				file.setPersistentProperty(propertyQualifiedName, fragment);
-				// set the correct editor to edit
-				if (setEditorForFileProperty && editorID != null) {
-					setEditorForDiagramProperty(file, editorID);
-				}
-				return true;
-			} catch (CoreException ex) {
-				IStatus status = new Status(IStatus.WARNING, Activator.ID, "Error setting file property");
-				Activator.getDefault().getLog().log(status);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Sets the last opened diagram property.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 *
-	 * @return true, if successful
-	 */
-	public static boolean removeLastOpenedDiagramProperty(Diagram diagram) {
-		if (diagram == null || diagram.eResource() == null) {
-			return false;
-		}
-
-		// get Diagram fragment
-		String fragment = diagram.eResource().getURIFragment(diagram);
-
-		// get Diagram IFile
-		URI uri = diagram.eResource().getURI();
-		uri = uri != null ? uri.trimFragment() : null;
-		String path = PathsUtil.fromAbsoluteFileSystemToAbsoluteWorkspace(uri.toPlatformString(true));
-		IPath filePath = new Path(path);
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
-		// set IFile property
-		if (file != null) {
-			try {
-				file.setPersistentProperty(LastOpenedDiagramProperty, null);
-				// set the correct editor to edit
-				Diagram firstDiagram = null;
-				for (EObject elem : diagram.eResource().getContents()) {
-					if (elem instanceof Diagram) {
-						firstDiagram = (Diagram) elem;
-						break;
-					}
-				}
-				String editorID = MOSKittEditorIDs.getAllExtensionModelToEditor().get(firstDiagram.getType());
-				if (editorID != null) {
-					setEditorForDiagramProperty(file, editorID);
-				}
-				return true;
-			} catch (CoreException ex) {
-				IStatus status = new Status(IStatus.WARNING, Activator.ID, "Error setting file property");
-				Activator.getDefault().getLog().log(status);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Sets the editor for diagram property.
-	 *
-	 * @param uri
-	 *            the uri
-	 * @param editorID
-	 *            the editor id
-	 *
-	 * @throws CoreException
-	 *             the core exception
-	 */
-	public static void setEditorForDiagramProperty(URI uri, String editorID) {
-		String part1 = uri.path().replaceFirst("resource", "");
-		IPath path = new Path(part1);
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-		if (file != null) {
-			setEditorForDiagramProperty(file, editorID);
-		}
-	}
-
-	/**
-	 * Sets the editor for diagram property.
-	 *
-	 * @param file
-	 *            the file
-	 * @param editorID
-	 *            the editor id
-	 *
-	 * @throws CoreException
-	 *             the core exception
-	 */
-	public static void setEditorForDiagramProperty(IFile file, String editorID) {
-		if (file != null) {
-			try {
-				file.setPersistentProperty(IDE.EDITOR_KEY, editorID);
-			} catch (CoreException ex) {
-				Activator.getDefault().logError("Couldn't set file editorToOpen property", ex);
-			}
-			return;
-		}
-	}
-
-	/**
-	 * Removes the property that specifies the editor that opens an IFile.
-	 *
-	 * @param uri
-	 * @return
-	 */
-	public static boolean removeEditorForDiagramProperty(URI uri) {
-		String part1 = uri.path().replaceFirst("resource", "");
-		IPath path = new Path(part1);
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-		if (file != null) {
-			return removeEditorForDiagramProperty(file);
-		}
-		return false;
-	}
-
-	/**
-	 * Removes the property that specifies the editor that opens an IFile.
-	 *
-	 * @param file
-	 * @return
-	 */
-	public static boolean removeEditorForDiagramProperty(IFile file) {
-		try {
-			file.setPersistentProperty(IDE.EDITOR_KEY, null);
-			return true;
-		} catch (CoreException ex) {
-			return false;
-		}
-	}
-
-	// @unused
-	public static boolean setEditorForDiagramForFirstDiagram(Resource resource) {
-		Diagram diagram = MDTUtil.getFirstDiagramFromResource(resource);
-		if (diagram != null) {
-			String kind = diagram.getType();
-			String editorID = MOSKittEditorIDs.getAllExtensionModelToEditor().get(kind);
-			if (editorID != null) {
-				MDTUtil.setEditorForDiagramProperty(resource.getURI(), editorID);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Gets the last opened diagram property.
-	 *
-	 * @param filePath
-	 *            the file path
-	 *
-	 * @return the last opened diagram property
-	 */
-	public static String getLastOpenedDiagramProperty(String filePath) {
-		return getLastOpenedDiagramPropertyForEditor(filePath, null);
-	}
-
-	public static String getLastOpenedDiagramPropertyForEditor(String filePath, String editorID) {
-		if (filePath == null) {
-			return null;
-		}
-		IPath path = new Path(filePath);
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-		if (file != null) {
-			try {
-				return file.getPersistentProperty(getLastOpenedDiagramPropertyQualifiedNameForEditor(editorID));
-			} catch (CoreException ex) {
-				IStatus status = new Status(IStatus.WARNING, Activator.ID, "Error retieving editor property: ", ex);
-				Activator.getDefault().getLog().log(status);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Copy editor input but uri.
-	 *
-	 * @param input
-	 *            the input
-	 * @param uri
-	 *            the uri
-	 *
-	 * @return the cached resources editor input
-	 */
-	public static CachedResourcesEditorInput copyEditorInputButUri(IEditorInput input, URI uri) {
-		CachedResourcesEditorInput cachedInput = new CachedResourcesEditorInput(uri, input.getName());
-		if (input instanceof CachedResourcesEditorInput) {
-			cachedInput.setUnload(((CachedResourcesEditorInput) input).isUnload());
-		}
-		return cachedInput;
-	}
-
-	/**
-	 * Gets or builds a valid CachedResourcesEditorInput for a given URI. The
-	 * given URI must point to a valid GMFResource. <br>
-	 * This URI can have a fragment defined. If the fragment does not point to a
-	 * valid Diagram, the first Diagram of the Resource is returned as input.
-	 *
-	 * @param editorInput
-	 * @param editorID
-	 * @return
-	 */
-	// @unused
-	public static CachedResourcesEditorInput getValidEditorInput(URI editorInput, String editorID) {
-		if (editorID != null && editorInput != null) {
-			// get the shared editing domain, that will have the resources
-			// already loaded and with the latest changes.
-			TransactionalEditingDomain domain = EditingDomainRegistry.getInstance().get(editorID, editorInput.trimFragment().toString());
-			if (domain != null) {
-				// search for the given diagram in all the resourceSet.
-				URI uri = getProperDiagramURIToOpen(domain.getResourceSet(), editorInput);
-				if (uri != null) {
-					// if we found a matching diagram, return it as a
-					// CachedResourcesEditorInput
-					return new CachedResourcesEditorInput(uri, false);
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Tries to get the given Diagram in URI. If not, it will get the first
-	 * Diagram.
-	 *
-	 * @param resourceSet
-	 * @param editorInput
-	 * @return
-	 */
-	public static URI getProperDiagramURIToOpen(ResourceSet resourceSet, URI editorInput) {
-		// search the target diagram in the resourceset.
-		EObject eObject = searchEObjectFromFragment(editorInput, resourceSet);
-		if (eObject != null) {
-			// if found, make sure it is a Diagram
-			Diagram diagram = (Diagram) Platform.getAdapterManager().getAdapter(eObject, Diagram.class);
-			if (diagram != null) {
-				// if it's a Diagram, return the proper URI
-				return diagram.eResource().getURI().appendFragment(diagram.eResource().getURIFragment(diagram));
-			}
-		}
-		// if target diagram is not found, look for the first Diagram
-		Resource resource = resourceSet.getResource(editorInput.trimFragment(), true);
-		if (resource != null) {
-			Diagram diagram = getFirstDiagramFromResource(resource);
-			if (diagram != null) {
-				// if we find a diagram, return its URI.
-				return resource.getURI().appendFragment(resource.getURIFragment(diagram));
-			}
-		}
-		return null;
-	}
-
 	/**
 	 * Searchs for an EObject in a ResourceSet by its fragment.
 	 *
@@ -915,7 +437,7 @@ public class MDTUtil {
 	 * @param className
 	 * @return
 	 */
-	public static boolean isOfType(Class clazz, String className) {
+	public static boolean isOfType(Class<?> clazz, String className) {
 		if (clazz == null || className == null) {
 			return false;
 		}
@@ -924,7 +446,7 @@ public class MDTUtil {
 			return true;
 		}
 		// look interfaces
-		for (Class c : clazz.getInterfaces()) {
+		for (Class<?> c : clazz.getInterfaces()) {
 			if (isOfType(c, className)) {
 				return true;
 			}
@@ -934,281 +456,10 @@ public class MDTUtil {
 	}
 
 	/**
-	 * Gets the edits the parts from selection.
-	 *
-	 * @param selection
-	 *            the selection
-	 *
-	 * @return the edits the parts from selection
-	 */
-	// @unused
-	public static List<EditPart> getEditPartsFromSelection(ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			List<EditPart> editParts = new ArrayList<EditPart>();
-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-			for (Object object : structuredSelection.toList()) {
-				if (object instanceof EditPart) {
-					editParts.add((EditPart) object);
-				}
-			}
-			return editParts;
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * Gets the e objects from selection.
-	 *
-	 * @param selection
-	 *            the selection
-	 *
-	 * @return the e objects from selection
-	 */
-	// @unused
-	public static List<EObject> getEObjectsFromSelection(ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			List<EObject> eObjects = new ArrayList<EObject>();
-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-			for (Object object : structuredSelection.toList()) {
-				EObject eObject = resolveSemantic(object);
-				if (eObject != null) {
-					eObjects.add(eObject);
-				}
-			}
-			return eObjects;
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * Looks for <Diagram>s associated to an <EObject> and all its children.
-	 *
-	 * @param eObject
-	 *            <EObject> to begin the search
-	 * @param gmfResource
-	 *            <GMFResource> to look for <Diagram>s. If null, a <GMFResource>
-	 *            will be looked up in the <EObject>'s <ResourceSet>, if any.
-	 *
-	 * @return the diagrams in hierarchy
-	 */
-	// @unused
-	public static List<Diagram> getDiagramsInHierarchy(EObject eObject, Resource gmfResource) {
-		// no eObject means nothing to search for
-		if (eObject == null) {
-			return Collections.EMPTY_LIST;
-		}
-		// no gmfResource given, we'll search one
-		if (gmfResource instanceof GMFResource == false) {
-			Resource resource = eObject.eResource();
-			ResourceSet resourceSet = resource != null ? resource.getResourceSet() : null;
-			if (resourceSet != null) {
-				for (Resource resourceAux : resourceSet.getResources()) {
-					if (resourceAux instanceof GMFResource) {
-						// gmfResource found
-						gmfResource = resourceAux;
-						break;
-					}
-				}
-			}
-		}
-		// no gmfResource given nor found. Nothing to do.
-		if (gmfResource instanceof GMFResource == false) {
-			return Collections.EMPTY_LIST;
-		}
-		// start of search
-		// List to store all found <Diagram>s
-		List<Diagram> diagrams = new ArrayList<Diagram>();
-		// List of all <EObject>s to check
-		List<EObject> allEObjects = new ArrayList<EObject>();
-		allEObjects.add(eObject);
-		for (Iterator<EObject> iterator = eObject.eAllContents(); iterator.hasNext();) {
-			allEObjects.add(iterator.next());
-		}
-		// search for each <EObject>'s <Diagram>s
-		for (EObject element : allEObjects) {
-			for (EObject content : gmfResource.getContents()) {
-				if (content instanceof Diagram && element.equals(((Diagram) content).getElement())) {
-					// a <Diagram> that references an affected <EObject> has
-					// been found
-					diagrams.add((Diagram) content);
-				}
-			}
-		}
-		if (diagrams.size() > 0) {
-			// some <Diagram>s were found
-			return diagrams;
-		}
-		return Collections.emptyList();
-	}
-
-	// // Filter Views and Labels
-
-	/** The Constant FilterViewAndLabelsSource. */
-	public static final String FilterViewAndLabelsSource = "org.eclipse.papyrus.uml.diagram.common.FilterViewsAndLabelsSource";
-
-	/**
-	 * Sets the elements to filter to diagram.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 * @param infos
-	 *            the infos
-	 */
-	public static void setElementsToFilterToDiagram(Diagram diagram, Collection<Integer> infos) {
-		if (diagram == null || infos == null) {
-			return;
-		}
-		EAnnotation eAnnotation = diagram.getEAnnotation(FilterViewAndLabelsSource);
-		if (eAnnotation == null) {
-			eAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
-			eAnnotation.setSource(FilterViewAndLabelsSource);
-			diagram.getEAnnotations().add(eAnnotation);
-		}
-		Collection<Integer> existing = getAllViewsToFilterFromDiagram(diagram);
-		Collection<Integer> toAdd = new ArrayList<Integer>();
-		Collection<Integer> toDelete = new ArrayList<Integer>();
-		// build toAdd list
-		for (Integer integer : infos) {
-			if (existing.contains(integer) == false) {
-				toAdd.add(integer);
-			}
-		}
-		// build toDelete list
-		for (Integer integer : existing) {
-			if (infos.contains(integer) == false) {
-				toDelete.add(integer);
-			}
-		}
-		// add
-		for (Integer integer : toAdd) {
-			String key = String.valueOf(integer);
-			if (false == eAnnotation.getDetails().containsKey(key)) {
-				eAnnotation.getDetails().put(key, "");
-			}
-		}
-		// delete
-		for (Integer integer : toDelete) {
-			String key = String.valueOf(integer);
-			if (true == eAnnotation.getDetails().containsKey(key)) {
-				eAnnotation.getDetails().remove(key);
-			}
-		}
-	}
-
-	/**
-	 * Removes the element to filter from diagram.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 * @param infos
-	 *            the infos
-	 */
-	// @unused
-	public static void removeElementToFilterFromDiagram(Diagram diagram, Collection<ViewInfo> infos) {
-		if (diagram == null || infos == null || infos.size() <= 0) {
-			return;
-		}
-		EAnnotation eAnnotation = diagram.getEAnnotation(FilterViewAndLabelsSource);
-		if (eAnnotation == null) {
-			return;
-		}
-		for (ViewInfo info : infos) {
-			String key = String.valueOf(info.getVisualID());
-			if (eAnnotation.getDetails().containsKey(key)) {
-				eAnnotation.getDetails().removeKey(key);
-			}
-		}
-	}
-
-	/**
-	 * Gets the all views to filter from diagram.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 *
-	 * @return the all views to filter from diagram
-	 */
-	public static Collection<Integer> getAllViewsToFilterFromDiagram(Diagram diagram) {
-		EAnnotation eAnnotation = diagram.getEAnnotation(FilterViewAndLabelsSource);
-		if (eAnnotation == null) {
-			return Collections.EMPTY_LIST;
-		}
-		Collection<Integer> keys = new ArrayList<Integer>();
-		for (String key : eAnnotation.getDetails().keySet()) {
-			keys.add(Integer.valueOf(key));
-		}
-		return keys;
-	}
-
-	/**
-	 * Find element in diagram filter.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 * @param visualID
-	 *            the visual id
-	 *
-	 * @return true, if successful
-	 */
-	// @unused
-	public static boolean findElementInDiagramFilter(Diagram diagram, int visualID) {
-		if (diagram != null) {
-			EAnnotation eAnnotation = diagram.getEAnnotation(FilterViewAndLabelsSource);
-			if (eAnnotation == null) {
-				return false;
-			}
-			String key = String.valueOf(visualID);
-			return eAnnotation.getDetails().containsKey(key);
-		}
-		return false;
-	}
-
-	/**
-	 * Filter diagram views.
-	 *
-	 * @param diagram
-	 *            the diagram
+	 * @return
 	 */
-	public static void filterDiagramViews(Diagram diagram) {
-		Collection<Integer> filters = getAllViewsToFilterFromDiagram(diagram);
-		Iterator<EObject> it = diagram.eAllContents();
-		while (it.hasNext()) {
-			EObject eObject = it.next();
-			if (eObject instanceof View) {
-				View view = (View) eObject;
-				Integer integer = null;
-				try {
-					integer = Integer.valueOf(view.getType());
-				} catch (NumberFormatException ex) {
-					integer = null;
-				}
-				if (integer != null) {
-					SetRequest request = null;
-					if (filters.contains(integer)) {
-						request = new SetRequest(view, NotationPackage.eINSTANCE.getView_Visible(), false);
-					} else {
-						request = new SetRequest(view, NotationPackage.eINSTANCE.getView_Visible(), true);
-					}
-					SetValueCommand command = new SetValueCommand(request);
-					Object value = request.getValue();
-					EObject elementToEdit = request.getElementToEdit();
-					EStructuralFeature feature = request.getFeature();
-					if (value != null && elementToEdit != null && feature != null && elementToEdit.eGet(feature) != null && !value.equals(elementToEdit.eGet(feature))) {
-						TransactionUtil.getEditingDomain(view).getCommandStack().execute(new GMFtoEMFCommandWrapper(command));
-					}
-				}
-			}
-		}
-	}
-
-	// //****////
-	// @unused
-	public static IStatusLineManager getStatusLineManager() {
-		try {
-			return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor().getEditorSite().getActionBars().getStatusLineManager();
-		} catch (NullPointerException ex) {
-			return null;
-		}
+	public static IEditorPart getActiveEditor() {
+		return EditorHelper.getCurrentEditor();
 	}
 
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/MultiDiagramUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/MultiDiagramUtil.java
index 41daa881a43..fe6e09ba270 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/MultiDiagramUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/MultiDiagramUtil.java
@@ -13,63 +13,27 @@
 package org.eclipse.papyrus.uml.diagram.common.util;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EcoreFactory;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.XMLResource;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
 import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.window.Window;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.uml.diagram.common.Activator;
-import org.eclipse.papyrus.uml.diagram.common.ids.MOSKittEditorIDs;
-import org.eclipse.papyrus.uml.diagram.common.part.CachedResourcesDiagramEditor;
-import org.eclipse.papyrus.uml.diagram.common.part.CachedResourcesEditorInput;
-import org.eclipse.papyrus.uml.diagram.common.part.EditingDomainRegistry;
-import org.eclipse.papyrus.uml.diagram.common.providers.IDiagramInitializer;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IPluginContribution;
 import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Constants;
 
 /**
  * The Class MultiDiagramUtil.
@@ -80,553 +44,6 @@ import org.osgi.framework.Constants;
  */
 public class MultiDiagramUtil {
 
-	/** EAnnotation Source for elements that belong to this <Diagram>. */
-	public static final String BelongToDiagramSource = "es.cv.gvcase.mdt.uml2.diagram.common.Belongs_To_This_Diagram";
-
-	/** EAnnotation Source for diagrams that grow from this <View>. */
-	public static final String DiagramsRelatedToElement = "es.cv.gvcase.mdt.uml2.diagram.common.DiagramsRelatedToElement";
-
-	/**
-	 * EAnnotation Source for diagrams that open the correct Upper Diagram
-	 * <View>.
-	 */
-	public static final String UpperDiagram = "es.cv.gvcase.mdt.diagram.common.UpperDiagram";
-
-	/**
-	 * Associate diagram to view.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 */
-	public static void associateDiagramToView(Diagram diagram) {
-		EAnnotation eAnnotation = diagram.getEAnnotation(DiagramsRelatedToElement);
-		if (eAnnotation == null) {
-			eAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
-			eAnnotation.setSource(DiagramsRelatedToElement);
-			diagram.getEAnnotations().add(eAnnotation);
-		}
-		eAnnotation.getReferences().add(diagram.getElement());
-	}
-
-	/**
-	 * Gets the diagrams associated to view.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 *
-	 * @return the diagrams associated to view
-	 */
-	// @unused
-	public static List<Diagram> getDiagramsAssociatedToView(Diagram diagram) {
-		EObject domainElement = diagram != null ? diagram.getElement() : null;
-		Resource resource = diagram != null ? diagram.eResource() : null;
-		String diagramKind = diagram != null ? diagram.getType() : null;
-		if (domainElement == null || resource == null || diagramKind == null) {
-			return Collections.EMPTY_LIST;
-		}
-		List<Diagram> diagrams = new ArrayList<Diagram>();
-		for (EObject eObject : resource.getContents()) {
-			if (eObject instanceof Diagram) {
-				Diagram containedDiagram = (Diagram) eObject;
-				EAnnotation eAnnotation = containedDiagram.getEAnnotation(DiagramsRelatedToElement);
-				if (eAnnotation != null) {
-					if (eAnnotation.getReferences().contains(domainElement)) {
-						diagrams.add(containedDiagram);
-					}
-				}
-			}
-		}
-		return diagrams;
-	}
-
-	// //****////
-	/**
-	 * Adds the e annotation reference to diagram.
-	 *
-	 * @param plugin
-	 *            the plugin
-	 * @param eObject
-	 *            the e object
-	 *
-	 * @return true, if successful
-	 */
-	public static boolean addEAnnotationReferenceToDiagram(AbstractUIPlugin plugin, EObject eObject) {
-		return AddEAnnotationReferenceToDiagram(DiagramEditPartsUtil.findDiagramFromPlugin(plugin), eObject);
-	}
-
-	/**
-	 * Adds the e annotation reference to diagram.
-	 *
-	 * @param editPart
-	 *            the edit part
-	 * @param eObject
-	 *            the e object
-	 *
-	 * @return true, if successful
-	 */
-	// @unused
-	public static boolean addEAnnotationReferenceToDiagram(EditPart editPart, EObject eObject) {
-		return AddEAnnotationReferenceToDiagram(DiagramEditPartsUtil.findDiagramFromEditPart(editPart), eObject);
-	}
-
-	/**
-	 * Adds the e annotation reference to diagram.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 * @param eObject
-	 *            the e object
-	 *
-	 * @return true, if successful
-	 */
-	public static boolean AddEAnnotationReferenceToDiagram(Diagram diagram, EObject eObject) {
-
-		if (diagram != null) {
-			EAnnotation eAnnotation = diagram.getEAnnotation(BelongToDiagramSource);
-			if (eAnnotation == null) {
-				eAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
-				eAnnotation.setSource(BelongToDiagramSource);
-				diagram.getEAnnotations().add(eAnnotation);
-			}
-			// if (eAnnotation.getReferences().contains(eObject) == false) {
-			eAnnotation.getReferences().add(eObject);
-			// }
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Adds the eAnnotation Upper Diagram to diagram.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 * @param eObject
-	 *            the e object
-	 *
-	 * @return true, if successful
-	 */
-	public static boolean addEAnnotationUpperDiagramToDiagram(Diagram diagram, EObject eObject) {
-
-		if (diagram != null) {
-			EAnnotation eAnnotation = diagram.getEAnnotation(UpperDiagram);
-			if (eAnnotation == null) {
-				eAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
-				eAnnotation.setSource(UpperDiagram);
-				diagram.getEAnnotations().add(eAnnotation);
-			}
-			eAnnotation.getReferences().add(eObject);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Removes the e annotation reference from diagram.
-	 *
-	 * @param plugin
-	 *            the plugin
-	 * @param eObject
-	 *            the e object
-	 *
-	 * @return true, if successful
-	 */
-	// @unused
-	public static boolean RemoveEAnnotationReferenceFromDiagram(AbstractUIPlugin plugin, EObject eObject) {
-		return RemoveEAnnotationReferenceFromDiagram(DiagramEditPartsUtil.findDiagramFromPlugin(plugin), eObject);
-	}
-
-	/**
-	 * Removes the e annotation reference from diagram.
-	 *
-	 * @param editPart
-	 *            the edit part
-	 * @param eObject
-	 *            the e object
-	 *
-	 * @return true, if successful
-	 */
-	// @unused
-	public static boolean RemoveEAnnotationReferenceFromDiagram(EditPart editPart, EObject eObject) {
-		return RemoveEAnnotationReferenceFromDiagram(DiagramEditPartsUtil.findDiagramFromEditPart(editPart), eObject);
-	}
-
-	/**
-	 * Removes the e annotation reference from diagram.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 * @param eObject
-	 *            the e object
-	 *
-	 * @return true, if successful
-	 */
-	public static boolean RemoveEAnnotationReferenceFromDiagram(Diagram diagram, EObject eObject) {
-
-		if (diagram != null) {
-			EAnnotation eAnnotation = diagram.getEAnnotation(BelongToDiagramSource);
-			if (eAnnotation == null) {
-				return false;
-			}
-			if (eAnnotation.getReferences().contains(eObject) == true) {
-				eAnnotation.getReferences().remove(eObject);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Find e object referenced in e annotation.
-	 *
-	 * @param editPart
-	 *            the edit part
-	 * @param eObject
-	 *            the e object
-	 *
-	 * @return true, if successful
-	 */
-	// @unused
-	public static boolean findEObjectReferencedInEAnnotation(EditPart editPart, EObject eObject) {
-		return findEObjectReferencedInEAnnotation(DiagramEditPartsUtil.findDiagramFromEditPart(editPart), eObject);
-	}
-
-	/**
-	 * Find e object referenced in e annotation.
-	 *
-	 * @param plugin
-	 *            the plugin
-	 * @param eObject
-	 *            the e object
-	 *
-	 * @return true, if successful
-	 */
-	// @unused
-	public static boolean findEObjectReferencedInEAnnotation(AbstractUIPlugin plugin, EObject eObject) {
-		return findEObjectReferencedInEAnnotation(DiagramEditPartsUtil.findDiagramFromPlugin(plugin), eObject);
-	}
-
-	/**
-	 * Find e object referenced in e annotation.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 * @param eObject
-	 *            the e object
-	 *
-	 * @return true, if successful
-	 */
-	public static boolean findEObjectReferencedInEAnnotation(Diagram diagram, EObject eObject) {
-
-		if (diagram != null) {
-			EAnnotation eAnnotation = diagram.getEAnnotation(BelongToDiagramSource);
-			if (eAnnotation == null || !eAnnotation.getReferences().contains(eObject)) {
-				return false;
-			}
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Gets the all references in e annotation.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 *
-	 * @return the all references in e annotation
-	 */
-	// @unused
-	public static List<EObject> getAllReferencesInEAnnotation(Diagram diagram) {
-		EAnnotation eAnnotation = diagram.getEAnnotation(BelongToDiagramSource);
-		if (eAnnotation != null) {
-			return eAnnotation.getReferences();
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	// //****////
-	/**
-	 * Add to a diagram the version of the first editor that will modify the diagram. It uses
-	 * MOSKittEditorsIDs.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 *
-	 * @author gmerin
-	 * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
-	 */
-	public static void addMultiDiagramVersion(Diagram diagram) {
-		String diagramKind = diagram.getType();
-		if (diagramKind == null) {
-			return;
-		}
-		String editorId = MOSKittEditorIDs.getAllExtensionModelToEditor().get(diagramKind);
-		if (editorId == null) {
-			return;
-		}
-
-		IPluginContribution pluginContribution = (IPluginContribution) PlatformUI.getWorkbench().getEditorRegistry().findEditor(editorId);
-		if (pluginContribution == null) {
-			return;
-		}
-		Bundle bundle = Platform.getBundle(pluginContribution.getPluginId());
-		if (bundle == null) {
-			return;
-		}
-		String version = bundle.getHeaders().get(Constants.BUNDLE_VERSION);
-
-		MDTUtil.addDiagramVersion(diagram, version);
-	}
-
-	/**
-	 * Intialize new diagram.
-	 *
-	 * @param kind
-	 *            the kind
-	 * @param domainElement
-	 *            the domain element
-	 * @param resource
-	 *            the resource
-	 * @param initializers
-	 *            the initializers
-	 *
-	 * @return the diagram
-	 *
-	 * @throws ExecutionException
-	 *             the execution exception
-	 */
-	// @unused
-	public static Diagram intializeNewDiagram(String kind, EObject domainElement, Resource resource, Map<String, IDiagramInitializer> initializers) throws ExecutionException {
-		return intializeNewDiagram(kind, domainElement, resource, initializers, true);
-	}
-
-	/**
-	 * Intialize new diagram.
-	 *
-	 * @param kind
-	 *            the kind
-	 * @param domainElement
-	 *            the domain element
-	 * @param resource
-	 *            the resource
-	 * @param initializers
-	 *            the initializers
-	 * @param askName
-	 *            the ask name
-	 *
-	 * @return the diagram
-	 *
-	 * @throws ExecutionException
-	 *             the execution exception
-	 */
-	public static Diagram intializeNewDiagram(String kind, EObject domainElement, Resource resource, Map<String, IDiagramInitializer> initializers, boolean askName) throws ExecutionException {
-		Diagram d = null;
-		try {
-			d = ViewService.createDiagram(domainElement, kind, MDTUtil.getPreferencesHint(kind));
-			if (askName && !setDigramName(d)) {
-				return null;
-			}
-		} catch (ExecutionException ex) {
-			return null;
-		}
-		if (d == null) {
-			throw new ExecutionException("Can't create diagram of '" + kind + "' kind");
-		}
-		// add the diagram to its container resource
-		resource.getContents().add(d);
-
-		// insert the eAnnotation to set the diagram to be opened in the
-		// OpenUpper action
-		IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-		Diagram activeDiagram = null;
-		if (activeEditor instanceof DiagramEditor) {
-			DiagramEditor diagramEditor = (DiagramEditor) activeEditor;
-			activeDiagram = diagramEditor.getDiagram();
-		} else if (activeEditor != null) {
-			activeDiagram = (Diagram) activeEditor.getAdapter(Diagram.class);
-		}
-		if (activeDiagram != null) {
-			addEAnnotationUpperDiagramToDiagram(d, activeDiagram);
-		}
-
-		associateDiagramToView(d);
-		createInitialElements(d, initializers);
-		// This will add the version of the editor that will edit the diagram
-		addMultiDiagramVersion(d);
-		// resource.getContents().add(d);
-		return d;
-	}
-
-	/**
-	 * Sets the digram name.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 *
-	 * @return true, if successful
-	 */
-	protected static boolean setDigramName(Diagram diagram) {
-		String message = "";
-		message += "New " + diagram.getType() + " diagram name";
-		InputDialog dialog = new InputDialog(Display.getCurrent().getActiveShell(), "Diagram name", message, diagram.getType(), null);
-		int result = dialog.open();
-		if (result == Window.OK) {
-			String name = dialog.getValue();
-			diagram.setName(name);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Intialize new diagram.
-	 *
-	 * @param kind
-	 *            the kind
-	 * @param domainElement
-	 *            the domain element
-	 * @param resource
-	 *            the resource
-	 * @param initializers
-	 *            the initializers
-	 * @param askName
-	 *            the ask name
-	 * @param name
-	 *            the name
-	 *
-	 * @return the diagram
-	 *
-	 * @throws ExecutionException
-	 *             the execution exception
-	 */
-	// @unused
-	public static Diagram intializeNewDiagram(String kind, EObject domainElement, Resource resource, Map<String, IDiagramInitializer> initializers, boolean askName, String name) throws ExecutionException {
-		return intializeNewDiagram(kind, domainElement, resource, initializers, askName, name, null);
-	}
-
-	/**
-	 * Intialize new diagram.
-	 *
-	 * @param kind
-	 *            the kind
-	 * @param domainElement
-	 *            the domain element
-	 * @param resource
-	 *            the resource
-	 * @param initializers
-	 *            the initializers
-	 * @param askName
-	 *            the ask name
-	 * @param name
-	 *            the name
-	 *
-	 * @param upperDiagram
-	 *            the upper diagram
-	 *
-	 * @return the diagram
-	 *
-	 * @throws ExecutionException
-	 *             the execution exception
-	 */
-	public static Diagram intializeNewDiagram(String kind, EObject domainElement, Resource resource, Map<String, IDiagramInitializer> initializers, boolean askName, String name, Diagram upperDiagram) throws ExecutionException {
-
-		Diagram d = null;
-		try {
-			d = ViewService.createDiagram(domainElement, kind, MDTUtil.getPreferencesHint(kind));
-			if (askName && !setDigramName(d, name)) {
-				return null;
-			}
-		} catch (ExecutionException ex) {
-			return null;
-		}
-		if (d == null) {
-			throw new ExecutionException("Can't create diagram of '" + kind + "' kind");
-		}
-
-		// insert the eAnnotation to set the diagram to be opened in the
-		// OpenUpper action
-		if (upperDiagram == null) {
-			IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-			if (activeEditor != null) {
-				upperDiagram = (Diagram) activeEditor.getAdapter(Diagram.class);
-			}
-		}
-		addEAnnotationUpperDiagramToDiagram(d, upperDiagram);
-
-		associateDiagramToView(d);
-		createInitialElements(d, initializers);
-		// This will add the version of the editor that will edit the diagram
-		addMultiDiagramVersion(d);
-		resource.getContents().add(d);
-		return d;
-	}
-
-	/**
-	 * Sets the digram name.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 * @param name
-	 *            the name
-	 *
-	 * @return true, if successful
-	 */
-	protected static boolean setDigramName(Diagram diagram, String name) {
-		String message = "";
-		message += "New " + diagram.getType() + " diagram name";
-		InputDialog dialog = new InputDialog(Display.getCurrent().getActiveShell(), "Diagram name", message, name, null);
-		int result = dialog.open();
-		if (result == Window.OK) {
-			String n = dialog.getValue();
-			diagram.setName(n);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Sets the editor for diagram.
-	 *
-	 * @param uri
-	 *            the uri
-	 * @param editorID
-	 *            the editor id
-	 *
-	 * @throws CoreException
-	 *             the core exception
-	 */
-	// @unused
-	public static void setEditorForDiagram(URI uri, String editorID) throws CoreException {
-		String part1 = uri.path().replaceFirst("resource", "");
-		IPath path = new Path(part1);
-		ResourcesPlugin.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-		if (file != null) {
-			file.setPersistentProperty(IDE.EDITOR_KEY, editorID);
-			return;
-		}
-		throw new CoreException(new Status(IStatus.ERROR, Activator.ID, "Error setting file property"));
-	}
-
-	/**
-	 * Creates the initial elements.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 * @param initializers
-	 *            the initializers
-	 */
-	private static void createInitialElements(Diagram diagram, Map<String, IDiagramInitializer> initializers) {
-		if (initializers != null) {
-			String kind = diagram.getType();
-			if (initializers.containsKey(kind)) {
-				IDiagramInitializer initializer = initializers.get(kind);
-				initializer.init(diagram);
-			}
-		}
-	}
-
 	/**
 	 * Gets the save options.
 	 *
@@ -640,69 +57,6 @@ public class MultiDiagramUtil {
 	}
 
 	/**
-	 * Perform delete diagram.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 * @param confirm
-	 *            the confirm
-	 *
-	 * @return the diagram
-	 */
-	// @unused
-	public static Diagram performDeleteDiagram(Diagram diagram, boolean confirm) {
-		if (diagram == null) {
-			return null;
-		}
-		// Get upper diagram to open in case the one deleted is active.
-		Diagram diagramToOpen = getUpperDiagram(diagram);
-		if (diagramToOpen == null || diagramToOpen.equals(diagram)) {
-			// This is the uppest diagram we'll look for a diagram at the same
-			// level
-			diagramToOpen = getOtherDiagram(diagram);
-			if (diagramToOpen == null) {
-				// no suitable diagram to open
-				return null;
-			}
-		}
-
-		// The diagram is Ok to be deleted. Ask user confirmation.
-		if (confirm) {
-			MessageDialog confirmDialog = new MessageDialog(Display.getCurrent().getActiveShell(), "Delete diagram?", null, "Are oyu sure you want to delete the selected diagram?", MessageDialog.WARNING, new String[] { "Yes", "No" }, 1);
-			int result = confirmDialog.open();
-			if (result == Window.CANCEL) {
-				return null;
-			}
-		}
-
-		if (!isDiagramActive(diagram)) {
-			// If the diagram to delete is not active it can be deleted without
-			// problems.
-			deleteDiagramAndSave(diagram);
-		} else {
-			// If the diagram to delete is active, a complex process must be
-			// folowed to delete it.
-			// Close all diagram editors that have the diagram to be deleted
-			// active.
-			EditingDomainRegistry.getInstance().setChangingCachedEditors(true);
-			closeEditorsThatShowDiagram(diagram);
-			// Delete diagram
-			deleteDiagramAndSave(diagram);
-			// Open its upper diagram
-			try {
-				openDiagram(diagramToOpen);
-			} catch (ExecutionException ex) {
-				IStatus status = new Status(IStatus.ERROR, Activator.ID, "Can't open diagram");
-				Activator.getDefault().getLog().log(status);
-				return null;
-			} finally {
-				EditingDomainRegistry.getInstance().setChangingCachedEditors(false);
-			}
-		}
-		return diagramToOpen;
-	}
-
-	/**
 	 * Checks if is diagram active.
 	 *
 	 * @param diagram
@@ -732,18 +86,6 @@ public class MultiDiagramUtil {
 	 *
 	 * @param diagram
 	 * @param resource
-	 * @return
-	 */
-	// @unused
-	public static boolean addDiagramAndSave(Diagram diagram, Resource resource) {
-		return addDiagramAndSave(diagram, resource, true);
-	}
-
-	/**
-	 * Adds a diagram to a resource and saves the resource.
-	 *
-	 * @param diagram
-	 * @param resource
 	 * @param save
 	 * @return
 	 */
@@ -765,47 +107,6 @@ public class MultiDiagramUtil {
 	}
 
 	/**
-	 * Delete diagram and save.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 *
-	 * @return true, if successful
-	 */
-	public static boolean deleteDiagramAndSave(Diagram diagram) {
-		return deleteDiagramAndSave(diagram, true);
-	}
-
-	/**
-	 * Delete diagram and save.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 *
-	 * @return true, if successful
-	 */
-	public static boolean deleteDiagramAndSave(Diagram diagram, boolean save) {
-		if (diagram != null && diagram.eResource() != null) {
-			Resource diagramResource = diagram.eResource();
-			MDTUtil.removeLastOpenedDiagramProperty(diagram);
-			MDTUtil.removeEditorForDiagramProperty(diagram.eResource().getURI());
-			if (deleteDiagramFromResource(diagram, diagram.eResource()) == false) {
-				return false;
-			}
-			if (save) {
-				try {
-					diagramResource.save(getSaveOptions());
-				} catch (IOException ex) {
-					IStatus status = new Status(IStatus.ERROR, Activator.ID, "Error saving resource");
-					Activator.getDefault().getLog().log(status);
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	/**
 	 * Deletes a <Diagram> in the given <Resource>.
 	 *
 	 * @param diagram
@@ -882,187 +183,6 @@ public class MultiDiagramUtil {
 		return true;
 	}
 
-	// //****////
-
-	/**
-	 * Open diagram and close the one we come from.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 *
-	 * @return the i editor part
-	 *
-	 * @throws ExecutionException
-	 *             the execution exception
-	 */
-	public static IEditorPart openDiagram(Diagram diagram) throws ExecutionException {
-		return openDiagram(diagram, false);
-	}
-
-	/**
-	 * Open diagram and optionally close the one we come from.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 *
-	 * @return the i editor part
-	 *
-	 * @throws ExecutionException
-	 *             the execution exception
-	 */
-	public static IEditorPart openDiagram(Diagram diagram, boolean openInNew) throws ExecutionException {
-		//
-		MDTUtil.setLastOpenedDiagramProperty(diagram);
-		//
-		URI uri = diagram.eResource().getURI();
-		uri = uri.appendFragment(diagram.eResource().getURIFragment(diagram));
-		String diagramName = MDTUtil.getDiagramName(diagram);
-		IEditorInput editorInput = new CachedResourcesEditorInput(uri, diagramName, false, openInNew);
-		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		IEditorPart activeEditor = page.getActiveEditor();
-		// close other diagrams using the same resource
-		// and open the new one
-		EditingDomainRegistry.getInstance().setChangingCachedEditors(true);
-		if (openInNew == false) {
-			page.closeEditor(activeEditor, true);
-			// closeOtherDiagrams(diagram, page, !sameResource);
-		}
-		try {
-			String editorID = MOSKittEditorIDs.getAllExtensionModelToEditor().get(diagram.getType());
-			IEditorPart openedEditor = page.openEditor(editorInput, editorID);
-			page.activate(openedEditor);
-			return openedEditor;
-		} catch (PartInitException ex) {
-			throw new ExecutionException("Can't open diagram", ex);
-		} finally {
-			EditingDomainRegistry.getInstance().setChangingCachedEditors(false);
-		}
-	}
-
-	/**
-	 * Check diagram for editor.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 * @param editor
-	 *            the editor
-	 *
-	 * @return true, if successful
-	 */
-	// @unused
-	protected static boolean checkDiagramForEditor(Diagram diagram, CachedResourcesDiagramEditor editor) {
-		String kind = diagram.getType();
-		String diagramEditorID = MOSKittEditorIDs.getAllExtensionModelToEditor().get(kind);
-		String editorID = editor.getEditorID();
-		return (diagramEditorID != null && diagramEditorID.equals(editorID));
-	}
-
-	// @unused
-	public static boolean checkSameResourceForEditorInputs(IEditorInput oldInput, IEditorInput newInput) {
-		boolean openInNewEditor = false;
-
-		CachedResourcesEditorInput newCachedEditorInput = null;
-		if (newInput instanceof CachedResourcesEditorInput) {
-			newCachedEditorInput = (CachedResourcesEditorInput) newInput;
-			openInNewEditor = newCachedEditorInput.isOpenInNewEditor();
-		}
-
-		if (openInNewEditor) {
-			// we want to open in a new editor, alas if the IEditorInput is
-			// exactly the same (the same resource AND diagram) we can reuse
-			// this editor
-			if (CachedResourcesEditorInput.checkSameEditorInput(oldInput, newCachedEditorInput)) {
-				return true;
-			}
-			return false;
-		}
-
-		// get real URIs for both the old input ant the new input
-		URI oldUri = URIUtil.getUri(oldInput).trimFragment();
-		URI newUri = URIUtil.getUri(newInput).trimFragment();
-
-		if (oldUri != null && newUri != null) {
-			return oldUri.equals(newUri);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Close other diagrams.
-	 *
-	 * @param diagramToOpen
-	 *            the diagram to open
-	 * @param page
-	 *            the page
-	 * @param unload
-	 *            the unload
-	 */
-	// @unused
-	protected static void closeOtherDiagrams(Diagram diagramToOpen, IWorkbenchPage page, boolean unload) {
-		EObject rootEObject = diagramToOpen.getElement();
-		if (rootEObject == null) {
-			return;
-		}
-		Resource activeResource = rootEObject.eResource();
-		String activeUri = activeResource.getURI().trimFragment().toString();
-		for (IEditorReference editorReference : page.getEditorReferences()) {
-			IEditorPart editor = editorReference.getEditor(true);
-			Resource resource = MDTUtil.getRootElementResource(editor);
-			if (resource == null) {
-				continue;
-			}
-			String uri = resource.getURI().trimFragment().toString();
-			if (activeUri.equals(uri)) {
-				editor.doSave(new NullProgressMonitor());
-				if (editor instanceof CachedResourcesDiagramEditor) {
-					((CachedResourcesDiagramEditor) editor).setUnloadOnDispose(unload);
-				}
-				page.closeEditor(editor, true);
-			}
-		}
-	}
-
-	// // Get upper diagram
-
-	/**
-	 * Gets the upper diagram.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 *
-	 * @return the upper diagram
-	 */
-	public static Diagram getUpperDiagram(Diagram diagram) {
-		if (diagram == null) {
-			return null;
-		}
-
-		EAnnotation eAnnotation = diagram.getEAnnotation(UpperDiagram);
-		if (eAnnotation != null && eAnnotation.getReferences().size() > 0) {
-			if (eAnnotation.getReferences().get(0) instanceof Diagram) {
-				return (Diagram) eAnnotation.getReferences().get(0);
-			}
-		}
-
-		EObject domainElement = diagram.getElement();
-		Resource gmfResource = diagram.eResource();
-		do {
-			for (EObject eObject : gmfResource.getContents()) {
-				if (eObject instanceof Diagram) {
-					if (diagram.equals(eObject) == false && diagramHasElement((Diagram) eObject, domainElement)) {
-						return (Diagram) eObject;
-					}
-				}
-			}
-			// no diagram that includes this element was found
-			// search for diagrams that include the parent element
-			domainElement = domainElement.eContainer();
-		} while (domainElement != null);
-
-		return null;
-	}
-
 	/**
 	 * Gets the other diagram.
 	 *
@@ -1093,115 +213,4 @@ public class MultiDiagramUtil {
 		return null;
 	}
 
-	/**
-	 * Checks whether a <Diagram> contains a <View> of the given element.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 * @param element
-	 *            the element
-	 *
-	 * @return true, if successful
-	 */
-	private static boolean diagramHasElement(Diagram diagram, EObject element) {
-
-		for (TreeIterator<EObject> iterator = diagram.eAllContents(); iterator.hasNext();) {
-			EObject eObject = iterator.next();
-			if (eObject instanceof View) {
-				if (((View) eObject).getElement() != null && ((View) eObject).getElement().equals(element)) {
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	// //
-	/**
-	 * Storing and retrieveing info about open diagrams for {@link MOSKittMultiPageEditor}.
-	 */
-	// //
-	// qualified name for the IFile property that will store the info about the
-	// open diagrams.
-	private static final QualifiedName OpenDiagramsFileProperty = new QualifiedName("es.cv.gvcase.mdt.common.part.MOSKittMultiPageEditor", "openDiagrams");
-
-	private static final String OpenDiagramsSeparator = ";";
-
-	/**
-	 * Stores the list of given diagrams in their resources' IFiles' properties.
-	 *
-	 * @param openDiagrams
-	 */
-	// @unused
-	public static void storeOpenDiagrams(List<Diagram> openDiagrams) {
-		List<Resource> affectedResources = new ArrayList<Resource>();
-		List<EObject> affectedEObjects = new ArrayList<EObject>();
-
-		for (EObject eObject : openDiagrams) {
-			if (eObject != null && eObject.eResource() != null) {
-				if (!affectedResources.contains(eObject.eResource())) {
-					affectedResources.add(eObject.eResource());
-				}
-				affectedEObjects.add(eObject);
-			}
-		}
-
-		String openToStore = "";
-		for (Resource resource : affectedResources) {
-			for (EObject eObject : affectedEObjects) {
-				if (eObject.eResource() == resource) {
-					openToStore += (resource.getURIFragment(eObject) + OpenDiagramsSeparator);
-				}
-			}
-			String path = PathsUtil.fromAbsoluteFileSystemToAbsoluteWorkspace(resource.getURI().toString());
-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(path));
-			try {
-				file.setPersistentProperty(OpenDiagramsFileProperty, openToStore);
-			} catch (CoreException ex) {
-
-			}
-			openToStore = "";
-		}
-	}
-
-	/**
-	 * Gets the list of open diagrams for the given {@link IEditorInput}.
-	 *
-	 * @param editorInput
-	 * @return
-	 */
-	// @unused
-	public static List<EObject> getOpenDiagrams(IEditorInput editorInput) {
-		List<EObject> openDiagrams = new ArrayList<EObject>();
-		String path = PathsUtil.getRelativeWorkspaceFromEditorInput(editorInput);
-		if (path != null) {
-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(path));
-			try {
-				String diagramsToOpenProperty = file.getPersistentProperty(OpenDiagramsFileProperty);
-				if (diagramsToOpenProperty == null || diagramsToOpenProperty.length() <= 0) {
-					return Collections.emptyList();
-				}
-				List<String> diagramsToOpen = Arrays.asList(diagramsToOpenProperty.split(OpenDiagramsSeparator));
-				if (diagramsToOpen == null || diagramsToOpen.size() <= 0) {
-					return openDiagrams;
-				}
-				List<EObject> rootEObjects = MDTUtil.getRootElementsFromFile(editorInput);
-				Diagram diagram = null;
-				for (EObject eObject : rootEObjects) {
-					diagram = (Diagram) Platform.getAdapterManager().getAdapter(eObject, Diagram.class);
-					if (diagram != null && diagram.eResource() != null) {
-						String fragment = diagram.eResource().getURIFragment(diagram);
-						if (diagramsToOpen.contains(fragment)) {
-							openDiagrams.add(diagram);
-						}
-					}
-				}
-			} catch (CoreException ex) {
-				return openDiagrams;
-			}
-		}
-		return openDiagrams;
-	}
-
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/URIUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/URIUtil.java
deleted file mode 100644
index ee3e2829f19..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/URIUtil.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Copyright (c) 2006, 2014 Eclipse.org, 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:
- *    Dmitry Stadnik - initial API and implementation
- *    Christian W. Damus (CEA) - bug 422257
- */
-package org.eclipse.papyrus.uml.diagram.common.util;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.ui.URIEditorInput;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.ui.IEditorInput;
-
-/**
- * @author dstadnik
- */
-
-public class URIUtil {
-
-	private URIUtil() {
-	}
-
-	// @unused
-	public static IFile getFile(URI uri) {
-		String fileName = uri.toFileString();
-		if (fileName != null) {
-			return ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(fileName));
-		}
-		if (uri.toString().startsWith("platform:/resource")) { //$NON-NLS-1$
-			String path = uri.toString().substring("platform:/resource".length()); //$NON-NLS-1$
-			IResource workspaceResource = ResourcesPlugin.getWorkspace().getRoot().findMember(new Path(path));
-			if (workspaceResource instanceof IFile) {
-				return (IFile) workspaceResource;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 *
-	 *
-	 * @param input
-	 * @return
-	 */
-	public static URI getUri(IEditorInput input) {
-		return getUri(input, null);
-	}
-
-	/**
-	 *
-	 *
-	 * @param input
-	 * @return
-	 */
-	public static URI getUri(IEditorInput input, String editorID) {
-		String uriString = null;
-		if (input instanceof URIEditorInput) {
-			uriString = PathsUtil.getRelativeWorkspaceFromEditorInputWithFragment(input);
-		} else {
-			uriString = PathsUtil.getRelativeWorkspaceFromEditorInput(input);
-			String fragment = MDTUtil.getLastOpenedDiagramPropertyForEditor(uriString, editorID);
-			if (fragment != null) {
-				uriString = URI.createURI(uriString).appendFragment(fragment).toString();
-			}
-		}
-		if (input != null) {
-			URI uri = URI.createURI(uriString);
-			if (uri.hasFragment()) {
-				return uri;
-			}
-			ResourceSet resourceSet = new ResourceSetImpl();
-			try {
-				resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());
-				Resource resource = resourceSet.getResource(uri, true);
-				Diagram diagram = MDTUtil.getFirstDiagramFromResource(resource);
-				if (diagram != null) {
-					String fragment = resource.getURIFragment(diagram);
-					uri = uri.appendFragment(fragment);
-				}
-			} finally {
-				EMFHelper.unload(resourceSet);
-			}
-			return uri;
-		}
-		return null;
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
index f7037055876..39ff8a2e12f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
@@ -27,28 +27,28 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,

  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,

  org.eclipse.ocl.ecore,

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

  org.eclipse.uml2.uml.resources;bundle-version="3.0.0",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

  org.eclipse.ui.navigator.resources;bundle-version="3.4.400",

  org.eclipse.ui.navigator;bundle-version="3.5.200",

  org.eclipse.core.expressions;bundle-version="3.4.400",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

  org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",

  org.eclipse.core.runtime,

  org.eclipse.core.resources,

  org.eclipse.jface,

@@ -60,7 +60,7 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,
  org.eclipse.gmf.runtime.emf.commands.core,

  org.eclipse.gmf.runtime.emf.ui.properties,

  org.eclipse.gmf.runtime.diagram.ui,

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.providers.ide,

  org.eclipse.gmf.runtime.diagram.ui.render,

  org.eclipse.gmf.runtime.diagram.ui.resources.editor,

@@ -71,10 +71,10 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,
  org.eclipse.emf.ecore.edit;visibility:=reexport,

  org.eclipse.emf.validation;visibility:=reexport,

  org.eclipse.gef,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.communication.part.U

  MLDiagramEditorPlugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/pom.xml
index f696a0ef6c3..c9ede207ca7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.communication</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
index 1ef73ddcd34..a1bbfd6123b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
@@ -26,28 +26,28 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.runtime.draw2d.ui,

  org.eclipse.uml2.uml,

  org.eclipse.ocl.ecore,

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",

  org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.ui.views,

  org.eclipse.emf.ecore,

  org.eclipse.emf.ecore.xmi,

@@ -58,14 +58,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.validation;visibility:=reexport,

  org.eclipse.gef,

  org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0",

- org.eclipse.papyrus.uml.diagram.menu;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.diagram.menu;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.component.part.UMLDi

  agramEditorPlugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/factory/CustomPortNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/factory/CustomPortNameEditPart.java
new file mode 100644
index 00000000000..412b3d2e864
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/factory/CustomPortNameEditPart.java
@@ -0,0 +1,48 @@
+package org.eclipse.papyrus.uml.diagram.component.custom.factory;

+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 440224 : Label Alignment 

+ *

+ *****************************************************************************/

+

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortNameEditPart;

+

+public class CustomPortNameEditPart extends PortNameEditPart {

+

+	public CustomPortNameEditPart(View view) {

+		super(view);

+		

+	}

+

+	

+	/**

+	 *Refresh Bounds of PortName EditPart in case of Move 

+	 */

+	@Override

+	public void refreshBounds() {

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		

+		// Update locator constraint

+		IBorderItemLocator locator = getBorderItemLocator();

+		locator.setConstraint(new Rectangle(x, y, width, height));

+

+		// Set new constraint on parent figure

+		getFigure().getParent().setConstraint(getFigure(), locator);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/factory/CustomUMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/factory/CustomUMLEditPartFactory.java
index c1f296c85b9..a42665d2423 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/factory/CustomUMLEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/factory/CustomUMLEditPartFactory.java
@@ -32,6 +32,7 @@ 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.PortNameEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.UMLEditPartFactory;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

@@ -69,6 +70,8 @@ public class CustomUMLEditPartFactory extends UMLEditPartFactory {
 				return new CustomDependencyNodeEditPart(view);

 			case DependencyBranchEditPart.VISUAL_ID:

 				return new CustomDependencyBranchEditPart(view);

+			case PortNameEditPart.VISUAL_ID:

+				return new CustomPortNameEditPart(view);

 			}

 		}

 		return super.createEditPart(context, model);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen
index 3b03c865564..bb2b65276a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen
@@ -1,3234 +1,3238 @@
-<?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:gmfgen="http://www.eclipse.org/gmf/2009/GenModel"
-    xmlns:papyrusgmfgenextension="http://www.eclipse.org/papyrus/2009/papyrusgmfgenextension">
-  <gmfgen:GenEditorGenerator
-      packageNamePrefix="org.eclipse.papyrus.uml.diagram.component"
-      modelID="PapyrusUMLComponentDiagram"
-      domainFileExtension="PapyrusUMLComponent"
-      dynamicTemplates="true"
-      templateDirectory="/org.eclipse.papyrus.def/xtend/"
-      copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
-      pluginDirectory="/org.eclipse.papyrus.uml.diagram.component/src">
-    <diagram
-        visualID="1000"
-        editPartClassName="ComponentDiagramEditPart"
-        itemSemanticEditPolicyClassName="ComponentDiagramItemSemanticEditPolicy"
-        canonicalEditPolicyClassName="ModelCanonicalEditPolicy"
-        iconProviderPriority="Low"
-        creationWizardIconPath="icons/obj16/ComponentDiagram.gif"
-        editingDomainID="org.eclipse.papyrus.uml.diagram.component.EditingDomain"
-        validationProviderPriority="Low"
-        validationEnabled="true"
-        validationDecorators="true"
-        liveValidationUIFeedback="true">
-      <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Diagram"/>
-      <elementType
-          xsi:type="gmfgen:MetamodelType"
-          uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Model_1000"
-          displayName="ComponentDiagram"
-          editHelperClassName="ModelEditHelper"/>
-      <viewmap
-          xsi:type="gmfgen:FigureViewmap"
-          figureQualifiedClassName="org.eclipse.draw2d.FreeformLayer"/>
-      <behaviour
-          xsi:type="gmfgen:CustomBehaviour"
-          key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-          editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy"/>
-      <behaviour
-          xsi:type="gmfgen:CustomBehaviour"
-          key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-          editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      <domainDiagramElement
-          href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>
-      <childNodes
-          xsi:type="gmfgen:GenChildSideAffixedNode"
-          visualID="3069"
-          editPartClassName="PortEditPart"
-          itemSemanticEditPolicyClassName="PortItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="PortCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="PortGraphicalNodeEditPolicy"
-          createCommandClassName="PortCreateCommand"
-          containers="/0/@diagram/@topLevelNodes.1 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.12">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Port_3069"
-            editHelperClassName="PortEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.PortFigure">
-          <attributes
-              xsi:type="gmfgen:DefaultSizeAttributes"
-              width="20"
-              height="20"/>
-        </viewmap>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomPortItemSemanticEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.PortLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Port"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.1">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.2/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property/aggregation"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            xsi:type="gmfgen:GenExternalNodeLabel"
-            visualID="5006"
-            editPartClassName="PortNameEditPart"
-            itemSemanticEditPolicyClassName="PortNameItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:FigureViewmap"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <behaviour
-              xsi:type="gmfgen:CustomBehaviour"
-              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL"
-              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPortLabelEditPolicy"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            xsi:type="gmfgen:GenExternalNodeLabel"
-            visualID="5007"
-            editPartClassName="PortAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="PortAppliedStereotypeItemSemanticEditPolicy"
-            readOnly="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:FigureViewmap"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                x="25"
-                y="-10"/>
-          </viewmap>
-          <behaviour
-              xsi:type="gmfgen:CustomBehaviour"
-              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.2"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3077"
-          editPartClassName="ModelEditPartCN"
-          itemSemanticEditPolicyClassName="ModelItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="ModelCanonicalEditPolicyCN"
-          compartments="/0/@diagram/@compartments.3"
-          graphicalNodeEditPolicyClassName="ModelGraphicalNodeEditPolicyCN"
-          createCommandClassName="ModelCreateCommandCN"
-          containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.3 /0/@diagram/@compartments.1 /0/@diagram/@compartments.4">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Model_3077"
-            displayName="Model"
-            editHelperClassName="ModelEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure">
-          <attributes
-              xsi:type="gmfgen:DefaultSizeAttributes"
-              width="150"
-              height="150"/>
-        </viewmap>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;RESIZE_BORDER_ITEMS&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Model"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5264"
-            editPartClassName="ModelNameEditPartCN"
-            itemSemanticEditPolicyClassName="ModelNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3076"
-          editPartClassName="PackageEditPartCN"
-          itemSemanticEditPolicyClassName="PackageItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="PackageCanonicalEditPolicyCN"
-          compartments="/0/@diagram/@compartments.4"
-          graphicalNodeEditPolicyClassName="PackageGraphicalNodeEditPolicyCN"
-          createCommandClassName="PackageCreateCommandCN"
-          containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.3 /0/@diagram/@compartments.1">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Package_3076"
-            displayName="Package"
-            editHelperClassName="PackageEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure">
-          <attributes
-              xsi:type="gmfgen:DefaultSizeAttributes"
-              width="150"
-              height="150"/>
-        </viewmap>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;RESIZE_BORDER_ITEMS&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.5">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5261"
-            editPartClassName="PackageNameEditPartCN"
-            itemSemanticEditPolicyClassName="PackageNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3078"
-          editPartClassName="RectangleInterfaceEditPartCN"
-          compartments="/0/@diagram/@compartments.9 /0/@diagram/@compartments.10"
-          containers="/0/@diagram/@compartments.1 /0/@diagram/@compartments.2 /0/@diagram/@compartments.3 /0/@diagram/@compartments.4">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure">
-          <attributes
-              xsi:type="gmfgen:DefaultSizeAttributes"
-              width="100"
-              height="100"/>
-        </viewmap>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5267"
-            editPartClassName="RectangleInterfaceNameEditPartCN"
-            itemSemanticEditPolicyClassName="RectangleInterfaceNameItemSemanticEditPolicyCN">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3070"
-          editPartClassName="ComponentEditPartCN"
-          itemSemanticEditPolicyClassName="ComponentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="ComponentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.0"
-          compartments="/0/@diagram/@compartments.5"
-          graphicalNodeEditPolicyClassName="ComponentGraphicalNodeEditPolicyCN"
-          createCommandClassName="ComponentCreateCommandCN"
-          containers="/0/@diagram/@compartments.5 /0/@diagram/@compartments.6 /0/@diagram/@compartments.0">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Component_3070"
-            displayName="Component"
-            metamodelType="/0/@diagram/@topLevelNodes.1/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure">
-          <attributes
-              xsi:type="gmfgen:DefaultSizeAttributes"
-              width="150"
-              height="70"/>
-        </viewmap>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5256"
-            editPartClassName="ComponentNameEditPartCN"
-            itemSemanticEditPolicyClassName="ComponentNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}"
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3071"
-          editPartClassName="ComponentEditPartPCN"
-          itemSemanticEditPolicyClassName="ComponentItemSemanticEditPolicyPCN"
-          canonicalEditPolicyClassName="ComponentCanonicalEditPolicyPCN"
-          childNodes="/0/@diagram/@childNodes.0"
-          compartments="/0/@diagram/@compartments.6"
-          graphicalNodeEditPolicyClassName="ComponentGraphicalNodeEditPolicyPCN"
-          createCommandClassName="ComponentCreateCommandPCN"
-          containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.3 /0/@diagram/@compartments.1">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Component_3071"
-            displayName="Component"
-            metamodelType="/0/@diagram/@topLevelNodes.1/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure">
-          <attributes
-              xsi:type="gmfgen:DefaultSizeAttributes"
-              width="150"
-              height="70"/>
-        </viewmap>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5257"
-            editPartClassName="ComponentNameEditPartPCN"
-            itemSemanticEditPolicyClassName="ComponentNameItemSemanticEditPolicyPCN">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}"
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3074"
-          editPartClassName="CommentEditPartPCN"
-          itemSemanticEditPolicyClassName="CommentItemSemanticEditPolicyPCN"
-          canonicalEditPolicyClassName="CommentCanonicalEditPolicyPCN"
-          graphicalNodeEditPolicyClassName="CommentGraphicalNodeEditPolicyPCN"
-          createCommandClassName="CommentCreateCommandPCN"
-          containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.3 /0/@diagram/@compartments.1">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Comment_3074"
-            metamodelType="/0/@diagram/@topLevelNodes.5/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.2">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5258"
-            editPartClassName="CommentBodyEditPartPCN"
-            itemSemanticEditPolicyClassName="CommentBodyItemSemanticEditPolicyPCN">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getCornerBentFigure"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.1">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3075"
-          editPartClassName="ConstraintEditPartPCN"
-          itemSemanticEditPolicyClassName="ConstraintItemSemanticEditPolicyPCN"
-          canonicalEditPolicyClassName="ConstraintCanonicalEditPolicyPCN"
-          graphicalNodeEditPolicyClassName="ConstraintGraphicalNodeEditPolicyPCN"
-          createCommandClassName="ConstraintCreateCommandPCN"
-          containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.3 /0/@diagram/@compartments.1">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Constraint_3075"
-            metamodelType="/0/@diagram/@topLevelNodes.6/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.1">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5259"
-            editPartClassName="ConstraintNameEditPartPCN"
-            itemSemanticEditPolicyClassName="ConstraintNameItemSemanticEditPolicyPCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="5260"
-            editPartClassName="ConstraintSpecificationEditPartPCN"
-            itemSemanticEditPolicyClassName="ConstraintSpecificationItemSemanticEditPolicyPCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getConstraintFigure"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.3">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            <editableMetaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          xsi:type="gmfgen:GenChildLabelNode"
-          visualID="1"
-          editPartClassName="PropertyForInterfaceEditPart"
-          itemSemanticEditPolicyClassName="PropertyForInterfaceItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="PropertyForInterfaceCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="PropertyForInterfaceGraphicalNodeEditPolicy"
-          createCommandClassName="PropertyForInterfaceCreateCommand"
-          containers="/0/@diagram/@compartments.7 /0/@diagram/@compartments.9">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.AppliedStereotypePropertyDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface/ownedAttribute"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface/ownedAttribute"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labelModelFacet
-            xsi:type="gmfgen:FeatureLabelModelFacet"
-            parser="/0/@labelParsers/@implementations.0">
-          <metaFeatures
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-        </labelModelFacet>
-      </childNodes>
-      <childNodes
-          xsi:type="gmfgen:GenChildLabelNode"
-          visualID="5"
-          editPartClassName="OperationForInterfaceEditPart"
-          itemSemanticEditPolicyClassName="OperationForInterfaceItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="OperationForInterfaceCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="OperationForInterfaceGraphicalNodeEditPolicy"
-          createCommandClassName="OperationForInterfaceCreateCommand"
-          containers="/0/@diagram/@compartments.8 /0/@diagram/@compartments.10">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.AppliedStereotypePropertyDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Operation"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface/ownedOperation"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface/ownedOperation"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labelModelFacet
-            xsi:type="gmfgen:FeatureLabelModelFacet"
-            parser="/0/@labelParsers/@implementations.0">
-          <metaFeatures
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-        </labelModelFacet>
-      </childNodes>
-      <childNodes
-          xsi:type="gmfgen:GenChildLabelNode"
-          visualID="6"
-          editPartClassName="ReceptionInInterfaceEditPart"
-          itemSemanticEditPolicyClassName="ReceptionInInterfaceItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ReceptionInInterfaceCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="ReceptionInInterfaceGraphicalNodeEditPolicy"
-          createCommandClassName="ReceptionInInterfaceCreateCommand"
-          containers="/0/@diagram/@compartments.8 /0/@diagram/@compartments.10">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Reception"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface/ownedReception"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface/ownedReception"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labelModelFacet
-            xsi:type="gmfgen:FeatureLabelModelFacet"
-            parser="/0/@labelParsers/@implementations.0"
-            viewPattern="\u00ABSignal\u00BB {0}"
-            editorPattern="{0}"
-            editPattern="{0}">
-          <metaFeatures
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-        </labelModelFacet>
-      </childNodes>
-      <childNodes
-          visualID="3072"
-          editPartClassName="InterfaceEditPartPCN"
-          itemSemanticEditPolicyClassName="InterfaceItemSemanticEditPolicyPCN"
-          canonicalEditPolicyClassName="InterfaceCanonicalEditPolicyPCN"
-          graphicalNodeEditPolicyClassName="InterfaceGraphicalNodeEditPolicyPCN"
-          createCommandClassName="InterfaceCreateCommandPCN"
-          containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.3 /0/@diagram/@compartments.1">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Interface_3072"
-            displayName="Interface"
-            metamodelType="/0/@diagram/@topLevelNodes.8/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.LollipopInterfaceFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.2">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            xsi:type="gmfgen:GenExternalNodeLabel"
-            editPartClassName="InterfaceNameEditPartPCN"
-            itemSemanticEditPolicyClassName="InterfaceNameItemSemanticEditPolicyPCN">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:FigureViewmap"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.InterfaceAsCercle_nameLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3079"
-          editPartClassName="PropertyPartEditPartCN"
-          childNodes="/0/@diagram/@childNodes.0"
-          containers="/0/@diagram/@compartments.0 /0/@diagram/@compartments.5 /0/@diagram/@compartments.6">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.PropertyPartFigure">
-          <attributes
-              xsi:type="gmfgen:DefaultSizeAttributes"
-              width="150"
-              height="70"/>
-        </viewmap>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.itemsemantic.PropertyPartItemSemanticEditPolicyCN"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.PropertyLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5268"
-            editPartClassName="PropertyPartNameEditPartCN"
-            itemSemanticEditPolicyClassName="PropertyPartNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <behaviour
-              xsi:type="gmfgen:CustomBehaviour"
-              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL"
-              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPropertyLabelEditPolicy"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}"
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <topLevelNodes
-          visualID="3203"
-          editPartClassName="DependencyNodeEditPart"
-          itemSemanticEditPolicyClassName="DependencyNodeItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="DependencyNodeCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="DependencyNodeGraphicalNodeEditPolicy"
-          createCommandClassName="DependencyNodeCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.DependencyNode_3203"
-            displayName="DependencyNode"
-            editHelperClassName="DependencyEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.DependencyNodeFigure">
-          <attributes
-              xsi:type="gmfgen:DefaultSizeAttributes"
-              width="10"
-              height="10"/>
-        </viewmap>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-        </modelFacet>
-        <labels
-            xsi:type="gmfgen:GenExternalNodeLabel"
-            visualID="5008"
-            editPartClassName="MultiDependencyLabelEditPart"
-            itemSemanticEditPolicyClassName="MultiDependencyLabelItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:FigureViewmap"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2002"
-          editPartClassName="ComponentEditPart"
-          itemSemanticEditPolicyClassName="ComponentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ComponentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.0"
-          compartments="/0/@diagram/@compartments.0"
-          graphicalNodeEditPolicyClassName="ComponentGraphicalNodeEditPolicy"
-          createCommandClassName="ComponentCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Component_2002"
-            editHelperClassName="ComponentEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure">
-          <attributes
-              xsi:type="gmfgen:DefaultSizeAttributes"
-              width="150"
-              height="70"/>
-        </viewmap>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/ownedType"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5004"
-            editPartClassName="ComponentNameEditPart"
-            itemSemanticEditPolicyClassName="ComponentNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              editPattern="">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="3202"
-          editPartClassName="ModelEditPart"
-          itemSemanticEditPolicyClassName="ModelItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ModelCanonicalEditPolicy"
-          compartments="/0/@diagram/@compartments.1"
-          graphicalNodeEditPolicyClassName="ModelGraphicalNodeEditPolicy"
-          createCommandClassName="ModelCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Model_3202"
-            displayName="Model"
-            editHelperClassName="ModelEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure">
-          <attributes
-              xsi:type="gmfgen:DefaultSizeAttributes"
-              width="150"
-              height="150"/>
-        </viewmap>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;RESIZE_BORDER_ITEMS&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Model"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5262"
-            editPartClassName="ModelNameEditPart"
-            itemSemanticEditPolicyClassName="ModelNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="3200"
-          editPartClassName="PackageEditPart"
-          itemSemanticEditPolicyClassName="PackageItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="PackageCanonicalEditPolicy"
-          compartments="/0/@diagram/@compartments.2"
-          graphicalNodeEditPolicyClassName="PackageGraphicalNodeEditPolicy"
-          createCommandClassName="PackageCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Package_3200"
-            displayName="Package"
-            editHelperClassName="PackageEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure">
-          <attributes
-              xsi:type="gmfgen:DefaultSizeAttributes"
-              width="150"
-              height="150"/>
-        </viewmap>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;RESIZE_BORDER_ITEMS&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.5">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5254"
-            editPartClassName="PackageNameEditPart"
-            itemSemanticEditPolicyClassName="PackageNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="3205"
-          editPartClassName="RectangleInterfaceEditPart"
-          itemSemanticEditPolicyClassName="RectangleInterfaceItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="RectangleInterfaceCanonicalEditPolicy"
-          compartments="/0/@diagram/@compartments.7 /0/@diagram/@compartments.8"
-          graphicalNodeEditPolicyClassName="RectangleInterfaceGraphicalNodeEditPolicy"
-          createCommandClassName="RectangleInterfaceCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure">
-          <attributes
-              xsi:type="gmfgen:DefaultSizeAttributes"
-              width="100"
-              height="100"/>
-        </viewmap>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5266"
-            editPartClassName="RectangleInterfaceNameEditPart"
-            itemSemanticEditPolicyClassName="RectangleInterfaceNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="3201"
-          editPartClassName="CommentEditPart"
-          itemSemanticEditPolicyClassName="CommentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="CommentCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="CommentGraphicalNodeEditPolicy"
-          createCommandClassName="CommentCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Comment_3201"
-            displayName="Comment"
-            editHelperClassName="CommentEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.2">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5255"
-            editPartClassName="CommentBodyEditPart"
-            itemSemanticEditPolicyClassName="CommentBodyItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getCornerBentFigure"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.1">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="3199"
-          editPartClassName="ConstraintEditPart"
-          itemSemanticEditPolicyClassName="ConstraintItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ConstraintCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="ConstraintGraphicalNodeEditPolicy"
-          createCommandClassName="ConstraintCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Comment_3199"
-            displayName="Constraint"
-            editHelperClassName="ConstraintEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.1">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5252"
-            editPartClassName="ConstraintNameEditPart"
-            itemSemanticEditPolicyClassName="ConstraintNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="5253"
-            editPartClassName="ConstraintSpecificationEditPart"
-            itemSemanticEditPolicyClassName="ConstraintSpecificationItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getConstraintFigure"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.3">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            <editableMetaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="3204"
-          editPartClassName="DefaultNamedElementEditPart"
-          itemSemanticEditPolicyClassName="DefaultNamedElementItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="DefaultNamedElementCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="DefaultNamedElementGraphicalNodeEditPolicy"
-          createCommandClassName="DefaultNamedElementCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.DefaultNamedElement_3204"
-            displayName="DefaultNamedElement"
-            editHelperClassName="DefaultNamedElementEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes
-              xsi:type="gmfgen:DefaultSizeAttributes"
-              width="100"
-              height="50"/>
-        </viewmap>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy.CHANGE_SHAPE_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.ComponentDiagramChangeStereotypedShapeEditpolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.itemsemantic.CustomDefaultNamedElementItemSemanticEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-        </modelFacet>
-        <labels
-            visualID="5265"
-            editPartClassName="DefaultNamedElementNameEditPart"
-            itemSemanticEditPolicyClassName="DefaultNamedElementNameItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2003"
-          editPartClassName="InterfaceEditPart"
-          itemSemanticEditPolicyClassName="InterfaceItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="InterfaceCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="InterfaceGraphicalNodeEditPolicy"
-          createCommandClassName="InterfaceCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Interface_2003"
-            editHelperClassName="InterfaceEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.LollipopInterfaceFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/ownedType"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.2">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            xsi:type="gmfgen:GenExternalNodeLabel"
-            visualID="5005"
-            editPartClassName="InterfaceNameEditPart"
-            itemSemanticEditPolicyClassName="InterfaceNameItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:FigureViewmap"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.InterfaceAsCercle_nameLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <links
-          visualID="4001"
-          editPartClassName="UsageEditPart"
-          itemSemanticEditPolicyClassName="UsageItemSemanticEditPolicy"
-          createCommandClassName="UsageCreateCommand"
-          reorientCommandClassName="UsageReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Usage_4001"
-            editHelperClassName="UsageEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.edges.UsageLinkFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Usage"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.3">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>
-        </modelFacet>
-        <creationConstraints
-            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.7"
-            targetEnd="/0/@expressionProviders/@providers.0/@expressions.6"/>
-      </links>
-      <links
-          visualID="4006"
-          editPartClassName="InterfaceRealizationEditPart"
-          itemSemanticEditPolicyClassName="InterfaceRealizationItemSemanticEditPolicy"
-          createCommandClassName="InterfaceRealizationCreateCommand"
-          reorientCommandClassName="InterfaceRealizationReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.InterfaceRealization_4006"
-            editHelperClassName="InterfaceRealizationEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.edges.InterfaceRealizationLinkFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InterfaceRealization"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.4">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InterfaceRealization/contract"/>
-        </modelFacet>
-        <creationConstraints
-            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.7"
-            targetEnd="/0/@expressionProviders/@providers.0/@expressions.6"/>
-      </links>
-      <links
-          visualID="4003"
-          editPartClassName="GeneralizationEditPart"
-          itemSemanticEditPolicyClassName="GeneralizationItemSemanticEditPolicy"
-          createCommandClassName="GeneralizationCreateCommand"
-          reorientCommandClassName="GeneralizationReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Generalization_4003"
-            editHelperClassName="GeneralizationEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.GeneralizationFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/generalization"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/generalization"/>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization/specific"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization/general"/>
-        </modelFacet>
-        <labels
-            visualID="2"
-            editPartClassName="GeneralizationAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="GeneralizationAppliedStereotypeItemSemanticEditPolicy"
-            readOnly="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.2"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization/isSubstitutable"/>
-          </modelFacet>
-        </labels>
-      </links>
-      <links
-          visualID="4012"
-          editPartClassName="SubstitutionEditPart"
-          itemSemanticEditPolicyClassName="SubstitutionItemSemanticEditPolicy"
-          createCommandClassName="SubstitutionCreateCommand"
-          reorientCommandClassName="SubstitutionReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Substitution_4012"
-            displayName="Substitution"
-            editHelperClassName="SubstitutionEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeSubstitutionLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Substitution"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>
-        </modelFacet>
-        <labels
-            visualID="6006"
-            editPartClassName="SubstitutionNameEditPart"
-            itemSemanticEditPolicyClassName="SubstitutionNameItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6020"
-            editPartClassName="SubstitutionAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="SubstitutionAppliedStereotypeItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="30"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.2"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </links>
-      <links
-          visualID="4014"
-          editPartClassName="ManifestationEditPart"
-          itemSemanticEditPolicyClassName="ManifestationItemSemanticEditPolicy"
-          createCommandClassName="ManifestationCreateCommand"
-          reorientCommandClassName="ManifestationReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Manifestation_4014"
-            displayName="Manifestation"
-            editHelperClassName="ManifestationEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeManifestationLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Manifestation"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>
-        </modelFacet>
-        <labels
-            visualID="6008"
-            editPartClassName="ManifestationNameEditPart"
-            itemSemanticEditPolicyClassName="ManifestationNameItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6022"
-            editPartClassName="ManifestationAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="ManifestationAppliedStereotypeItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="30"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.2"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </links>
-      <links
-          visualID="4007"
-          editPartClassName="ComponentRealizationEditPart"
-          itemSemanticEditPolicyClassName="ComponentRealizationItemSemanticEditPolicy"
-          createCommandClassName="ComponentRealizationCreateCommand"
-          reorientCommandClassName="ComponentRealizationReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="ComponentRealizationEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ComponentRealization"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>
-        </modelFacet>
-        <labels
-            visualID="3"
-            editPartClassName="ComponentRealizationNameEditPart"
-            itemSemanticEditPolicyClassName="ComponentRealizationNameItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="4"
-            editPartClassName="ComponentRealizationAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="ComponentRealizationAppliedStereotypeItemSemanticEditPolicy"
-            readOnly="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="30"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.2"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </links>
-      <links
-          visualID="4013"
-          editPartClassName="AbstractionEditPart"
-          itemSemanticEditPolicyClassName="AbstractionItemSemanticEditPolicy"
-          createCommandClassName="AbstractionCreateCommand"
-          reorientCommandClassName="AbstractionReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Abstraction_4013"
-            displayName="Abstraction"
-            editHelperClassName="AbstractionEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeAbstractionLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Abstraction"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>
-        </modelFacet>
-        <labels
-            visualID="6007"
-            editPartClassName="AbstractionNameEditPart"
-            itemSemanticEditPolicyClassName="AbstractionNameItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6021"
-            editPartClassName="AbstractionAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="AbstractionAppliedStereotypeItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="30"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.2"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </links>
-      <links
-          visualID="4016"
-          editPartClassName="LinkDescriptorEditPart"
-          itemSemanticEditPolicyClassName="LinkDescriptorItemSemanticEditPolicy"
-          createCommandClassName="LinkDescriptorCreateCommand"
-          reorientCommandClassName="LinkDescriptorReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:NotationType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-      </links>
-      <links
-          visualID="4015"
-          editPartClassName="CommentAnnotatedElementEditPart"
-          itemSemanticEditPolicyClassName="CommentAnnotatedElementItemSemanticEditPolicy"
-          createCommandClassName="CommentAnnotatedElementCreateCommand"
-          reorientCommandClassName="CommentAnnotatedElementReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.CommentAnnotatedElement_4008"
-            displayName="CommentAnnotatedElement"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:FeatureLinkModelFacet">
-          <metaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/annotatedElement"/>
-        </modelFacet>
-      </links>
-      <links
-          visualID="4009"
-          editPartClassName="ConstraintConstrainedElementEditPart"
-          itemSemanticEditPolicyClassName="ConstraintConstrainedElementItemSemanticEditPolicy"
-          createCommandClassName="ConstraintConstrainedElementCreateCommand"
-          reorientCommandClassName="ConstraintConstrainedElementReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.ConstraintConstrainedElement_4009"
-            displayName="ConstraintConstrainedElement"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:FeatureLinkModelFacet">
-          <metaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/constrainedElement"/>
-        </modelFacet>
-      </links>
-      <links
-          visualID="4010"
-          editPartClassName="DependencyEditPart"
-          itemSemanticEditPolicyClassName="DependencyItemSemanticEditPolicy"
-          createCommandClassName="DependencyCreateCommand"
-          reorientCommandClassName="DependencyReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            displayName="DependencyLink"
-            metamodelType="/0/@diagram/@topLevelNodes.0/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>
-        </modelFacet>
-        <labels
-            visualID="6009"
-            editPartClassName="DependencyNameEditPart"
-            itemSemanticEditPolicyClassName="DependencyNameItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6023"
-            editPartClassName="DependencyAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="DependencyAppliedStereotypeItemSemanticEditPolicy"
-            readOnly="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.2"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </links>
-      <links
-          visualID="4017"
-          editPartClassName="DependencyBranchEditPart"
-          itemSemanticEditPolicyClassName="DependencyBranchItemSemanticEditPolicy"
-          createCommandClassName="DependencyBranchCreateCommand"
-          reorientCommandClassName="DependencyBranchReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Dependency_4017"
-            metamodelType="/0/@diagram/@topLevelNodes.0/@elementType"
-            editHelperAdviceClassName="DependencyBranchLink"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>
-        </modelFacet>
-      </links>
-      <links
-          visualID="4018"
-          editPartClassName="InterfacePortLinkEditPart"
-          itemSemanticEditPolicyClassName="InterfacePortLinkItemSemanticEditPolicy"
-          outgoingCreationAllowed="false"
-          createCommandClassName="InterfacePortLinkCreateCommand"
-          reorientCommandClassName="InterfacePortLinkReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:NotationType"
-            displayName="InterfacePortLink"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx"/>
-      </links>
-      <links
-          visualID="4019"
-          editPartClassName="ConnectorEditPart">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.edges.ConnectorFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedConnector"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector/end"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector/end"/>
-        </modelFacet>
-        <labels
-            visualID="6024"
-            editPartClassName="ConnectorAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="ConnectorAppliedStereotypeItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.2"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6025">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="-20"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </links>
-      <compartments
-          visualID="7001"
-          editPartClassName="ComponentCompositeCompartmentEditPart"
-          itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.4 /0/@diagram/@childNodes.12"
-          title="packaged elements"
-          hideIfEmpty="false"
-          node="/0/@diagram/@topLevelNodes.1"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7006"
-          editPartClassName="ModelPackageableElementCompartmentEditPart"
-          itemSemanticEditPolicyClassName="ModelPackageableElementCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ModelPackageableElementCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.11"
-          title="packaged elements"
-          canCollapse="false"
-          node="/0/@diagram/@topLevelNodes.2"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getPackageableElementFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7002"
-          editPartClassName="PackagePackageableElementCompartmentEditPart"
-          itemSemanticEditPolicyClassName="PackagePackageableElementCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="PackagePackageableElementCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.11"
-          title="packaged elements"
-          canCollapse="false"
-          node="/0/@diagram/@topLevelNodes.3"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getPackageableElementFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7007"
-          editPartClassName="ModelPackageableElementCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="ModelPackageableElementCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="ModelPackageableElementCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.11"
-          title="packaged elements"
-          canCollapse="false"
-          node="/0/@diagram/@childNodes.1"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getPackageableElementFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7005"
-          editPartClassName="PackagePackageableElementCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="PackagePackageableElementCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="PackagePackageableElementCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.11"
-          title="packaged elements"
-          canCollapse="false"
-          node="/0/@diagram/@childNodes.2"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getPackageableElementFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7003"
-          editPartClassName="ComponentCompositeCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.4 /0/@diagram/@childNodes.12"
-          title="packaged elements"
-          hideIfEmpty="false"
-          node="/0/@diagram/@childNodes.4"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7004"
-          editPartClassName="ComponentCompositeCompartmentEditPartPCN"
-          itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicyPCN"
-          canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicyPCN"
-          childNodes="/0/@diagram/@childNodes.4 /0/@diagram/@childNodes.12"
-          title="packaged elements"
-          hideIfEmpty="false"
-          node="/0/@diagram/@childNodes.5"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7008"
-          editPartClassName="InterfaceAttributeCompartmentEditPart"
-          itemSemanticEditPolicyClassName="InterfaceAttributeCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="InterfaceAttributeCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.8"
-          title="attributes"
-          node="/0/@diagram/@topLevelNodes.4">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getAttributeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7009"
-          editPartClassName="InterfaceOperationCompartmentEditPart"
-          itemSemanticEditPolicyClassName="InterfaceOperationCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="InterfaceOperationCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10"
-          title="operations"
-          node="/0/@diagram/@topLevelNodes.4">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getOperationCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7010"
-          editPartClassName="InterfaceAttributeCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="InterfaceAttributeCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="InterfaceAttributeCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.8"
-          title="attributes"
-          node="/0/@diagram/@childNodes.3">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getAttributeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7011"
-          editPartClassName="InterfaceOperationCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="InterfaceOperationCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="InterfaceOperationCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10"
-          title="operations"
-          node="/0/@diagram/@childNodes.3">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getOperationCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <palette>
-        <groups
-            title="Nodes"
-            description="Diagram Nodes"
-            largeIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-            smallIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-            createMethodName="createNodesGroup"
-            id="&quot;component.group.nodes&quot;"
-            stack="true"
-            collapse="true">
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Constraint"
-              description="Create a Constraint"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
-              createMethodName="createConstraintCreationTool"
-              id="&quot;component.tool.constraint&quot;"
-              genNodes="/0/@diagram/@topLevelNodes.6 /0/@diagram/@childNodes.7"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Comment"
-              description="Create a Comment"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
-              createMethodName="createCommentCreationTool"
-              id="&quot;component.tool.comment&quot;"
-              qualifiedToolName=""
-              genNodes="/0/@diagram/@topLevelNodes.5 /0/@diagram/@childNodes.6"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Component"
-              description="Create a Component"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif"
-              createMethodName="createComponentCreationTool"
-              id="&quot;component.tool.component&quot;"
-              genNodes="/0/@diagram/@topLevelNodes.1 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Interface"
-              description="Create an Interface"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"
-              createMethodName="createRectancleInterfaceCreationTool"
-              id="&quot;component.tool.interface&quot;"
-              genNodes="/0/@diagram/@topLevelNodes.4 /0/@diagram/@childNodes.3"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Model"
-              description="Create a model"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif"
-              createMethodName="createModelCreationTool"
-              id="&quot;component.tool.model&quot;"
-              genNodes="/0/@diagram/@childNodes.1 /0/@diagram/@topLevelNodes.2"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Property"
-              description="Create a Property"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
-              createMethodName="createPropertyCreationTool"
-              id="&quot;component.tool.property&quot;"
-              genNodes="/0/@diagram/@childNodes.8 /0/@diagram/@childNodes.12"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Operation"
-              description="Create an Operation"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"
-              createMethodName="createOperationCreationTool"
-              id="&quot;component.tool.operation&quot;"
-              qualifiedToolName=""
-              genNodes="/0/@diagram/@childNodes.9"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Package"
-              description="Create a Package"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
-              createMethodName="createPackageCreationTool"
-              id="&quot;component.tool.package&quot;"
-              genNodes="/0/@diagram/@topLevelNodes.3 /0/@diagram/@childNodes.2"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Port"
-              description="Create a Port"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
-              createMethodName="createPortCreationTool"
-              id="&quot;component.tool.port&quot;"
-              genNodes="/0/@diagram/@childNodes.0"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Reception"
-              description="Create a Reception"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif"
-              createMethodName="createReceptionCreationTool"
-              id="&quot;component.tool.reception&quot;"
-              genNodes="/0/@diagram/@childNodes.10"/>
-        </groups>
-        <groups
-            title="Links"
-            description="Diagram Links"
-            largeIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-            smallIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-            createMethodName="createLinksGroup"
-            id="&quot;component.group.links&quot;"
-            stack="true"
-            collapse="true">
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Link"
-              description="Create a Link (Comment / Constraint)"
-              largeIconPath="icons/obj16/Link.gif"
-              smallIconPath="icons/obj16/Link.gif"
-              createMethodName="createLinkCreationTool"
-              id="&quot;component.tool.link&quot;"
-              genLinks="/0/@diagram/@links.8 /0/@diagram/@links.9"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Connector"
-              description="Create new Connector"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"
-              createMethodName="createConnectorCreationTool"
-              id="&quot;component.tool.connector&quot;"
-              genLinks="/0/@diagram/@links.13"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Dependency"
-              description="Create a Dependency"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
-              createMethodName="createDependencyCreationTool"
-              id="&quot;component.tool.dependency&quot;"
-              genLinks="/0/@diagram/@links.10"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="DependencyBranch"
-              description="Create a dependency branch"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
-              createMethodName="createDependencyBranchCreationTool"
-              id="&quot;component.tool.dependencybranch&quot;"
-              genLinks="/0/@diagram/@links.11"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Abstraction"
-              description="Create an Abstraction"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"
-              createMethodName="createAbstractionCreationTool"
-              id="&quot;component.tool.abstraction&quot;"
-              genLinks="/0/@diagram/@links.6"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Manifestation"
-              description="Create a Manifestation"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif"
-              createMethodName="createManifestationCreationTool"
-              id="&quot;component.tool.manifestation&quot;"
-              genLinks="/0/@diagram/@links.4"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Generalization"
-              description="Create a Generalization link"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"
-              createMethodName="createGeneralizationCreationTool"
-              id="&quot;component.tool.generalization&quot;"
-              genLinks="/0/@diagram/@links.2"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Usage"
-              description="Create an Usage"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"
-              createMethodName="createUsageCreationTool"
-              id="&quot;component.tool.usage&quot;"
-              genLinks="/0/@diagram/@links.0"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Substitution"
-              description="Create a Substitution"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"
-              createMethodName="createSubstitutionCreationTool"
-              id="&quot;component.tool.substitution&quot;"
-              genLinks="/0/@diagram/@links.3"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Interface Realization"
-              description="Create an Interface Realization"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif"
-              createMethodName="createInterfaceRealizationCreationTool"
-              id="&quot;component.tool.interfaceRealization&quot;"
-              genLinks="/0/@diagram/@links.1"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Component Realization"
-              description="Create a Component Realization"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ComponentRealization.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ComponentRealization.gif"
-              createMethodName="createComponentRealizationCreationTool"
-              id="&quot;component.tool.componentRealization&quot;"
-              genLinks="/0/@diagram/@links.5"/>
-        </groups>
-      </palette>
-      <preferencePages
-          xsi:type="gmfgen:GenStandardPreferencePage"
-          iD="org.eclipse.uml2.uml.diagram.general"
-          name="UML Diagram">
-        <children
-            xsi:type="gmfgen:GenStandardPreferencePage"
-            iD="org.eclipse.uml2.uml.diagram.appearance"
-            name="Appearance"
-            kind="Appearance"/>
-        <children
-            xsi:type="gmfgen:GenStandardPreferencePage"
-            iD="org.eclipse.uml2.uml.diagram.connections"
-            name="Connections"
-            kind="Connections"/>
-        <children
-            xsi:type="gmfgen:GenStandardPreferencePage"
-            iD="org.eclipse.uml2.uml.diagram.printing"
-            name="Printing"
-            kind="Printing"/>
-        <children
-            xsi:type="gmfgen:GenStandardPreferencePage"
-            iD="org.eclipse.uml2.uml.diagram.rulersAndGrid"
-            name="Rulers And Grid"
-            kind="RulersAndGrid"/>
-      </preferencePages>
-    </diagram>
-    <plugin
-        iD="org.eclipse.papyrus.uml.diagram.component"
-        name="Papyrus Component Diagram "
-        provider="Eclipse Modeling Project">
-      <requiredPlugins>org.eclipse.draw2d</requiredPlugins>
-      <requiredPlugins>org.eclipse.gmf.runtime.draw2d.ui</requiredPlugins>
-    </plugin>
-    <editor
-        iconPath="icons/obj16/ComponentDiagram.gif"/>
-    <diagramUpdater/>
-    <propertySheet>
-      <tabs
-          xsi:type="gmfgen:GenStandardPropertyTab"
-          iD="appearance"/>
-      <tabs
-          xsi:type="gmfgen:GenStandardPropertyTab"
-          iD="diagram"/>
-      <tabs
-          xsi:type="gmfgen:GenCustomPropertyTab"
-          iD="domain"
-          label="Core">
-        <filter
-            xsi:type="gmfgen:TypeTabFilter">
-          <types>org.eclipse.gmf.runtime.notation.View</types>
-          <types>org.eclipse.gef.EditPart</types>
-          <generatedTypes>abstractNavigatorItem</generatedTypes>
-        </filter>
-      </tabs>
-    </propertySheet>
-    <domainGenModel
-        href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#/"/>
-    <expressionProviders>
-      <providers
-          xsi:type="gmfgen:GenExpressionInterpreter">
-        <expressions
-            body="let base : String = 'Component' in&#xD;&#xA;let suffixes : Sequence(String) = Sequence {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'} in &#xD;&#xA;let space : Namespace = self.namespace in&#xD;&#xA;let allMissed : Sequence(String) = suffixes->&#xD;&#xA;    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))&#xD;&#xA;    ) in&#xD;&#xA;let firstMissed : String = allMissed->first() in &#xD;&#xA;let noMisses : Boolean = firstMissed.oclIsUndefined() in&#xD;&#xA;let allNames : Set(String) = &#xD;&#xA;    if noMisses &#xD;&#xA;    then &#xD;&#xA;    space.member->collect(e : NamedElement | &#xD;&#xA;         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) &lt;> base&#xD;&#xA;         then '' &#xD;&#xA;         else e.name &#xD;&#xA;         endif)->asSet()->excluding('') else Set{'not in use'} &#xD;&#xA;    endif in &#xD;&#xA;let longestName : String = &#xD;&#xA;    if noMisses&#xD;&#xA;    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() &#xD;&#xA;    else 'not in use' &#xD;&#xA;    endif in &#xD;&#xA;if noMisses then &#xD;&#xA;    if longestName.oclIsUndefined() &#xD;&#xA;    then base &#xD;&#xA;    else longestName.concat('1') &#xD;&#xA;    endif &#xD;&#xA;else &#xD;&#xA;    base.concat(firstMissed) &#xD;&#xA;endif "/>
-        <expressions
-            body="let base : String = 'Port' in&#xD;&#xA;let suffixes : Sequence(String) = Sequence {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'} in &#xD;&#xA;let space : Namespace = self.namespace in&#xD;&#xA;let allMissed : Sequence(String) = suffixes->&#xD;&#xA;    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))&#xD;&#xA;    ) in&#xD;&#xA;let firstMissed : String = allMissed->first() in &#xD;&#xA;let noMisses : Boolean = firstMissed.oclIsUndefined() in&#xD;&#xA;let allNames : Set(String) = &#xD;&#xA;    if noMisses &#xD;&#xA;    then &#xD;&#xA;    space.member->collect(e : NamedElement | &#xD;&#xA;         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) &lt;> base&#xD;&#xA;         then '' &#xD;&#xA;         else e.name &#xD;&#xA;         endif)->asSet()->excluding('') else Set{'not in use'} &#xD;&#xA;    endif in &#xD;&#xA;let longestName : String = &#xD;&#xA;    if noMisses&#xD;&#xA;    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() &#xD;&#xA;    else 'not in use' &#xD;&#xA;    endif in &#xD;&#xA;if noMisses then &#xD;&#xA;    if longestName.oclIsUndefined() &#xD;&#xA;    then base &#xD;&#xA;    else longestName.concat('1') &#xD;&#xA;    endif &#xD;&#xA;else &#xD;&#xA;    base.concat(firstMissed) &#xD;&#xA;endif "/>
-        <expressions
-            body="let base : String = 'Interface' in&#xD;&#xA;let suffixes : Sequence(String) = Sequence {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'} in &#xD;&#xA;let space : Namespace = self.namespace in&#xD;&#xA;let allMissed : Sequence(String) = suffixes->&#xD;&#xA;    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))&#xD;&#xA;    ) in&#xD;&#xA;let firstMissed : String = allMissed->first() in &#xD;&#xA;let noMisses : Boolean = firstMissed.oclIsUndefined() in&#xD;&#xA;let allNames : Set(String) = &#xD;&#xA;    if noMisses &#xD;&#xA;    then &#xD;&#xA;    space.member->collect(e : NamedElement | &#xD;&#xA;         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) &lt;> base&#xD;&#xA;         then '' &#xD;&#xA;         else e.name &#xD;&#xA;         endif)->asSet()->excluding('') else Set{'not in use'} &#xD;&#xA;    endif in &#xD;&#xA;let longestName : String = &#xD;&#xA;    if noMisses&#xD;&#xA;    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() &#xD;&#xA;    else 'not in use' &#xD;&#xA;    endif in &#xD;&#xA;if noMisses then &#xD;&#xA;    if longestName.oclIsUndefined() &#xD;&#xA;    then base &#xD;&#xA;    else longestName.concat('1') &#xD;&#xA;    endif &#xD;&#xA;else &#xD;&#xA;    base.concat(firstMissed) &#xD;&#xA;endif "/>
-        <expressions
-            body="let base : String = 'Usage' in&#xD;&#xA;let suffixes : Sequence(String) = Sequence {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'} in &#xD;&#xA;let space : Namespace = self.namespace in&#xD;&#xA;let allMissed : Sequence(String) = suffixes->&#xD;&#xA;    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))&#xD;&#xA;    ) in&#xD;&#xA;let firstMissed : String = allMissed->first() in &#xD;&#xA;let noMisses : Boolean = firstMissed.oclIsUndefined() in&#xD;&#xA;let allNames : Set(String) = &#xD;&#xA;    if noMisses &#xD;&#xA;    then &#xD;&#xA;    space.member->collect(e : NamedElement | &#xD;&#xA;         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) &lt;> base&#xD;&#xA;         then '' &#xD;&#xA;         else e.name &#xD;&#xA;         endif)->asSet()->excluding('') else Set{'not in use'} &#xD;&#xA;    endif in &#xD;&#xA;let longestName : String = &#xD;&#xA;    if noMisses&#xD;&#xA;    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() &#xD;&#xA;    else 'not in use' &#xD;&#xA;    endif in &#xD;&#xA;if noMisses then &#xD;&#xA;    if longestName.oclIsUndefined() &#xD;&#xA;    then base &#xD;&#xA;    else longestName.concat('1') &#xD;&#xA;    endif &#xD;&#xA;else &#xD;&#xA;    base.concat(firstMissed) &#xD;&#xA;endif "/>
-        <expressions
-            body="let base : String = 'Realization' in&#xD;&#xA;let suffixes : Sequence(String) = Sequence {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'} in &#xD;&#xA;let space : Namespace = self.namespace in&#xD;&#xA;let allMissed : Sequence(String) = suffixes->&#xD;&#xA;    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))&#xD;&#xA;    ) in&#xD;&#xA;let firstMissed : String = allMissed->first() in &#xD;&#xA;let noMisses : Boolean = firstMissed.oclIsUndefined() in&#xD;&#xA;let allNames : Set(String) = &#xD;&#xA;    if noMisses &#xD;&#xA;    then &#xD;&#xA;    space.member->collect(e : NamedElement | &#xD;&#xA;         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) &lt;> base&#xD;&#xA;         then '' &#xD;&#xA;         else e.name &#xD;&#xA;         endif)->asSet()->excluding('') else Set{'not in use'} &#xD;&#xA;    endif in &#xD;&#xA;let longestName : String = &#xD;&#xA;    if noMisses&#xD;&#xA;    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() &#xD;&#xA;    else 'not in use' &#xD;&#xA;    endif in &#xD;&#xA;if noMisses then &#xD;&#xA;    if longestName.oclIsUndefined() &#xD;&#xA;    then base &#xD;&#xA;    else longestName.concat('1') &#xD;&#xA;    endif &#xD;&#xA;else &#xD;&#xA;    base.concat(firstMissed) &#xD;&#xA;endif "/>
-        <expressions
-            body="let base : String = 'Package' in&#xD;&#xA;let suffixes : Sequence(String) = Sequence {'', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'} in &#xD;&#xA;let space : Namespace = self.namespace in&#xD;&#xA;let allMissed : Sequence(String) = suffixes->&#xD;&#xA;    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))&#xD;&#xA;    ) in&#xD;&#xA;let firstMissed : String = allMissed->first() in &#xD;&#xA;let noMisses : Boolean = firstMissed.oclIsUndefined() in&#xD;&#xA;let allNames : Set(String) = &#xD;&#xA;    if noMisses &#xD;&#xA;    then &#xD;&#xA;    space.member->collect(e : NamedElement | &#xD;&#xA;         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) &lt;> base&#xD;&#xA;         then '' &#xD;&#xA;         else e.name &#xD;&#xA;         endif)->asSet()->excluding('') else Set{'not in use'} &#xD;&#xA;    endif in &#xD;&#xA;let longestName : String = &#xD;&#xA;    if noMisses&#xD;&#xA;    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() &#xD;&#xA;    else 'not in use' &#xD;&#xA;    endif in &#xD;&#xA;if noMisses then &#xD;&#xA;    if longestName.oclIsUndefined() &#xD;&#xA;    then base &#xD;&#xA;    else longestName.concat('1') &#xD;&#xA;    endif &#xD;&#xA;else &#xD;&#xA;    base.concat(firstMissed) &#xD;&#xA;endif "/>
-        <expressions
-            xsi:type="gmfgen:GenConstraint"
-            body="self.oclIsKindOf(uml::Interface)"/>
-        <expressions
-            xsi:type="gmfgen:GenConstraint"
-            body="self.oclIsKindOf(uml::Component) or self.oclIsKindOf(uml::Port)"/>
-        <expressions
-            body="self.name.concat('.file') "/>
-      </providers>
-      <providers
-          xsi:type="gmfgen:GenJavaExpressionProvider"
-          injectExpressionBody="true">
-        <expressions
-            body="return org.eclipse.papyrus.uml.tools.utils.NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());"/>
-        <expressions
-            body="// Constraint specification init&#xD;&#xA;org.eclipse.uml2.uml.LiteralString value = org.eclipse.uml2.uml.UMLFactory.eINSTANCE.createLiteralString();&#xD;&#xA;value.setValue(&quot;&quot;);&#xD;&#xA;return value;"/>
-        <expressions
-            body="// Comment body init&#xD;&#xA;return &quot;&quot;;"/>
-        <expressions
-            xsi:type="gmfgen:GenConstraint"
-            body="// Creation constraint for TopLevelNodes&#xD;&#xA;&#x9;if(! (getElementToEdit() instanceof org.eclipse.uml2.uml.Package)) {&#xD;&#xA;&#x9;&#x9;return false;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;return true;"/>
-      </providers>
-      <providers
-          xsi:type="gmfgen:GenLiteralExpressionProvider">
-        <expressions
-            body="org.eclipse.uml2.uml.AggregationKind.COMPOSITE_LITERAL"/>
-      </providers>
-    </expressionProviders>
-    <labelParsers
-        extensibleViaService="true">
-      <implementations
-          xsi:type="gmfgen:PredefinedParser"
-          uses="/0/@diagram/@childNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.0/@modelFacet /0/@diagram/@links.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.3/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.6/@labels.0/@modelFacet /0/@diagram/@childNodes.4/@labels.0/@modelFacet /0/@diagram/@childNodes.5/@labels.0/@modelFacet /0/@diagram/@childNodes.11/@labels.0/@modelFacet /0/@diagram/@childNodes.7/@labels.0/@modelFacet /0/@diagram/@links.6/@labels.0/@modelFacet /0/@diagram/@links.3/@labels.0/@modelFacet /0/@diagram/@links.5/@labels.0/@modelFacet /0/@diagram/@links.10/@labels.0/@modelFacet /0/@diagram/@childNodes.2/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.2/@labels.0/@modelFacet /0/@diagram/@childNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.7/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.0/@modelFacet /0/@diagram/@childNodes.8/@labelModelFacet /0/@diagram/@childNodes.9/@labelModelFacet /0/@diagram/@childNodes.10/@labelModelFacet /0/@diagram/@childNodes.3/@labels.0/@modelFacet /0/@diagram/@childNodes.12/@labels.0/@modelFacet /0/@diagram/@links.13/@labels.1/@modelFacet"/>
-      <implementations
-          xsi:type="gmfgen:CustomParser"
-          uses="/0/@diagram/@topLevelNodes.5/@labels.0/@modelFacet /0/@diagram/@childNodes.6/@labels.0/@modelFacet"
-          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.CommentParser"/>
-      <implementations
-          xsi:type="gmfgen:CustomParser"
-          uses="/0/@diagram/@links.2/@labels.0/@modelFacet /0/@diagram/@links.4/@labels.1/@modelFacet /0/@diagram/@links.6/@labels.1/@modelFacet /0/@diagram/@links.3/@labels.1/@modelFacet /0/@diagram/@links.5/@labels.1/@modelFacet /0/@diagram/@links.10/@labels.1/@modelFacet /0/@diagram/@childNodes.0/@labels.1/@modelFacet /0/@diagram/@links.13/@labels.0/@modelFacet"
-          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser"/>
-      <implementations
-          xsi:type="gmfgen:CustomParser"
-          uses="/0/@diagram/@topLevelNodes.6/@labels.1/@modelFacet /0/@diagram/@childNodes.7/@labels.1/@modelFacet"
-          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.ConstraintParser"/>
-    </labelParsers>
-    <contextMenus
-        context="/0/@diagram">
-      <items
-          xsi:type="gmfgen:LoadResourceAction"/>
-    </contextMenus>
-  </gmfgen:GenEditorGenerator>
-  <papyrusgmfgenextension:PapyrusExtensionRootNode
-      comment="Papyrus specific extension for GMFGen">
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:ExtendedGenView"
-        comment="Manage named element figure relying on Affixed Node"
-        genView="/0/@diagram/@childNodes.0"
-        name="EP_NamedElement_AFF_NODE"
-        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:ExtendedGenView"
-        comment="Label in charge to display applied stereotypes on links"
-        genView="/0/@diagram/@links.2 /0/@diagram/@links.3 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@links.13 /0/@diagram/@links.0 /0/@diagram/@links.1"
-        name="ExtendedUMLLinks"
-        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:ExtendedGenView"
-        comment="This manages graphical refresh when aggregation kind changes"
-        genView="/0/@diagram/@childNodes.12"
-        name="EP_ConnectableElement_As_Part_NODE"
-        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomPropertyPartEditPartCN"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:ExtendedGenView"
-        comment="Elements that inherits Composite"
-        genView="/0/@diagram/@topLevelNodes.1 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5"
-        name="Composite inheritance"
-        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:ExtendedGenView"
-        comment="adding to manange otherNamedElement"
-        genView="/0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram /0/@diagram/@topLevelNodes.4/@labels.0"
-        name="OtherNamedElementEditPart"
-        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:ExtendedGenView"
-        comment="Manages stereotype shown with External Label"
-        genView="/0/@diagram/@links.4/@labels.1"
-        name="EP_Stereotypes_EXT_NODE"
-        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:ExtendedGenView"
-        comment="Add super class to a Comment edit parts"
-        genView="/0/@diagram/@childNodes.6 /0/@diagram/@topLevelNodes.5"
-        name="EP_Comment_NODE"
-        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:ExtendedGenView"
-        comment="Add super class to a Constraint edit parts"
-        genView="/0/@diagram/@childNodes.7 /0/@diagram/@topLevelNodes.6"
-        name="EP_Constraint_NODE"
-        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:ExtendedGenView"
-        comment="add superclass for compartment"
-        genView="/0/@diagram/@compartments.7 /0/@diagram/@compartments.8"
-        name="ResizeableListCompartmentEditPart"
-        superOwnedEditPart="org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:ExtendedGenView"
-        comment="Extended Gen View For UML compartments child label nodes, like properties in classifier representation of class diagram"
-        genView="/0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9"
-        name="UMLCompartmentEditPart"
-        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:SpecificLocator"
-        comment="Affixed Port locator"
-        classpath="org.eclipse.papyrus.uml.diagram.component.custom.locators.PortPositionLocator"
-        genChildSideAffixedNode="/0/@diagram/@childNodes.0"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:SpecificLocatorExternalLabel"
-        comment="External node label locator"
-        classpath="org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator"
-        genExternalNodeLabel="/0/@diagram/@topLevelNodes.8/@labels.0 /0/@diagram/@childNodes.11/@labels.0 /0/@diagram/@childNodes.0/@labels.0 /0/@diagram/@topLevelNodes.0/@labels.0"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:GenNodeConstraint"
-        comment="Creation constraint for TopLevelNode in virtual canvas"
-        genNode="/0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6 /0/@diagram/@topLevelNodes.7"
-        genConstraint="/0/@expressionProviders/@providers.1/@expressions.3"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:AdditionalEditPartCandies"
-        comment="Indicate specific BaseEditHelper in place of generated EditHelper"
-        baseEditHelperPackage="org.eclipse.papyrus.uml.diagram.common.helper"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:EditPartUsingDeleteService"
-        comment="The delete service is used on every TopNode Childnode and Link"
-        name="Every TopNode ChildNode Link"
-        genView="/0/@diagram/@childNodes.0 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6 /0/@diagram/@links.0 /0/@diagram/@links.1 /0/@diagram/@links.2 /0/@diagram/@links.4 /0/@diagram/@links.6 /0/@diagram/@links.5 /0/@diagram/@links.8 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@childNodes.8 /0/@diagram/@links.13"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:EditPartUsingReorientService"
-        comment="Use the edit service for reorient command (All DirectedRelationship)"
-        name="DirectedRelationship"
-        genView="/0/@diagram/@links.2 /0/@diagram/@links.0 /0/@diagram/@links.1 /0/@diagram/@links.3 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@links.13"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:CompartmentTitleVisibilityPreference"
-        comment="Hidden Compartments Title"
-        visibleByDefault="false"
-        compartments="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.1 /0/@diagram/@compartments.3 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.0 /0/@diagram/@compartments.5 /0/@diagram/@compartments.6"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"
-        comment="Name"
-        role="Name"
-        linkLabels="/0/@diagram/@links.4/@labels.0 /0/@diagram/@links.5/@labels.0 /0/@diagram/@links.6/@labels.0 /0/@diagram/@links.10/@labels.0 /0/@diagram/@links.3/@labels.0"
-        externalNodeLabels="/0/@diagram/@topLevelNodes.8/@labels.0 /0/@diagram/@childNodes.11/@labels.0 /0/@diagram/@childNodes.0/@labels.0"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"
-        comment="Stereotype"
-        role="Stereotype"
-        linkLabels="/0/@diagram/@links.4/@labels.1 /0/@diagram/@links.2/@labels.0 /0/@diagram/@links.3/@labels.1 /0/@diagram/@links.5/@labels.1 /0/@diagram/@links.6/@labels.1 /0/@diagram/@links.10/@labels.1"
-        externalNodeLabels="/0/@diagram/@childNodes.0/@labels.1"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:SpecificDiagramUpdater"
-        comment="Property (Part) custom DiagramUpdater"
-        classpath="org.eclipse.papyrus.uml.diagram.component.custom.parts.PropertyDiagramUpdater"
-        genNode="/0/@diagram/@childNodes.12"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"
-        comment="Name (Connector)"
-        role="Name"
-        linkLabels="/0/@diagram/@links.13/@labels.1"
-        visibleByDefault="false"/>
-  </papyrusgmfgenextension:PapyrusExtensionRootNode>
-</xmi:XMI>
+<?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:gmfgen="http://www.eclipse.org/gmf/2009/GenModel"

+    xmlns:papyrusgmfgenextension="http://www.eclipse.org/papyrus/2009/papyrusgmfgenextension">

+  <gmfgen:GenEditorGenerator

+      packageNamePrefix="org.eclipse.papyrus.uml.diagram.component"

+      modelID="PapyrusUMLComponentDiagram"

+      domainFileExtension="PapyrusUMLComponent"

+      dynamicTemplates="true"

+      templateDirectory="/org.eclipse.papyrus.def/xtend/"

+      copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"

+      pluginDirectory="/org.eclipse.papyrus.uml.diagram.component/src">

+    <diagram

+        visualID="1000"

+        editPartClassName="ComponentDiagramEditPart"

+        itemSemanticEditPolicyClassName="ComponentDiagramItemSemanticEditPolicy"

+        canonicalEditPolicyClassName="ModelCanonicalEditPolicy"

+        iconProviderPriority="Low"

+        creationWizardIconPath="icons/obj16/ComponentDiagram.gif"

+        editingDomainID="org.eclipse.papyrus.uml.diagram.component.EditingDomain"

+        validationProviderPriority="Low"

+        validationEnabled="true"

+        validationDecorators="true"

+        liveValidationUIFeedback="true">

+      <diagramRunTimeClass

+          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Diagram"/>

+      <elementType

+          xsi:type="gmfgen:MetamodelType"

+          uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Model_1000"

+          displayName="ComponentDiagram"

+          editHelperClassName="ModelEditHelper"/>

+      <viewmap

+          xsi:type="gmfgen:FigureViewmap"

+          figureQualifiedClassName="org.eclipse.draw2d.FreeformLayer"/>

+      <behaviour

+          xsi:type="gmfgen:CustomBehaviour"

+          key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+          editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy"/>

+      <behaviour

+          xsi:type="gmfgen:CustomBehaviour"

+          key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+          editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      <domainDiagramElement

+          href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>

+      <childNodes

+          xsi:type="gmfgen:GenChildSideAffixedNode"

+          visualID="3069"

+          editPartClassName="PortEditPart"

+          itemSemanticEditPolicyClassName="PortItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="PortCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="PortGraphicalNodeEditPolicy"

+          createCommandClassName="PortCreateCommand"

+          containers="/0/@diagram/@topLevelNodes.1 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.12">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Port_3069"

+            editHelperClassName="PortEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.PortFigure">

+          <attributes

+              xsi:type="gmfgen:DefaultSizeAttributes"

+              width="20"

+              height="20"/>

+        </viewmap>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomPortItemSemanticEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.PortLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Port"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.1">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.2/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property/aggregation"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            xsi:type="gmfgen:GenExternalNodeLabel"

+            visualID="5006"

+            editPartClassName="PortNameEditPart"

+            itemSemanticEditPolicyClassName="PortNameItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:FigureViewmap"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <behaviour

+              xsi:type="gmfgen:CustomBehaviour"

+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPortLabelEditPolicy"/>

+          <behaviour

+              xsi:type="gmfgen:CustomBehaviour"

+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.LabelAlignmentEditPolicy.LABEL_ALIGNMENT_KEY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.LabelAlignmentEditPolicy"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            xsi:type="gmfgen:GenExternalNodeLabel"

+            visualID="5007"

+            editPartClassName="PortAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="PortAppliedStereotypeItemSemanticEditPolicy"

+            readOnly="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:FigureViewmap"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                x="25"

+                y="-10"/>

+          </viewmap>

+          <behaviour

+              xsi:type="gmfgen:CustomBehaviour"

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.2"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3077"

+          editPartClassName="ModelEditPartCN"

+          itemSemanticEditPolicyClassName="ModelItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="ModelCanonicalEditPolicyCN"

+          compartments="/0/@diagram/@compartments.3"

+          graphicalNodeEditPolicyClassName="ModelGraphicalNodeEditPolicyCN"

+          createCommandClassName="ModelCreateCommandCN"

+          containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.3 /0/@diagram/@compartments.1 /0/@diagram/@compartments.4">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Model_3077"

+            displayName="Model"

+            editHelperClassName="ModelEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure">

+          <attributes

+              xsi:type="gmfgen:DefaultSizeAttributes"

+              width="150"

+              height="150"/>

+        </viewmap>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;RESIZE_BORDER_ITEMS&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Model"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5264"

+            editPartClassName="ModelNameEditPartCN"

+            itemSemanticEditPolicyClassName="ModelNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3076"

+          editPartClassName="PackageEditPartCN"

+          itemSemanticEditPolicyClassName="PackageItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="PackageCanonicalEditPolicyCN"

+          compartments="/0/@diagram/@compartments.4"

+          graphicalNodeEditPolicyClassName="PackageGraphicalNodeEditPolicyCN"

+          createCommandClassName="PackageCreateCommandCN"

+          containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.3 /0/@diagram/@compartments.1">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Package_3076"

+            displayName="Package"

+            editHelperClassName="PackageEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure">

+          <attributes

+              xsi:type="gmfgen:DefaultSizeAttributes"

+              width="150"

+              height="150"/>

+        </viewmap>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;RESIZE_BORDER_ITEMS&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.5">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5261"

+            editPartClassName="PackageNameEditPartCN"

+            itemSemanticEditPolicyClassName="PackageNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3078"

+          editPartClassName="RectangleInterfaceEditPartCN"

+          compartments="/0/@diagram/@compartments.9 /0/@diagram/@compartments.10"

+          containers="/0/@diagram/@compartments.1 /0/@diagram/@compartments.2 /0/@diagram/@compartments.3 /0/@diagram/@compartments.4">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure">

+          <attributes

+              xsi:type="gmfgen:DefaultSizeAttributes"

+              width="100"

+              height="100"/>

+        </viewmap>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5267"

+            editPartClassName="RectangleInterfaceNameEditPartCN"

+            itemSemanticEditPolicyClassName="RectangleInterfaceNameItemSemanticEditPolicyCN">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3070"

+          editPartClassName="ComponentEditPartCN"

+          itemSemanticEditPolicyClassName="ComponentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="ComponentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.0"

+          compartments="/0/@diagram/@compartments.5"

+          graphicalNodeEditPolicyClassName="ComponentGraphicalNodeEditPolicyCN"

+          createCommandClassName="ComponentCreateCommandCN"

+          containers="/0/@diagram/@compartments.5 /0/@diagram/@compartments.6 /0/@diagram/@compartments.0">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Component_3070"

+            displayName="Component"

+            metamodelType="/0/@diagram/@topLevelNodes.1/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure">

+          <attributes

+              xsi:type="gmfgen:DefaultSizeAttributes"

+              width="150"

+              height="70"/>

+        </viewmap>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5256"

+            editPartClassName="ComponentNameEditPartCN"

+            itemSemanticEditPolicyClassName="ComponentNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}"

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3071"

+          editPartClassName="ComponentEditPartPCN"

+          itemSemanticEditPolicyClassName="ComponentItemSemanticEditPolicyPCN"

+          canonicalEditPolicyClassName="ComponentCanonicalEditPolicyPCN"

+          childNodes="/0/@diagram/@childNodes.0"

+          compartments="/0/@diagram/@compartments.6"

+          graphicalNodeEditPolicyClassName="ComponentGraphicalNodeEditPolicyPCN"

+          createCommandClassName="ComponentCreateCommandPCN"

+          containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.3 /0/@diagram/@compartments.1">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Component_3071"

+            displayName="Component"

+            metamodelType="/0/@diagram/@topLevelNodes.1/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure">

+          <attributes

+              xsi:type="gmfgen:DefaultSizeAttributes"

+              width="150"

+              height="70"/>

+        </viewmap>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5257"

+            editPartClassName="ComponentNameEditPartPCN"

+            itemSemanticEditPolicyClassName="ComponentNameItemSemanticEditPolicyPCN">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}"

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3074"

+          editPartClassName="CommentEditPartPCN"

+          itemSemanticEditPolicyClassName="CommentItemSemanticEditPolicyPCN"

+          canonicalEditPolicyClassName="CommentCanonicalEditPolicyPCN"

+          graphicalNodeEditPolicyClassName="CommentGraphicalNodeEditPolicyPCN"

+          createCommandClassName="CommentCreateCommandPCN"

+          containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.3 /0/@diagram/@compartments.1">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Comment_3074"

+            metamodelType="/0/@diagram/@topLevelNodes.5/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.2">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5258"

+            editPartClassName="CommentBodyEditPartPCN"

+            itemSemanticEditPolicyClassName="CommentBodyItemSemanticEditPolicyPCN">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getCornerBentFigure"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.1">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3075"

+          editPartClassName="ConstraintEditPartPCN"

+          itemSemanticEditPolicyClassName="ConstraintItemSemanticEditPolicyPCN"

+          canonicalEditPolicyClassName="ConstraintCanonicalEditPolicyPCN"

+          graphicalNodeEditPolicyClassName="ConstraintGraphicalNodeEditPolicyPCN"

+          createCommandClassName="ConstraintCreateCommandPCN"

+          containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.3 /0/@diagram/@compartments.1">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Constraint_3075"

+            metamodelType="/0/@diagram/@topLevelNodes.6/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.1">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5259"

+            editPartClassName="ConstraintNameEditPartPCN"

+            itemSemanticEditPolicyClassName="ConstraintNameItemSemanticEditPolicyPCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="5260"

+            editPartClassName="ConstraintSpecificationEditPartPCN"

+            itemSemanticEditPolicyClassName="ConstraintSpecificationItemSemanticEditPolicyPCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getConstraintFigure"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.3">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            <editableMetaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          xsi:type="gmfgen:GenChildLabelNode"

+          visualID="1"

+          editPartClassName="PropertyForInterfaceEditPart"

+          itemSemanticEditPolicyClassName="PropertyForInterfaceItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="PropertyForInterfaceCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="PropertyForInterfaceGraphicalNodeEditPolicy"

+          createCommandClassName="PropertyForInterfaceCreateCommand"

+          containers="/0/@diagram/@compartments.7 /0/@diagram/@compartments.9">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.AppliedStereotypePropertyDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface/ownedAttribute"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface/ownedAttribute"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labelModelFacet

+            xsi:type="gmfgen:FeatureLabelModelFacet"

+            parser="/0/@labelParsers/@implementations.0">

+          <metaFeatures

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+        </labelModelFacet>

+      </childNodes>

+      <childNodes

+          xsi:type="gmfgen:GenChildLabelNode"

+          visualID="5"

+          editPartClassName="OperationForInterfaceEditPart"

+          itemSemanticEditPolicyClassName="OperationForInterfaceItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="OperationForInterfaceCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="OperationForInterfaceGraphicalNodeEditPolicy"

+          createCommandClassName="OperationForInterfaceCreateCommand"

+          containers="/0/@diagram/@compartments.8 /0/@diagram/@compartments.10">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.AppliedStereotypePropertyDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Operation"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface/ownedOperation"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface/ownedOperation"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labelModelFacet

+            xsi:type="gmfgen:FeatureLabelModelFacet"

+            parser="/0/@labelParsers/@implementations.0">

+          <metaFeatures

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+        </labelModelFacet>

+      </childNodes>

+      <childNodes

+          xsi:type="gmfgen:GenChildLabelNode"

+          visualID="6"

+          editPartClassName="ReceptionInInterfaceEditPart"

+          itemSemanticEditPolicyClassName="ReceptionInInterfaceItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ReceptionInInterfaceCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="ReceptionInInterfaceGraphicalNodeEditPolicy"

+          createCommandClassName="ReceptionInInterfaceCreateCommand"

+          containers="/0/@diagram/@compartments.8 /0/@diagram/@compartments.10">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Reception"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface/ownedReception"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface/ownedReception"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labelModelFacet

+            xsi:type="gmfgen:FeatureLabelModelFacet"

+            parser="/0/@labelParsers/@implementations.0"

+            viewPattern="\u00ABSignal\u00BB {0}"

+            editorPattern="{0}"

+            editPattern="{0}">

+          <metaFeatures

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+        </labelModelFacet>

+      </childNodes>

+      <childNodes

+          visualID="3072"

+          editPartClassName="InterfaceEditPartPCN"

+          itemSemanticEditPolicyClassName="InterfaceItemSemanticEditPolicyPCN"

+          canonicalEditPolicyClassName="InterfaceCanonicalEditPolicyPCN"

+          graphicalNodeEditPolicyClassName="InterfaceGraphicalNodeEditPolicyPCN"

+          createCommandClassName="InterfaceCreateCommandPCN"

+          containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.3 /0/@diagram/@compartments.1">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Interface_3072"

+            displayName="Interface"

+            metamodelType="/0/@diagram/@topLevelNodes.8/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.LollipopInterfaceFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.2">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            xsi:type="gmfgen:GenExternalNodeLabel"

+            editPartClassName="InterfaceNameEditPartPCN"

+            itemSemanticEditPolicyClassName="InterfaceNameItemSemanticEditPolicyPCN">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:FigureViewmap"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.InterfaceAsCercle_nameLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3079"

+          editPartClassName="PropertyPartEditPartCN"

+          childNodes="/0/@diagram/@childNodes.0"

+          containers="/0/@diagram/@compartments.0 /0/@diagram/@compartments.5 /0/@diagram/@compartments.6">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.PropertyPartFigure">

+          <attributes

+              xsi:type="gmfgen:DefaultSizeAttributes"

+              width="150"

+              height="70"/>

+        </viewmap>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.itemsemantic.PropertyPartItemSemanticEditPolicyCN"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.PropertyLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5268"

+            editPartClassName="PropertyPartNameEditPartCN"

+            itemSemanticEditPolicyClassName="PropertyPartNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <behaviour

+              xsi:type="gmfgen:CustomBehaviour"

+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPropertyLabelEditPolicy"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}"

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <topLevelNodes

+          visualID="3203"

+          editPartClassName="DependencyNodeEditPart"

+          itemSemanticEditPolicyClassName="DependencyNodeItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="DependencyNodeCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="DependencyNodeGraphicalNodeEditPolicy"

+          createCommandClassName="DependencyNodeCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.DependencyNode_3203"

+            displayName="DependencyNode"

+            editHelperClassName="DependencyEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.DependencyNodeFigure">

+          <attributes

+              xsi:type="gmfgen:DefaultSizeAttributes"

+              width="10"

+              height="10"/>

+        </viewmap>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+        </modelFacet>

+        <labels

+            xsi:type="gmfgen:GenExternalNodeLabel"

+            visualID="5008"

+            editPartClassName="MultiDependencyLabelEditPart"

+            itemSemanticEditPolicyClassName="MultiDependencyLabelItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:FigureViewmap"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2002"

+          editPartClassName="ComponentEditPart"

+          itemSemanticEditPolicyClassName="ComponentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ComponentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.0"

+          compartments="/0/@diagram/@compartments.0"

+          graphicalNodeEditPolicyClassName="ComponentGraphicalNodeEditPolicy"

+          createCommandClassName="ComponentCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Component_2002"

+            editHelperClassName="ComponentEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure">

+          <attributes

+              xsi:type="gmfgen:DefaultSizeAttributes"

+              width="150"

+              height="70"/>

+        </viewmap>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/ownedType"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5004"

+            editPartClassName="ComponentNameEditPart"

+            itemSemanticEditPolicyClassName="ComponentNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              editPattern="">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="3202"

+          editPartClassName="ModelEditPart"

+          itemSemanticEditPolicyClassName="ModelItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ModelCanonicalEditPolicy"

+          compartments="/0/@diagram/@compartments.1"

+          graphicalNodeEditPolicyClassName="ModelGraphicalNodeEditPolicy"

+          createCommandClassName="ModelCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Model_3202"

+            displayName="Model"

+            editHelperClassName="ModelEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure">

+          <attributes

+              xsi:type="gmfgen:DefaultSizeAttributes"

+              width="150"

+              height="150"/>

+        </viewmap>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;RESIZE_BORDER_ITEMS&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Model"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5262"

+            editPartClassName="ModelNameEditPart"

+            itemSemanticEditPolicyClassName="ModelNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="3200"

+          editPartClassName="PackageEditPart"

+          itemSemanticEditPolicyClassName="PackageItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="PackageCanonicalEditPolicy"

+          compartments="/0/@diagram/@compartments.2"

+          graphicalNodeEditPolicyClassName="PackageGraphicalNodeEditPolicy"

+          createCommandClassName="PackageCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Package_3200"

+            displayName="Package"

+            editHelperClassName="PackageEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure">

+          <attributes

+              xsi:type="gmfgen:DefaultSizeAttributes"

+              width="150"

+              height="150"/>

+        </viewmap>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;RESIZE_BORDER_ITEMS&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.5">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5254"

+            editPartClassName="PackageNameEditPart"

+            itemSemanticEditPolicyClassName="PackageNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="3205"

+          editPartClassName="RectangleInterfaceEditPart"

+          itemSemanticEditPolicyClassName="RectangleInterfaceItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="RectangleInterfaceCanonicalEditPolicy"

+          compartments="/0/@diagram/@compartments.7 /0/@diagram/@compartments.8"

+          graphicalNodeEditPolicyClassName="RectangleInterfaceGraphicalNodeEditPolicy"

+          createCommandClassName="RectangleInterfaceCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure">

+          <attributes

+              xsi:type="gmfgen:DefaultSizeAttributes"

+              width="100"

+              height="100"/>

+        </viewmap>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5266"

+            editPartClassName="RectangleInterfaceNameEditPart"

+            itemSemanticEditPolicyClassName="RectangleInterfaceNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="3201"

+          editPartClassName="CommentEditPart"

+          itemSemanticEditPolicyClassName="CommentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="CommentCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="CommentGraphicalNodeEditPolicy"

+          createCommandClassName="CommentCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Comment_3201"

+            displayName="Comment"

+            editHelperClassName="CommentEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.2">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5255"

+            editPartClassName="CommentBodyEditPart"

+            itemSemanticEditPolicyClassName="CommentBodyItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getCornerBentFigure"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.1">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="3199"

+          editPartClassName="ConstraintEditPart"

+          itemSemanticEditPolicyClassName="ConstraintItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ConstraintCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="ConstraintGraphicalNodeEditPolicy"

+          createCommandClassName="ConstraintCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Comment_3199"

+            displayName="Constraint"

+            editHelperClassName="ConstraintEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.1">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5252"

+            editPartClassName="ConstraintNameEditPart"

+            itemSemanticEditPolicyClassName="ConstraintNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="5253"

+            editPartClassName="ConstraintSpecificationEditPart"

+            itemSemanticEditPolicyClassName="ConstraintSpecificationItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getConstraintFigure"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.3">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            <editableMetaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="3204"

+          editPartClassName="DefaultNamedElementEditPart"

+          itemSemanticEditPolicyClassName="DefaultNamedElementItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="DefaultNamedElementCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="DefaultNamedElementGraphicalNodeEditPolicy"

+          createCommandClassName="DefaultNamedElementCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.DefaultNamedElement_3204"

+            displayName="DefaultNamedElement"

+            editHelperClassName="DefaultNamedElementEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">

+          <attributes

+              xsi:type="gmfgen:DefaultSizeAttributes"

+              width="100"

+              height="50"/>

+        </viewmap>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy.CHANGE_SHAPE_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.ComponentDiagramChangeStereotypedShapeEditpolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.itemsemantic.CustomDefaultNamedElementItemSemanticEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+        </modelFacet>

+        <labels

+            visualID="5265"

+            editPartClassName="DefaultNamedElementNameEditPart"

+            itemSemanticEditPolicyClassName="DefaultNamedElementNameItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2003"

+          editPartClassName="InterfaceEditPart"

+          itemSemanticEditPolicyClassName="InterfaceItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="InterfaceCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="InterfaceGraphicalNodeEditPolicy"

+          createCommandClassName="InterfaceCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Interface_2003"

+            editHelperClassName="InterfaceEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.LollipopInterfaceFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/ownedType"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.2">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            xsi:type="gmfgen:GenExternalNodeLabel"

+            visualID="5005"

+            editPartClassName="InterfaceNameEditPart"

+            itemSemanticEditPolicyClassName="InterfaceNameItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:FigureViewmap"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.InterfaceAsCercle_nameLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <links

+          visualID="4001"

+          editPartClassName="UsageEditPart"

+          itemSemanticEditPolicyClassName="UsageItemSemanticEditPolicy"

+          createCommandClassName="UsageCreateCommand"

+          reorientCommandClassName="UsageReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Usage_4001"

+            editHelperClassName="UsageEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.edges.UsageLinkFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Usage"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.3">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

+        </modelFacet>

+        <creationConstraints

+            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.7"

+            targetEnd="/0/@expressionProviders/@providers.0/@expressions.6"/>

+      </links>

+      <links

+          visualID="4006"

+          editPartClassName="InterfaceRealizationEditPart"

+          itemSemanticEditPolicyClassName="InterfaceRealizationItemSemanticEditPolicy"

+          createCommandClassName="InterfaceRealizationCreateCommand"

+          reorientCommandClassName="InterfaceRealizationReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.InterfaceRealization_4006"

+            editHelperClassName="InterfaceRealizationEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.edges.InterfaceRealizationLinkFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InterfaceRealization"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.4">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InterfaceRealization/contract"/>

+        </modelFacet>

+        <creationConstraints

+            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.7"

+            targetEnd="/0/@expressionProviders/@providers.0/@expressions.6"/>

+      </links>

+      <links

+          visualID="4003"

+          editPartClassName="GeneralizationEditPart"

+          itemSemanticEditPolicyClassName="GeneralizationItemSemanticEditPolicy"

+          createCommandClassName="GeneralizationCreateCommand"

+          reorientCommandClassName="GeneralizationReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Generalization_4003"

+            editHelperClassName="GeneralizationEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.GeneralizationFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/generalization"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/generalization"/>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization/specific"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization/general"/>

+        </modelFacet>

+        <labels

+            visualID="2"

+            editPartClassName="GeneralizationAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="GeneralizationAppliedStereotypeItemSemanticEditPolicy"

+            readOnly="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.2"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization/isSubstitutable"/>

+          </modelFacet>

+        </labels>

+      </links>

+      <links

+          visualID="4012"

+          editPartClassName="SubstitutionEditPart"

+          itemSemanticEditPolicyClassName="SubstitutionItemSemanticEditPolicy"

+          createCommandClassName="SubstitutionCreateCommand"

+          reorientCommandClassName="SubstitutionReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Substitution_4012"

+            displayName="Substitution"

+            editHelperClassName="SubstitutionEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeSubstitutionLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Substitution"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

+        </modelFacet>

+        <labels

+            visualID="6006"

+            editPartClassName="SubstitutionNameEditPart"

+            itemSemanticEditPolicyClassName="SubstitutionNameItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6020"

+            editPartClassName="SubstitutionAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="SubstitutionAppliedStereotypeItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="30"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.2"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </links>

+      <links

+          visualID="4014"

+          editPartClassName="ManifestationEditPart"

+          itemSemanticEditPolicyClassName="ManifestationItemSemanticEditPolicy"

+          createCommandClassName="ManifestationCreateCommand"

+          reorientCommandClassName="ManifestationReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Manifestation_4014"

+            displayName="Manifestation"

+            editHelperClassName="ManifestationEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeManifestationLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Manifestation"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

+        </modelFacet>

+        <labels

+            visualID="6008"

+            editPartClassName="ManifestationNameEditPart"

+            itemSemanticEditPolicyClassName="ManifestationNameItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6022"

+            editPartClassName="ManifestationAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="ManifestationAppliedStereotypeItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="30"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.2"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </links>

+      <links

+          visualID="4007"

+          editPartClassName="ComponentRealizationEditPart"

+          itemSemanticEditPolicyClassName="ComponentRealizationItemSemanticEditPolicy"

+          createCommandClassName="ComponentRealizationCreateCommand"

+          reorientCommandClassName="ComponentRealizationReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="ComponentRealizationEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ComponentRealization"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

+        </modelFacet>

+        <labels

+            visualID="3"

+            editPartClassName="ComponentRealizationNameEditPart"

+            itemSemanticEditPolicyClassName="ComponentRealizationNameItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="4"

+            editPartClassName="ComponentRealizationAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="ComponentRealizationAppliedStereotypeItemSemanticEditPolicy"

+            readOnly="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="30"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.2"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </links>

+      <links

+          visualID="4013"

+          editPartClassName="AbstractionEditPart"

+          itemSemanticEditPolicyClassName="AbstractionItemSemanticEditPolicy"

+          createCommandClassName="AbstractionCreateCommand"

+          reorientCommandClassName="AbstractionReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Abstraction_4013"

+            displayName="Abstraction"

+            editHelperClassName="AbstractionEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeAbstractionLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Abstraction"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

+        </modelFacet>

+        <labels

+            visualID="6007"

+            editPartClassName="AbstractionNameEditPart"

+            itemSemanticEditPolicyClassName="AbstractionNameItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6021"

+            editPartClassName="AbstractionAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="AbstractionAppliedStereotypeItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="30"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.2"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </links>

+      <links

+          visualID="4016"

+          editPartClassName="LinkDescriptorEditPart"

+          itemSemanticEditPolicyClassName="LinkDescriptorItemSemanticEditPolicy"

+          createCommandClassName="LinkDescriptorCreateCommand"

+          reorientCommandClassName="LinkDescriptorReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:NotationType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+      </links>

+      <links

+          visualID="4015"

+          editPartClassName="CommentAnnotatedElementEditPart"

+          itemSemanticEditPolicyClassName="CommentAnnotatedElementItemSemanticEditPolicy"

+          createCommandClassName="CommentAnnotatedElementCreateCommand"

+          reorientCommandClassName="CommentAnnotatedElementReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.CommentAnnotatedElement_4008"

+            displayName="CommentAnnotatedElement"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:FeatureLinkModelFacet">

+          <metaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/annotatedElement"/>

+        </modelFacet>

+      </links>

+      <links

+          visualID="4009"

+          editPartClassName="ConstraintConstrainedElementEditPart"

+          itemSemanticEditPolicyClassName="ConstraintConstrainedElementItemSemanticEditPolicy"

+          createCommandClassName="ConstraintConstrainedElementCreateCommand"

+          reorientCommandClassName="ConstraintConstrainedElementReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.ConstraintConstrainedElement_4009"

+            displayName="ConstraintConstrainedElement"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:FeatureLinkModelFacet">

+          <metaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/constrainedElement"/>

+        </modelFacet>

+      </links>

+      <links

+          visualID="4010"

+          editPartClassName="DependencyEditPart"

+          itemSemanticEditPolicyClassName="DependencyItemSemanticEditPolicy"

+          createCommandClassName="DependencyCreateCommand"

+          reorientCommandClassName="DependencyReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            displayName="DependencyLink"

+            metamodelType="/0/@diagram/@topLevelNodes.0/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

+        </modelFacet>

+        <labels

+            visualID="6009"

+            editPartClassName="DependencyNameEditPart"

+            itemSemanticEditPolicyClassName="DependencyNameItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6023"

+            editPartClassName="DependencyAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="DependencyAppliedStereotypeItemSemanticEditPolicy"

+            readOnly="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.2"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </links>

+      <links

+          visualID="4017"

+          editPartClassName="DependencyBranchEditPart"

+          itemSemanticEditPolicyClassName="DependencyBranchItemSemanticEditPolicy"

+          createCommandClassName="DependencyBranchCreateCommand"

+          reorientCommandClassName="DependencyBranchReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Dependency_4017"

+            metamodelType="/0/@diagram/@topLevelNodes.0/@elementType"

+            editHelperAdviceClassName="DependencyBranchLink"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

+        </modelFacet>

+      </links>

+      <links

+          visualID="4018"

+          editPartClassName="InterfacePortLinkEditPart"

+          itemSemanticEditPolicyClassName="InterfacePortLinkItemSemanticEditPolicy"

+          outgoingCreationAllowed="false"

+          createCommandClassName="InterfacePortLinkCreateCommand"

+          reorientCommandClassName="InterfacePortLinkReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:NotationType"

+            displayName="InterfacePortLink"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx"/>

+      </links>

+      <links

+          visualID="4019"

+          editPartClassName="ConnectorEditPart">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.edges.ConnectorFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedConnector"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector/end"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector/end"/>

+        </modelFacet>

+        <labels

+            visualID="6024"

+            editPartClassName="ConnectorAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="ConnectorAppliedStereotypeItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.2"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6025">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="-20"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </links>

+      <compartments

+          visualID="7001"

+          editPartClassName="ComponentCompositeCompartmentEditPart"

+          itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.4 /0/@diagram/@childNodes.12"

+          title="packaged elements"

+          hideIfEmpty="false"

+          node="/0/@diagram/@topLevelNodes.1"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7006"

+          editPartClassName="ModelPackageableElementCompartmentEditPart"

+          itemSemanticEditPolicyClassName="ModelPackageableElementCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ModelPackageableElementCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.11"

+          title="packaged elements"

+          canCollapse="false"

+          node="/0/@diagram/@topLevelNodes.2"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getPackageableElementFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7002"

+          editPartClassName="PackagePackageableElementCompartmentEditPart"

+          itemSemanticEditPolicyClassName="PackagePackageableElementCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="PackagePackageableElementCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.11"

+          title="packaged elements"

+          canCollapse="false"

+          node="/0/@diagram/@topLevelNodes.3"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getPackageableElementFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7007"

+          editPartClassName="ModelPackageableElementCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="ModelPackageableElementCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="ModelPackageableElementCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.11"

+          title="packaged elements"

+          canCollapse="false"

+          node="/0/@diagram/@childNodes.1"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getPackageableElementFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7005"

+          editPartClassName="PackagePackageableElementCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="PackagePackageableElementCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="PackagePackageableElementCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.11"

+          title="packaged elements"

+          canCollapse="false"

+          node="/0/@diagram/@childNodes.2"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getPackageableElementFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7003"

+          editPartClassName="ComponentCompositeCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.4 /0/@diagram/@childNodes.12"

+          title="packaged elements"

+          hideIfEmpty="false"

+          node="/0/@diagram/@childNodes.4"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7004"

+          editPartClassName="ComponentCompositeCompartmentEditPartPCN"

+          itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicyPCN"

+          canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicyPCN"

+          childNodes="/0/@diagram/@childNodes.4 /0/@diagram/@childNodes.12"

+          title="packaged elements"

+          hideIfEmpty="false"

+          node="/0/@diagram/@childNodes.5"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7008"

+          editPartClassName="InterfaceAttributeCompartmentEditPart"

+          itemSemanticEditPolicyClassName="InterfaceAttributeCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="InterfaceAttributeCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.8"

+          title="attributes"

+          node="/0/@diagram/@topLevelNodes.4">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getAttributeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7009"

+          editPartClassName="InterfaceOperationCompartmentEditPart"

+          itemSemanticEditPolicyClassName="InterfaceOperationCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="InterfaceOperationCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10"

+          title="operations"

+          node="/0/@diagram/@topLevelNodes.4">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getOperationCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7010"

+          editPartClassName="InterfaceAttributeCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="InterfaceAttributeCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="InterfaceAttributeCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.8"

+          title="attributes"

+          node="/0/@diagram/@childNodes.3">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getAttributeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7011"

+          editPartClassName="InterfaceOperationCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="InterfaceOperationCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="InterfaceOperationCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10"

+          title="operations"

+          node="/0/@diagram/@childNodes.3">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getOperationCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      </compartments>

+      <palette>

+        <groups

+            title="Nodes"

+            description="Diagram Nodes"

+            largeIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+            smallIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+            createMethodName="createNodesGroup"

+            id="&quot;component.group.nodes&quot;"

+            stack="true"

+            collapse="true">

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Constraint"

+              description="Create a Constraint"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

+              createMethodName="createConstraintCreationTool"

+              id="&quot;component.tool.constraint&quot;"

+              genNodes="/0/@diagram/@topLevelNodes.6 /0/@diagram/@childNodes.7"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Comment"

+              description="Create a Comment"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

+              createMethodName="createCommentCreationTool"

+              id="&quot;component.tool.comment&quot;"

+              qualifiedToolName=""

+              genNodes="/0/@diagram/@topLevelNodes.5 /0/@diagram/@childNodes.6"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Component"

+              description="Create a Component"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif"

+              createMethodName="createComponentCreationTool"

+              id="&quot;component.tool.component&quot;"

+              genNodes="/0/@diagram/@topLevelNodes.1 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Interface"

+              description="Create an Interface"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"

+              createMethodName="createRectancleInterfaceCreationTool"

+              id="&quot;component.tool.interface&quot;"

+              genNodes="/0/@diagram/@topLevelNodes.4 /0/@diagram/@childNodes.3"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Model"

+              description="Create a model"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif"

+              createMethodName="createModelCreationTool"

+              id="&quot;component.tool.model&quot;"

+              genNodes="/0/@diagram/@childNodes.1 /0/@diagram/@topLevelNodes.2"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Property"

+              description="Create a Property"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"

+              createMethodName="createPropertyCreationTool"

+              id="&quot;component.tool.property&quot;"

+              genNodes="/0/@diagram/@childNodes.8 /0/@diagram/@childNodes.12"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Operation"

+              description="Create an Operation"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"

+              createMethodName="createOperationCreationTool"

+              id="&quot;component.tool.operation&quot;"

+              qualifiedToolName=""

+              genNodes="/0/@diagram/@childNodes.9"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Package"

+              description="Create a Package"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"

+              createMethodName="createPackageCreationTool"

+              id="&quot;component.tool.package&quot;"

+              genNodes="/0/@diagram/@topLevelNodes.3 /0/@diagram/@childNodes.2"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Port"

+              description="Create a Port"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"

+              createMethodName="createPortCreationTool"

+              id="&quot;component.tool.port&quot;"

+              genNodes="/0/@diagram/@childNodes.0"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Reception"

+              description="Create a Reception"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif"

+              createMethodName="createReceptionCreationTool"

+              id="&quot;component.tool.reception&quot;"

+              genNodes="/0/@diagram/@childNodes.10"/>

+        </groups>

+        <groups

+            title="Links"

+            description="Diagram Links"

+            largeIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+            smallIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+            createMethodName="createLinksGroup"

+            id="&quot;component.group.links&quot;"

+            stack="true"

+            collapse="true">

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Link"

+              description="Create a Link (Comment / Constraint)"

+              largeIconPath="icons/obj16/Link.gif"

+              smallIconPath="icons/obj16/Link.gif"

+              createMethodName="createLinkCreationTool"

+              id="&quot;component.tool.link&quot;"

+              genLinks="/0/@diagram/@links.8 /0/@diagram/@links.9"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Connector"

+              description="Create new Connector"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"

+              createMethodName="createConnectorCreationTool"

+              id="&quot;component.tool.connector&quot;"

+              genLinks="/0/@diagram/@links.13"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Dependency"

+              description="Create a Dependency"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

+              createMethodName="createDependencyCreationTool"

+              id="&quot;component.tool.dependency&quot;"

+              genLinks="/0/@diagram/@links.10"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="DependencyBranch"

+              description="Create a dependency branch"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

+              createMethodName="createDependencyBranchCreationTool"

+              id="&quot;component.tool.dependencybranch&quot;"

+              genLinks="/0/@diagram/@links.11"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Abstraction"

+              description="Create an Abstraction"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"

+              createMethodName="createAbstractionCreationTool"

+              id="&quot;component.tool.abstraction&quot;"

+              genLinks="/0/@diagram/@links.6"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Manifestation"

+              description="Create a Manifestation"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif"

+              createMethodName="createManifestationCreationTool"

+              id="&quot;component.tool.manifestation&quot;"

+              genLinks="/0/@diagram/@links.4"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Generalization"

+              description="Create a Generalization link"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"

+              createMethodName="createGeneralizationCreationTool"

+              id="&quot;component.tool.generalization&quot;"

+              genLinks="/0/@diagram/@links.2"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Usage"

+              description="Create an Usage"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"

+              createMethodName="createUsageCreationTool"

+              id="&quot;component.tool.usage&quot;"

+              genLinks="/0/@diagram/@links.0"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Substitution"

+              description="Create a Substitution"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"

+              createMethodName="createSubstitutionCreationTool"

+              id="&quot;component.tool.substitution&quot;"

+              genLinks="/0/@diagram/@links.3"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Interface Realization"

+              description="Create an Interface Realization"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif"

+              createMethodName="createInterfaceRealizationCreationTool"

+              id="&quot;component.tool.interfaceRealization&quot;"

+              genLinks="/0/@diagram/@links.1"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Component Realization"

+              description="Create a Component Realization"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ComponentRealization.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ComponentRealization.gif"

+              createMethodName="createComponentRealizationCreationTool"

+              id="&quot;component.tool.componentRealization&quot;"

+              genLinks="/0/@diagram/@links.5"/>

+        </groups>

+      </palette>

+      <preferencePages

+          xsi:type="gmfgen:GenStandardPreferencePage"

+          iD="org.eclipse.uml2.uml.diagram.general"

+          name="UML Diagram">

+        <children

+            xsi:type="gmfgen:GenStandardPreferencePage"

+            iD="org.eclipse.uml2.uml.diagram.appearance"

+            name="Appearance"

+            kind="Appearance"/>

+        <children

+            xsi:type="gmfgen:GenStandardPreferencePage"

+            iD="org.eclipse.uml2.uml.diagram.connections"

+            name="Connections"

+            kind="Connections"/>

+        <children

+            xsi:type="gmfgen:GenStandardPreferencePage"

+            iD="org.eclipse.uml2.uml.diagram.printing"

+            name="Printing"

+            kind="Printing"/>

+        <children

+            xsi:type="gmfgen:GenStandardPreferencePage"

+            iD="org.eclipse.uml2.uml.diagram.rulersAndGrid"

+            name="Rulers And Grid"

+            kind="RulersAndGrid"/>

+      </preferencePages>

+    </diagram>

+    <plugin

+        iD="org.eclipse.papyrus.uml.diagram.component"

+        name="Papyrus Component Diagram "

+        provider="Eclipse Modeling Project">

+      <requiredPlugins>org.eclipse.draw2d</requiredPlugins>

+      <requiredPlugins>org.eclipse.gmf.runtime.draw2d.ui</requiredPlugins>

+    </plugin>

+    <editor

+        iconPath="icons/obj16/ComponentDiagram.gif"/>

+    <diagramUpdater/>

+    <propertySheet>

+      <tabs

+          xsi:type="gmfgen:GenStandardPropertyTab"

+          iD="appearance"/>

+      <tabs

+          xsi:type="gmfgen:GenStandardPropertyTab"

+          iD="diagram"/>

+      <tabs

+          xsi:type="gmfgen:GenCustomPropertyTab"

+          iD="domain"

+          label="Core">

+        <filter

+            xsi:type="gmfgen:TypeTabFilter">

+          <types>org.eclipse.gmf.runtime.notation.View</types>

+          <types>org.eclipse.gef.EditPart</types>

+          <generatedTypes>abstractNavigatorItem</generatedTypes>

+        </filter>

+      </tabs>

+    </propertySheet>

+    <domainGenModel

+        href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#/"/>

+    <expressionProviders>

+      <providers

+          xsi:type="gmfgen:GenExpressionInterpreter">

+        <expressions

+            body="let base : String = 'Component' in&#xD;&#xA;let suffixes : Sequence(String) = Sequence {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'} in &#xD;&#xA;let space : Namespace = self.namespace in&#xD;&#xA;let allMissed : Sequence(String) = suffixes->&#xD;&#xA;    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))&#xD;&#xA;    ) in&#xD;&#xA;let firstMissed : String = allMissed->first() in &#xD;&#xA;let noMisses : Boolean = firstMissed.oclIsUndefined() in&#xD;&#xA;let allNames : Set(String) = &#xD;&#xA;    if noMisses &#xD;&#xA;    then &#xD;&#xA;    space.member->collect(e : NamedElement | &#xD;&#xA;         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) &lt;> base&#xD;&#xA;         then '' &#xD;&#xA;         else e.name &#xD;&#xA;         endif)->asSet()->excluding('') else Set{'not in use'} &#xD;&#xA;    endif in &#xD;&#xA;let longestName : String = &#xD;&#xA;    if noMisses&#xD;&#xA;    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() &#xD;&#xA;    else 'not in use' &#xD;&#xA;    endif in &#xD;&#xA;if noMisses then &#xD;&#xA;    if longestName.oclIsUndefined() &#xD;&#xA;    then base &#xD;&#xA;    else longestName.concat('1') &#xD;&#xA;    endif &#xD;&#xA;else &#xD;&#xA;    base.concat(firstMissed) &#xD;&#xA;endif "/>

+        <expressions

+            body="let base : String = 'Port' in&#xD;&#xA;let suffixes : Sequence(String) = Sequence {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'} in &#xD;&#xA;let space : Namespace = self.namespace in&#xD;&#xA;let allMissed : Sequence(String) = suffixes->&#xD;&#xA;    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))&#xD;&#xA;    ) in&#xD;&#xA;let firstMissed : String = allMissed->first() in &#xD;&#xA;let noMisses : Boolean = firstMissed.oclIsUndefined() in&#xD;&#xA;let allNames : Set(String) = &#xD;&#xA;    if noMisses &#xD;&#xA;    then &#xD;&#xA;    space.member->collect(e : NamedElement | &#xD;&#xA;         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) &lt;> base&#xD;&#xA;         then '' &#xD;&#xA;         else e.name &#xD;&#xA;         endif)->asSet()->excluding('') else Set{'not in use'} &#xD;&#xA;    endif in &#xD;&#xA;let longestName : String = &#xD;&#xA;    if noMisses&#xD;&#xA;    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() &#xD;&#xA;    else 'not in use' &#xD;&#xA;    endif in &#xD;&#xA;if noMisses then &#xD;&#xA;    if longestName.oclIsUndefined() &#xD;&#xA;    then base &#xD;&#xA;    else longestName.concat('1') &#xD;&#xA;    endif &#xD;&#xA;else &#xD;&#xA;    base.concat(firstMissed) &#xD;&#xA;endif "/>

+        <expressions

+            body="let base : String = 'Interface' in&#xD;&#xA;let suffixes : Sequence(String) = Sequence {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'} in &#xD;&#xA;let space : Namespace = self.namespace in&#xD;&#xA;let allMissed : Sequence(String) = suffixes->&#xD;&#xA;    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))&#xD;&#xA;    ) in&#xD;&#xA;let firstMissed : String = allMissed->first() in &#xD;&#xA;let noMisses : Boolean = firstMissed.oclIsUndefined() in&#xD;&#xA;let allNames : Set(String) = &#xD;&#xA;    if noMisses &#xD;&#xA;    then &#xD;&#xA;    space.member->collect(e : NamedElement | &#xD;&#xA;         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) &lt;> base&#xD;&#xA;         then '' &#xD;&#xA;         else e.name &#xD;&#xA;         endif)->asSet()->excluding('') else Set{'not in use'} &#xD;&#xA;    endif in &#xD;&#xA;let longestName : String = &#xD;&#xA;    if noMisses&#xD;&#xA;    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() &#xD;&#xA;    else 'not in use' &#xD;&#xA;    endif in &#xD;&#xA;if noMisses then &#xD;&#xA;    if longestName.oclIsUndefined() &#xD;&#xA;    then base &#xD;&#xA;    else longestName.concat('1') &#xD;&#xA;    endif &#xD;&#xA;else &#xD;&#xA;    base.concat(firstMissed) &#xD;&#xA;endif "/>

+        <expressions

+            body="let base : String = 'Usage' in&#xD;&#xA;let suffixes : Sequence(String) = Sequence {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'} in &#xD;&#xA;let space : Namespace = self.namespace in&#xD;&#xA;let allMissed : Sequence(String) = suffixes->&#xD;&#xA;    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))&#xD;&#xA;    ) in&#xD;&#xA;let firstMissed : String = allMissed->first() in &#xD;&#xA;let noMisses : Boolean = firstMissed.oclIsUndefined() in&#xD;&#xA;let allNames : Set(String) = &#xD;&#xA;    if noMisses &#xD;&#xA;    then &#xD;&#xA;    space.member->collect(e : NamedElement | &#xD;&#xA;         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) &lt;> base&#xD;&#xA;         then '' &#xD;&#xA;         else e.name &#xD;&#xA;         endif)->asSet()->excluding('') else Set{'not in use'} &#xD;&#xA;    endif in &#xD;&#xA;let longestName : String = &#xD;&#xA;    if noMisses&#xD;&#xA;    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() &#xD;&#xA;    else 'not in use' &#xD;&#xA;    endif in &#xD;&#xA;if noMisses then &#xD;&#xA;    if longestName.oclIsUndefined() &#xD;&#xA;    then base &#xD;&#xA;    else longestName.concat('1') &#xD;&#xA;    endif &#xD;&#xA;else &#xD;&#xA;    base.concat(firstMissed) &#xD;&#xA;endif "/>

+        <expressions

+            body="let base : String = 'Realization' in&#xD;&#xA;let suffixes : Sequence(String) = Sequence {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'} in &#xD;&#xA;let space : Namespace = self.namespace in&#xD;&#xA;let allMissed : Sequence(String) = suffixes->&#xD;&#xA;    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))&#xD;&#xA;    ) in&#xD;&#xA;let firstMissed : String = allMissed->first() in &#xD;&#xA;let noMisses : Boolean = firstMissed.oclIsUndefined() in&#xD;&#xA;let allNames : Set(String) = &#xD;&#xA;    if noMisses &#xD;&#xA;    then &#xD;&#xA;    space.member->collect(e : NamedElement | &#xD;&#xA;         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) &lt;> base&#xD;&#xA;         then '' &#xD;&#xA;         else e.name &#xD;&#xA;         endif)->asSet()->excluding('') else Set{'not in use'} &#xD;&#xA;    endif in &#xD;&#xA;let longestName : String = &#xD;&#xA;    if noMisses&#xD;&#xA;    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() &#xD;&#xA;    else 'not in use' &#xD;&#xA;    endif in &#xD;&#xA;if noMisses then &#xD;&#xA;    if longestName.oclIsUndefined() &#xD;&#xA;    then base &#xD;&#xA;    else longestName.concat('1') &#xD;&#xA;    endif &#xD;&#xA;else &#xD;&#xA;    base.concat(firstMissed) &#xD;&#xA;endif "/>

+        <expressions

+            body="let base : String = 'Package' in&#xD;&#xA;let suffixes : Sequence(String) = Sequence {'', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'} in &#xD;&#xA;let space : Namespace = self.namespace in&#xD;&#xA;let allMissed : Sequence(String) = suffixes->&#xD;&#xA;    select(s : String | not space.member->exists(e : NamedElement | e.name = base.concat(s))&#xD;&#xA;    ) in&#xD;&#xA;let firstMissed : String = allMissed->first() in &#xD;&#xA;let noMisses : Boolean = firstMissed.oclIsUndefined() in&#xD;&#xA;let allNames : Set(String) = &#xD;&#xA;    if noMisses &#xD;&#xA;    then &#xD;&#xA;    space.member->collect(e : NamedElement | &#xD;&#xA;         if e = self or e.name.oclIsUndefined() or e.name.substring(1, e.name.size().min(base.size())) &lt;> base&#xD;&#xA;         then '' &#xD;&#xA;         else e.name &#xD;&#xA;         endif)->asSet()->excluding('') else Set{'not in use'} &#xD;&#xA;    endif in &#xD;&#xA;let longestName : String = &#xD;&#xA;    if noMisses&#xD;&#xA;    then allNames->select(n : String | not allNames->exists(nn : String | nn.size() > n.size()))->asSequence()->first() &#xD;&#xA;    else 'not in use' &#xD;&#xA;    endif in &#xD;&#xA;if noMisses then &#xD;&#xA;    if longestName.oclIsUndefined() &#xD;&#xA;    then base &#xD;&#xA;    else longestName.concat('1') &#xD;&#xA;    endif &#xD;&#xA;else &#xD;&#xA;    base.concat(firstMissed) &#xD;&#xA;endif "/>

+        <expressions

+            xsi:type="gmfgen:GenConstraint"

+            body="self.oclIsKindOf(uml::Interface)"/>

+        <expressions

+            xsi:type="gmfgen:GenConstraint"

+            body="self.oclIsKindOf(uml::Component) or self.oclIsKindOf(uml::Port)"/>

+        <expressions

+            body="self.name.concat('.file') "/>

+      </providers>

+      <providers

+          xsi:type="gmfgen:GenJavaExpressionProvider"

+          injectExpressionBody="true">

+        <expressions

+            body="return org.eclipse.papyrus.uml.tools.utils.NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());"/>

+        <expressions

+            body="// Constraint specification init&#xD;&#xA;org.eclipse.uml2.uml.LiteralString value = org.eclipse.uml2.uml.UMLFactory.eINSTANCE.createLiteralString();&#xD;&#xA;value.setValue(&quot;&quot;);&#xD;&#xA;return value;"/>

+        <expressions

+            body="// Comment body init&#xD;&#xA;return &quot;&quot;;"/>

+        <expressions

+            xsi:type="gmfgen:GenConstraint"

+            body="// Creation constraint for TopLevelNodes&#xD;&#xA;&#x9;if(! (getElementToEdit() instanceof org.eclipse.uml2.uml.Package)) {&#xD;&#xA;&#x9;&#x9;return false;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;return true;"/>

+      </providers>

+      <providers

+          xsi:type="gmfgen:GenLiteralExpressionProvider">

+        <expressions

+            body="org.eclipse.uml2.uml.AggregationKind.COMPOSITE_LITERAL"/>

+      </providers>

+    </expressionProviders>

+    <labelParsers

+        extensibleViaService="true">

+      <implementations

+          xsi:type="gmfgen:PredefinedParser"

+          uses="/0/@diagram/@childNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.0/@modelFacet /0/@diagram/@links.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.3/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.6/@labels.0/@modelFacet /0/@diagram/@childNodes.4/@labels.0/@modelFacet /0/@diagram/@childNodes.5/@labels.0/@modelFacet /0/@diagram/@childNodes.11/@labels.0/@modelFacet /0/@diagram/@childNodes.7/@labels.0/@modelFacet /0/@diagram/@links.6/@labels.0/@modelFacet /0/@diagram/@links.3/@labels.0/@modelFacet /0/@diagram/@links.5/@labels.0/@modelFacet /0/@diagram/@links.10/@labels.0/@modelFacet /0/@diagram/@childNodes.2/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.2/@labels.0/@modelFacet /0/@diagram/@childNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.7/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.0/@modelFacet /0/@diagram/@childNodes.8/@labelModelFacet /0/@diagram/@childNodes.9/@labelModelFacet /0/@diagram/@childNodes.10/@labelModelFacet /0/@diagram/@childNodes.3/@labels.0/@modelFacet /0/@diagram/@childNodes.12/@labels.0/@modelFacet /0/@diagram/@links.13/@labels.1/@modelFacet"/>

+      <implementations

+          xsi:type="gmfgen:CustomParser"

+          uses="/0/@diagram/@topLevelNodes.5/@labels.0/@modelFacet /0/@diagram/@childNodes.6/@labels.0/@modelFacet"

+          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.CommentParser"/>

+      <implementations

+          xsi:type="gmfgen:CustomParser"

+          uses="/0/@diagram/@links.2/@labels.0/@modelFacet /0/@diagram/@links.4/@labels.1/@modelFacet /0/@diagram/@links.6/@labels.1/@modelFacet /0/@diagram/@links.3/@labels.1/@modelFacet /0/@diagram/@links.5/@labels.1/@modelFacet /0/@diagram/@links.10/@labels.1/@modelFacet /0/@diagram/@childNodes.0/@labels.1/@modelFacet /0/@diagram/@links.13/@labels.0/@modelFacet"

+          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser"/>

+      <implementations

+          xsi:type="gmfgen:CustomParser"

+          uses="/0/@diagram/@topLevelNodes.6/@labels.1/@modelFacet /0/@diagram/@childNodes.7/@labels.1/@modelFacet"

+          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.ConstraintParser"/>

+    </labelParsers>

+    <contextMenus

+        context="/0/@diagram">

+      <items

+          xsi:type="gmfgen:LoadResourceAction"/>

+    </contextMenus>

+  </gmfgen:GenEditorGenerator>

+  <papyrusgmfgenextension:PapyrusExtensionRootNode

+      comment="Papyrus specific extension for GMFGen">

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="Manage named element figure relying on Affixed Node"

+        genView="/0/@diagram/@childNodes.0"

+        name="EP_NamedElement_AFF_NODE"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="Label in charge to display applied stereotypes on links"

+        genView="/0/@diagram/@links.2 /0/@diagram/@links.3 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@links.13 /0/@diagram/@links.0 /0/@diagram/@links.1"

+        name="ExtendedUMLLinks"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="This manages graphical refresh when aggregation kind changes"

+        genView="/0/@diagram/@childNodes.12"

+        name="EP_ConnectableElement_As_Part_NODE"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomPropertyPartEditPartCN"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="Elements that inherits Composite"

+        genView="/0/@diagram/@topLevelNodes.1 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5"

+        name="Composite inheritance"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="adding to manange otherNamedElement"

+        genView="/0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram /0/@diagram/@topLevelNodes.4/@labels.0"

+        name="OtherNamedElementEditPart"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="Manages stereotype shown with External Label"

+        genView="/0/@diagram/@links.4/@labels.1"

+        name="EP_Stereotypes_EXT_NODE"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="Add super class to a Comment edit parts"

+        genView="/0/@diagram/@childNodes.6 /0/@diagram/@topLevelNodes.5"

+        name="EP_Comment_NODE"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="Add super class to a Constraint edit parts"

+        genView="/0/@diagram/@childNodes.7 /0/@diagram/@topLevelNodes.6"

+        name="EP_Constraint_NODE"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="add superclass for compartment"

+        genView="/0/@diagram/@compartments.7 /0/@diagram/@compartments.8"

+        name="ResizeableListCompartmentEditPart"

+        superOwnedEditPart="org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="Extended Gen View For UML compartments child label nodes, like properties in classifier representation of class diagram"

+        genView="/0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9"

+        name="UMLCompartmentEditPart"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:SpecificLocator"

+        comment="Affixed Port locator"

+        classpath="org.eclipse.papyrus.uml.diagram.component.custom.locators.PortPositionLocator"

+        genChildSideAffixedNode="/0/@diagram/@childNodes.0"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:SpecificLocatorExternalLabel"

+        comment="External node label locator"

+        classpath="org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator"

+        genExternalNodeLabel="/0/@diagram/@topLevelNodes.8/@labels.0 /0/@diagram/@childNodes.11/@labels.0 /0/@diagram/@childNodes.0/@labels.0 /0/@diagram/@topLevelNodes.0/@labels.0"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:GenNodeConstraint"

+        comment="Creation constraint for TopLevelNode in virtual canvas"

+        genNode="/0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6 /0/@diagram/@topLevelNodes.7"

+        genConstraint="/0/@expressionProviders/@providers.1/@expressions.3"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:AdditionalEditPartCandies"

+        comment="Indicate specific BaseEditHelper in place of generated EditHelper"

+        baseEditHelperPackage="org.eclipse.papyrus.uml.diagram.common.helper"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:EditPartUsingDeleteService"

+        comment="The delete service is used on every TopNode Childnode and Link"

+        name="Every TopNode ChildNode Link"

+        genView="/0/@diagram/@childNodes.0 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6 /0/@diagram/@links.0 /0/@diagram/@links.1 /0/@diagram/@links.2 /0/@diagram/@links.4 /0/@diagram/@links.6 /0/@diagram/@links.5 /0/@diagram/@links.8 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@childNodes.8 /0/@diagram/@links.13"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:EditPartUsingReorientService"

+        comment="Use the edit service for reorient command (All DirectedRelationship)"

+        name="DirectedRelationship"

+        genView="/0/@diagram/@links.2 /0/@diagram/@links.0 /0/@diagram/@links.1 /0/@diagram/@links.3 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@links.13"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:CompartmentTitleVisibilityPreference"

+        comment="Hidden Compartments Title"

+        visibleByDefault="false"

+        compartments="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.1 /0/@diagram/@compartments.3 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.0 /0/@diagram/@compartments.5 /0/@diagram/@compartments.6"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"

+        comment="Name"

+        role="Name"

+        linkLabels="/0/@diagram/@links.4/@labels.0 /0/@diagram/@links.5/@labels.0 /0/@diagram/@links.6/@labels.0 /0/@diagram/@links.10/@labels.0 /0/@diagram/@links.3/@labels.0"

+        externalNodeLabels="/0/@diagram/@topLevelNodes.8/@labels.0 /0/@diagram/@childNodes.11/@labels.0 /0/@diagram/@childNodes.0/@labels.0"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"

+        comment="Stereotype"

+        role="Stereotype"

+        linkLabels="/0/@diagram/@links.4/@labels.1 /0/@diagram/@links.2/@labels.0 /0/@diagram/@links.3/@labels.1 /0/@diagram/@links.5/@labels.1 /0/@diagram/@links.6/@labels.1 /0/@diagram/@links.10/@labels.1"

+        externalNodeLabels="/0/@diagram/@childNodes.0/@labels.1"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:SpecificDiagramUpdater"

+        comment="Property (Part) custom DiagramUpdater"

+        classpath="org.eclipse.papyrus.uml.diagram.component.custom.parts.PropertyDiagramUpdater"

+        genNode="/0/@diagram/@childNodes.12"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"

+        comment="Name (Connector)"

+        role="Name"

+        linkLabels="/0/@diagram/@links.13/@labels.1"

+        visibleByDefault="false"/>

+  </papyrusgmfgenextension:PapyrusExtensionRootNode>

+</xmi:XMI>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/pom.xml
index a70e7b38ea6..262ba36f3f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.component</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionAppliedStereotypeEditPart.java
index edb81e4f3b4..7a80a3e9e32 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionNameEditPart.java
index 0a386d996f3..6250daab339 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionNameEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
index 6333cf4dbac..4791b33e804 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationNameEditPart.java
index 22eddaa989a..d4652dc9ea6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationNameEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorAppliedStereotypeEditPart.java
index 8d4b9e2a860..f6449f4dac1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorNameEditPart.java
index cd9ac56ac5f..3aee3afac1c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorNameEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ConnectorNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class ConnectorNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyAppliedStereotypeEditPart.java
index 5d5913ea170..3e914941224 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNameEditPart.java
index 0dbe41f2a96..e862e2b798a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNameEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/GeneralizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/GeneralizationAppliedStereotypeEditPart.java
index 0a6051c69c2..98bce3cec46 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/GeneralizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/GeneralizationAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationAppliedStereotypeEditPart.java
index 091760d8eb1..461d354c18e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationNameEditPart.java
index e37f59068ec..ef4e38dafc6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationNameEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ManifestationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class ManifestationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortNameEditPart.java
index 2878b462a48..6faa3e9672c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortNameEditPart.java
@@ -62,6 +62,7 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.LabelAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

 import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

@@ -147,6 +148,7 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

 		installEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL, new IndirectPortLabelEditPolicy());

+		installEditPolicy(LabelAlignmentEditPolicy.LABEL_ALIGNMENT_KEY, new LabelAlignmentEditPolicy());

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionAppliedStereotypeEditPart.java
index c03a7013d43..ffaf6f9776a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionNameEditPart.java
index c32c8341e9b..602f06b7b59 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionNameEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
index 5256220d547..a0c85b6ffef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
@@ -39,27 +39,27 @@ Require-Bundle: org.eclipse.emf.ecore,
  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,

  org.eclipse.uml2.uml,

  org.eclipse.gmf.runtime.draw2d.ui,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.uml.tools.extendedtypes;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools.extendedtypes;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.emf.ecore.xmi,

  org.eclipse.emf.edit.ui,

  org.eclipse.draw2d;visibility:=reexport,

@@ -68,13 +68,13 @@ Require-Bundle: org.eclipse.emf.ecore,
  org.eclipse.emf.validation;visibility:=reexport,

  org.eclipse.gef,

  org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.synchronizeview;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.synchronizeview;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.composite.part.UMLDi

  agramEditorPlugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/parts/CustomEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/parts/CustomEditPartFactory.java
index 37cf8caa802..fb1d4631ecc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/parts/CustomEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/parts/CustomEditPartFactory.java
@@ -41,6 +41,8 @@ public class CustomEditPartFactory extends UMLEditPartFactory {
 				return new CustomConnectorMultiplicityTargetEditPart(view);
 			case ConstraintEditPartCN.VISUAL_ID:
 				return new CustomConstraintEditPartCN(view);
+			case CustomPortNameEditPart.VISUAL_ID:
+				return new CustomPortNameEditPart(view);
 
 			}
 		}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/parts/CustomPortNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/parts/CustomPortNameEditPart.java
new file mode 100644
index 00000000000..67e0cb99a88
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/parts/CustomPortNameEditPart.java
@@ -0,0 +1,49 @@
+package org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts;

+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 440224 : Label Alignment 

+ *

+ *****************************************************************************/

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortNameEditPart;

+

+public class CustomPortNameEditPart extends PortNameEditPart {

+

+	public CustomPortNameEditPart(View view) {

+		super(view);

+

+	}

+

+	

+	/**

+	 *Refresh Bounds of PortName EditPart in case of Move 

+	 */

+	@Override

+	public void refreshBounds() {

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		

+		// Update locator constraint

+		IBorderItemLocator locator = getBorderItemLocator();

+		locator.setConstraint(new Rectangle(x, y, width, height));

+

+		// Set new constraint on parent figure

+		getFigure().getParent().setConstraint(getFigure(), locator);

+

+	}

+

+

+}
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/ExternalLabelPrimaryDragRoleEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/ExternalLabelPrimaryDragRoleEditPolicy.java
index d59e453ca69..d6614eb8378 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/ExternalLabelPrimaryDragRoleEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/ExternalLabelPrimaryDragRoleEditPolicy.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2009-2011 CEA LIST.

+ * Copyright (c) 2009-2014 CEA LIST.

  *

  *

  * All rights reserved. This program and the accompanying materials

@@ -9,6 +9,7 @@
  *

  * Contributors:

  *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *  Celine Janssens (ALL4TEC) celine.janssens@all4tec.net - Manage BorderItemContainerFigure into the getMoveCommand

  *

  *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies;

@@ -27,6 +28,7 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableLabelEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.internal.figures.BorderItemContainerFigure;

 import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;

 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.View;

@@ -53,8 +55,14 @@ public class ExternalLabelPrimaryDragRoleEditPolicy extends NonResizableLabelEdi
 		// FeedBack - Port + Delta

 		Rectangle updatedRect = new Rectangle();

 		PrecisionRectangle initialRect = new PrecisionRectangle(getInitialFeedbackBounds().getCopy());

-		updatedRect = initialRect.getTranslated(getHostFigure().getParent().getBounds().getLocation().getNegated());

+		// in case of bordered item figure bounds is 1x1, real parent figure is then the grandParent

+		if (getHostFigure().getParent() instanceof BorderItemContainerFigure){

+			updatedRect = initialRect.getTranslated(getHostFigure().getParent().getParent().getBounds().getLocation().getNegated());

+		}else{

+			updatedRect = initialRect.getTranslated(getHostFigure().getParent().getBounds().getLocation().getNegated());

+		}

 		updatedRect = updatedRect.getTranslated(request.getMoveDelta());

+	

 

 		// translate the feedback figure

 		PrecisionRectangle rect = new PrecisionRectangle(getInitialFeedbackBounds().getCopy());

@@ -64,6 +72,11 @@ public class ExternalLabelPrimaryDragRoleEditPolicy extends NonResizableLabelEdi
 		getHostFigure().translateToRelative(rect);

 

 		ICommand moveCommand = new SetBoundsCommand(editPart.getEditingDomain(), DiagramUIMessages.MoveLabelCommand_Label_Location, new EObjectAdapter((View) editPart.getModel()), updatedRect);

+			

 		return new ICommandProxy(moveCommand);

+		

 	}

+

+

+	

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen
index 3fb7c5d2c39..d67d397170d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen
@@ -1,9307 +1,9311 @@
-<?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:gmfgen="http://www.eclipse.org/gmf/2009/GenModel"
-    xmlns:papyrusgmfgenextension="http://www.eclipse.org/papyrus/2009/papyrusgmfgenextension">
-  <gmfgen:GenEditorGenerator
-      packageNamePrefix="org.eclipse.papyrus.uml.diagram.composite"
-      modelID="CompositeStructure"
-      diagramFileExtension="uml_csd"
-      domainFileExtension="uml"
-      dynamicTemplates="true"
-      templateDirectory="/org.eclipse.papyrus.def/xtend/"
-      copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation">
-    <diagram
-        visualID="1000"
-        editPartClassName="CompositeStructureDiagramEditPart"
-        itemSemanticEditPolicyClassName="CompositeStructureDiagramItemSemanticEditPolicy"
-        canonicalEditPolicyClassName="CompositeStructureDiagramCanonicalEditPolicy"
-        iconProviderPriority="Low"
-        baseEditHelperClassName="UMLBaseEditHelper"
-        creationWizardIconPath="icons/obj16/Diagram_CompositeStructure.gif"
-        validationProviderPriority="Low"
-        validationEnabled="true"
-        validationDecorators="true"
-        liveValidationUIFeedback="true"
-        synchronized="false">
-      <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Diagram"/>
-      <elementType
-          xsi:type="gmfgen:MetamodelType"
-          displayName="CompositeStructureDiagram"
-          editHelperClassName="PackageEditHelper"/>
-      <viewmap
-          xsi:type="gmfgen:FigureViewmap"
-          figureQualifiedClassName="org.eclipse.draw2d.FreeformLayer"/>
-      <behaviour
-          xsi:type="gmfgen:CustomBehaviour"
-          key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-          editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-      <behaviour
-          xsi:type="gmfgen:CustomBehaviour"
-          key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-          editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      <domainDiagramElement
-          href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>
-      <childNodes
-          visualID="3121"
-          editPartClassName="BehaviorPortEditPart"
-          itemSemanticEditPolicyClassName="BehaviorPortItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="BehaviorPortCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="BehaviorPortGraphicalNodeEditPolicy"
-          createCommandClassName="BehaviorPortCreateCommand"
-          containers="/0/@diagram/@compartments.16">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:NotationType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusRoundedNodeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorSymbolEditPolicy.BEHAVIOR_SYMBOL"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorSymbolEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.NoConnectableEditPolicy"/>
-      </childNodes>
-      <childNodes
-          xsi:type="gmfgen:GenChildSideAffixedNode"
-          visualID="3069"
-          editPartClassName="PortEditPart"
-          itemSemanticEditPolicyClassName="PortItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="PortCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="PortGraphicalNodeEditPolicy"
-          createCommandClassName="PortCreateCommand"
-          containers="/0/@diagram/@topLevelNodes.10 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.6 /0/@diagram/@topLevelNodes.0 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.6">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="PortEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.PortFigure">
-          <attributes
-              xsi:type="gmfgen:DefaultSizeAttributes"
-              width="20"
-              height="20"/>
-        </viewmap>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomPortItemSemanticEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorPortEditPolicy.BEHAVIOR_PORT"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorPortEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Port"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.1/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property/aggregation"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            xsi:type="gmfgen:GenExternalNodeLabel"
-            visualID="5125"
-            editPartClassName="PortNameEditPart"
-            itemSemanticEditPolicyClassName="PortNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:FigureViewmap"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                x="25"
-                y="3"/>
-          </viewmap>
-          <behaviour
-              xsi:type="gmfgen:CustomBehaviour"
-              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL"
-              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPortLabelEditPolicy"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            xsi:type="gmfgen:GenExternalNodeLabel"
-            visualID="6029"
-            editPartClassName="PortAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="PortAppliedStereotypeItemSemanticEditPolicy"
-            readOnly="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:FigureViewmap"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                x="25"
-                y="-10"/>
-          </viewmap>
-          <behaviour
-              xsi:type="gmfgen:CustomBehaviour"
-              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.1"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          xsi:type="gmfgen:GenChildSideAffixedNode"
-          visualID="3088"
-          editPartClassName="ParameterEditPart"
-          itemSemanticEditPolicyClassName="ParameterItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ParameterCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="ParameterGraphicalNodeEditPolicy"
-          createCommandClassName="ParameterCreateCommand"
-          containers="/0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.composite.Parameter_3088"
-            displayName="Parameter"
-            editHelperClassName="ParameterEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ParameterFigure">
-          <attributes
-              xsi:type="gmfgen:DefaultSizeAttributes"
-              width="20"
-              height="20"/>
-        </viewmap>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomParameterItemSemanticEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ParameterLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Parameter"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Behavior/ownedParameter"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Behavior/ownedParameter"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            xsi:type="gmfgen:GenExternalNodeLabel"
-            visualID="6033"
-            editPartClassName="ParameterNameEditPart"
-            itemSemanticEditPolicyClassName="ParameterNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:FigureViewmap"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                x="25"
-                y="3"/>
-          </viewmap>
-          <behaviour
-              xsi:type="gmfgen:CustomBehaviour"
-              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
-              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ParameterLabelEditPolicy"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            xsi:type="gmfgen:GenExternalNodeLabel"
-            visualID="6034"
-            editPartClassName="ParameterAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="ParameterAppliedStereotypeItemSemanticEditPolicy"
-            readOnly="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:FigureViewmap"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                x="25"
-                y="-10"/>
-          </viewmap>
-          <behaviour
-              xsi:type="gmfgen:CustomBehaviour"
-              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.1"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3070"
-          editPartClassName="PropertyPartEditPartCN"
-          itemSemanticEditPolicyClassName="PropertyPartItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="PropertyPartCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.1"
-          compartments="/0/@diagram/@compartments.30"
-          graphicalNodeEditPolicyClassName="PropertyPartGraphicalNodeEditPolicyCN"
-          createCommandClassName="PropertyPartCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29 /0/@diagram/@compartments.30">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.PropertyPartFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomPropertyPartItemSemanticEditPolicyCN"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PropertyLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy"/>
-        <modelFacet
-            modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.2">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5126"
-            editPartClassName="PropertyPartNameEditPartCN"
-            itemSemanticEditPolicyClassName="PropertyPartNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <behaviour
-              xsi:type="gmfgen:CustomBehaviour"
-              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL"
-              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPropertyLabelEditPolicy"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3115"
-          editPartClassName="CollaborationRoleEditPartCN"
-          itemSemanticEditPolicyClassName="CollaborationRoleItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="CollaborationRoleCanonicalEditPolicyCN"
-          graphicalNodeEditPolicyClassName="CollaborationRoleGraphicalNodeEditPolicyCN"
-          createCommandClassName="CollaborationRoleCreateCommandCN"
-          containers="/0/@diagram/@compartments.17 /0/@diagram/@compartments.29">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.composite.prototype.CollaborationRole_3115"
-            displayName="CollaborationRole"
-            editHelperClassName="CollaborationRoleEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationRoleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CollaborationRoleItemSemanticEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ConnectableElement"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/role"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/role"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5198"
-            editPartClassName="CollaborationRoleNameEditPartCN"
-            itemSemanticEditPolicyClassName="CollaborationRoleNameItemSemanticEditPolicyCN"
-            readOnly="true"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}"
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3071"
-          editPartClassName="CollaborationUseEditPartCN"
-          itemSemanticEditPolicyClassName="CollaborationUseItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="CollaborationUseCanonicalEditPolicyCN"
-          graphicalNodeEditPolicyClassName="CollaborationUseGraphicalNodeEditPolicyCN"
-          createCommandClassName="CollaborationUseCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="CollaborationUseEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationUseFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomCollaborationUseItemSemanticEditPolicyCN"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/CollaborationUse"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/collaborationUse"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/collaborationUse"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5127"
-            editPartClassName="CollaborationUseNameEditPart"
-            itemSemanticEditPolicyClassName="CollaborationUseNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <behaviour
-              xsi:type="gmfgen:CustomBehaviour"
-              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
-              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CollaborationUseLabelEditPolicy"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3072"
-          editPartClassName="ActivityCompositeEditPartCN"
-          itemSemanticEditPolicyClassName="ActivityCompositeItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="ActivityCompositeCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"
-          compartments="/0/@diagram/@compartments.6"
-          graphicalNodeEditPolicyClassName="ActivityCompositeGraphicalNodeEditPolicyCN"
-          createCommandClassName="ActivityCompositeCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@topLevelNodes.0/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5128"
-            editPartClassName="ActivityCompositeNameEditPartCN"
-            itemSemanticEditPolicyClassName="ActivityCompositeNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3073"
-          editPartClassName="InteractionCompositeEditPartCN"
-          itemSemanticEditPolicyClassName="InteractionCompositeItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="InteractionCompositeCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"
-          compartments="/0/@diagram/@compartments.7"
-          graphicalNodeEditPolicyClassName="InteractionCompositeGraphicalNodeEditPolicyCN"
-          createCommandClassName="InteractionCompositeCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@topLevelNodes.1/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5129"
-            editPartClassName="InteractionCompositeNameEditPartCN"
-            itemSemanticEditPolicyClassName="InteractionCompositeNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3074"
-          editPartClassName="ProtocolStateMachineCompositeEditPartCN"
-          itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="ProtocolStateMachineCompositeCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"
-          compartments="/0/@diagram/@compartments.8"
-          graphicalNodeEditPolicyClassName="ProtocolStateMachineCompositeGraphicalNodeEditPolicyCN"
-          createCommandClassName="ProtocolStateMachineCompositeCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@topLevelNodes.2/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ProtocolStateMachine"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5130"
-            editPartClassName="ProtocolStateMachineCompositeNameEditPartCN"
-            itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3075"
-          editPartClassName="StateMachineCompositeEditPartCN"
-          itemSemanticEditPolicyClassName="StateMachineCompositeItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="StateMachineCompositeCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"
-          compartments="/0/@diagram/@compartments.9"
-          graphicalNodeEditPolicyClassName="StateMachineCompositeGraphicalNodeEditPolicyCN"
-          createCommandClassName="StateMachineCompositeCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@topLevelNodes.3/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StateMachine"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5131"
-            editPartClassName="StateMachineCompositeNameEditPartCN"
-            itemSemanticEditPolicyClassName="StateMachineCompositeNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3076"
-          editPartClassName="FunctionBehaviorCompositeEditPartCN"
-          itemSemanticEditPolicyClassName="FunctionBehaviorCompositeItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="FunctionBehaviorCompositeCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"
-          compartments="/0/@diagram/@compartments.10"
-          graphicalNodeEditPolicyClassName="FunctionBehaviorCompositeGraphicalNodeEditPolicyCN"
-          createCommandClassName="FunctionBehaviorCompositeCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@topLevelNodes.4/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/FunctionBehavior"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5132"
-            editPartClassName="FunctionBehaviorCompositeNameEditPartCN"
-            itemSemanticEditPolicyClassName="FunctionBehaviorCompositeNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3077"
-          editPartClassName="OpaqueBehaviorCompositeEditPartCN"
-          itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="OpaqueBehaviorCompositeCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"
-          compartments="/0/@diagram/@compartments.11"
-          graphicalNodeEditPolicyClassName="OpaqueBehaviorCompositeGraphicalNodeEditPolicyCN"
-          createCommandClassName="OpaqueBehaviorCompositeCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@topLevelNodes.5/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/OpaqueBehavior"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5133"
-            editPartClassName="OpaqueBehaviorCompositeNameEditPartCN"
-            itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3081"
-          editPartClassName="ComponentCompositeEditPartCN"
-          itemSemanticEditPolicyClassName="ComponentCompositeItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="ComponentCompositeCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.1"
-          compartments="/0/@diagram/@compartments.12"
-          graphicalNodeEditPolicyClassName="ComponentCompositeGraphicalNodeEditPolicyCN"
-          createCommandClassName="ComponentCompositeCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@topLevelNodes.6/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5137"
-            editPartClassName="ComponentCompositeNameEditPartCN"
-            itemSemanticEditPolicyClassName="ComponentCompositeNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3082"
-          editPartClassName="DeviceCompositeEditPartCN"
-          itemSemanticEditPolicyClassName="DeviceCompositeItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="DeviceCompositeCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.1"
-          compartments="/0/@diagram/@compartments.13"
-          graphicalNodeEditPolicyClassName="DeviceCompositeGraphicalNodeEditPolicyCN"
-          createCommandClassName="DeviceCompositeCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@topLevelNodes.7/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Device"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5138"
-            editPartClassName="DeviceCompositeNameEditPartCN"
-            itemSemanticEditPolicyClassName="DeviceCompositeNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3083"
-          editPartClassName="ExecutionEnvironmentCompositeEditPartCN"
-          itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="ExecutionEnvironmentCompositeCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.1"
-          compartments="/0/@diagram/@compartments.14"
-          graphicalNodeEditPolicyClassName="ExecutionEnvironmentCompositeGraphicalNodeEditPolicyCN"
-          createCommandClassName="ExecutionEnvironmentCompositeCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@topLevelNodes.8/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ExecutionEnvironment"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5139"
-            editPartClassName="ExecutionEnvironmentCompositeNameEditPartCN"
-            itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3084"
-          editPartClassName="NodeCompositeEditPartCN"
-          itemSemanticEditPolicyClassName="NodeCompositeItemSemanticEditPolicycN"
-          canonicalEditPolicyClassName="NodeCompositeCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.1"
-          compartments="/0/@diagram/@compartments.15"
-          graphicalNodeEditPolicyClassName="NodeCompositeGraphicalNodeEditPolicyCN"
-          createCommandClassName="NodeCompositeCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@topLevelNodes.9/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Node"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5140"
-            editPartClassName="NodeCompositeNameEditPartCN"
-            itemSemanticEditPolicyClassName="NodeCompositeNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3085"
-          editPartClassName="ClassCompositeEditPartCN"
-          itemSemanticEditPolicyClassName="ClassCompositeItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="ClassCompositeCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.1"
-          compartments="/0/@diagram/@compartments.16"
-          graphicalNodeEditPolicyClassName="ClassCompositeGraphicalNodeEditPolicyCN"
-          createCommandClassName="ClassCompositeCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@topLevelNodes.10/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5155"
-            editPartClassName="ClassCompositeNameEditPartCN"
-            itemSemanticEditPolicyClassName="ClassCompositeNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3086"
-          editPartClassName="CollaborationCompositeEditPartCN"
-          itemSemanticEditPolicyClassName="CollaborationCompositeItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="CollaborationCompositeCanonicalEditPolicyCN"
-          compartments="/0/@diagram/@compartments.17"
-          graphicalNodeEditPolicyClassName="CollaborationCompositeGraphicalNodeEditPolicyCN"
-          createCommandClassName="CollaborationCompositeCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="CollaborationEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Collaboration"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5141"
-            editPartClassName="CollaborationCompositeNameEditPartCN"
-            itemSemanticEditPolicyClassName="CollaborationCompositeNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3087"
-          editPartClassName="InterfaceEditPartCN"
-          itemSemanticEditPolicyClassName="InterfaceItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="InterfaceCanonicalEditPolicyCN"
-          graphicalNodeEditPolicyClassName="InterfaceGraphicalNodeEditPolicyCN"
-          createCommandClassName="InterfaceCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="InterfaceEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5154"
-            editPartClassName="InterfaceNameEditPartCN"
-            itemSemanticEditPolicyClassName="InterfaceNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3078"
-          editPartClassName="PrimitiveTypeEditPartCN"
-          itemSemanticEditPolicyClassName="PrimitiveTypeItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="PrimitiveTypeCanonicalEditPolicyCN"
-          graphicalNodeEditPolicyClassName="PrimitiveTypeGraphicalNodeEditPolicyCN"
-          createCommandClassName="PrimitiveTypeCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@topLevelNodes.13/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/PrimitiveType"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5134"
-            editPartClassName="PrimitiveTypeNameEditPartCN"
-            itemSemanticEditPolicyClassName="PrimitiveTypeNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3079"
-          editPartClassName="EnumerationEditPartCN"
-          itemSemanticEditPolicyClassName="EnumerationItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="EnumerationCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.36"
-          compartments="/0/@diagram/@compartments.5"
-          graphicalNodeEditPolicyClassName="EnumerationGraphicalNodeEditPolicyCN"
-          createCommandClassName="EnumerationCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@topLevelNodes.14/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Enumeration"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5135"
-            editPartClassName="EnumerationNameEditPartCN"
-            itemSemanticEditPolicyClassName="EnumerationNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3080"
-          editPartClassName="DataTypeEditPartCN"
-          itemSemanticEditPolicyClassName="DataTypeItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="DataTypeCanonicalEditPolicyCN"
-          compartments="/0/@diagram/@compartments.2 /0/@diagram/@compartments.3"
-          graphicalNodeEditPolicyClassName="DataTypeGraphicalNodeEditPolicyCN"
-          createCommandClassName="DataTypeCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@topLevelNodes.15/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DataType"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5136"
-            editPartClassName="DataTypeNameEditPartCN"
-            itemSemanticEditPolicyClassName="DataTypeNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3091"
-          editPartClassName="ActorEditPartCN"
-          itemSemanticEditPolicyClassName="ActorItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="ActorCanonicalEditPolicyCN"
-          graphicalNodeEditPolicyClassName="ActorGraphicalNodeEditPolicyCN"
-          createCommandClassName="ActorCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="ActorEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Actor"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5144"
-            editPartClassName="ActorNameEditPartCN"
-            itemSemanticEditPolicyClassName="ActorNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3092"
-          editPartClassName="DeploymentSpecificationEditPartCN"
-          itemSemanticEditPolicyClassName="DeploymentSpecificationItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="DeploymentSpecificationCanonicalEditPolicyCN"
-          graphicalNodeEditPolicyClassName="DeploymentSpecificationGraphicalNodeEditPolicyCN"
-          createCommandClassName="DeploymentSpecificationCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="DeploymentSpecificationEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DeploymentSpecification"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5145"
-            editPartClassName="DeploymentSpecificationNameEditPartCN"
-            itemSemanticEditPolicyClassName="DeploymentSpecificationNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3093"
-          editPartClassName="ArtifactEditPartCN"
-          itemSemanticEditPolicyClassName="ArtifactItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="ArtifactCanonicalEditPolicyCN"
-          graphicalNodeEditPolicyClassName="ArtifactGraphicalNodeEditPolicyCN"
-          createCommandClassName="ArtifactCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="ArtifactEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Artifact"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5146"
-            editPartClassName="ArtifactNameEditPartCN"
-            itemSemanticEditPolicyClassName="ArtifactNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3094"
-          editPartClassName="InformationItemEditPartCN"
-          itemSemanticEditPolicyClassName="InformationItemItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="InformationItemCanonicalEditPolicyCN"
-          graphicalNodeEditPolicyClassName="InformationItemGraphicalNodeEditPolicyCN"
-          createCommandClassName="InformationItemCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="InformationItemEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure">
-          <attributes
-              xsi:type="gmfgen:DefaultSizeAttributes"
-              width="80"
-              height="40"/>
-        </viewmap>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationItem"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.7">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/isAbstract"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5147"
-            editPartClassName="InformationItemNameEditPartCN"
-            itemSemanticEditPolicyClassName="InformationItemNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3095"
-          editPartClassName="SignalEditPartCN"
-          itemSemanticEditPolicyClassName="SignalItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="SignalCanonicalEditPolicyCN"
-          graphicalNodeEditPolicyClassName="SignalGraphicalNodeEditPolicyCN"
-          createCommandClassName="SignalCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="SignalEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Signal"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5148"
-            editPartClassName="SignalNameEditPartCN"
-            itemSemanticEditPolicyClassName="SignalNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3096"
-          editPartClassName="UseCaseEditPartCN"
-          itemSemanticEditPolicyClassName="UseCaseItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="UseCaseCanonicalEditPolicyCN"
-          graphicalNodeEditPolicyClassName="UseCaseGraphicalNodeEditPolicyCN"
-          createCommandClassName="UseCaseCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="UseCaseEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/UseCase"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5149"
-            editPartClassName="UseCaseNameEditPartCN"
-            itemSemanticEditPolicyClassName="UseCaseNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3097"
-          editPartClassName="CommentEditPartCN"
-          itemSemanticEditPolicyClassName="CommentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="CommentCanonicalEditPolicyCN"
-          graphicalNodeEditPolicyClassName="CommentGraphicalNodeEditPolicyCN"
-          createCommandClassName="CommentCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29 /0/@diagram/@compartments.30">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            displayName="Comment"
-            editHelperClassName="CommentEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.12">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5150"
-            editPartClassName="CommentBodyEditPartCN"
-            itemSemanticEditPolicyClassName="CommentBodyItemSemanticEditPolicyCN">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getCornerBentFigure"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.3">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3116"
-          editPartClassName="DurationConstraintEditPartCN"
-          itemSemanticEditPolicyClassName="DurationConstraintItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="DurationConstraintCanonicalEditPolicyCN"
-          graphicalNodeEditPolicyClassName="DurationConstraintGraphicalNodeEditPolicyCN"
-          createCommandClassName="DurationConstraintCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationConstraint"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.13">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="6040"
-            editPartClassName="DurationConstraintNameEditPartCN"
-            itemSemanticEditPolicyClassName="DurationConstraintNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern=""
-              editorPattern=""
-              editPattern="">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6041"
-            editPartClassName="DurationConstraintSpecificationEditPartCN"
-            itemSemanticEditPolicyClassName="DurationConstraintSpecificationItemSemanticEditPolicyCN">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getConstraintFigure"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.4">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            <editableMetaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3117"
-          editPartClassName="TimeConstraintEditPartCN"
-          itemSemanticEditPolicyClassName="TimeConstraintItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="TimeConstraintCanonicalEditPolicyCN"
-          graphicalNodeEditPolicyClassName="TimeConstraintGraphicalNodeEditPolicyCN"
-          createCommandClassName="TimeConstraintCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeConstraint"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.13">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="6042"
-            editPartClassName="TimeConstraintNameEditPartCN"
-            itemSemanticEditPolicyClassName="TimeConstraintNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern=""
-              editorPattern=""
-              editPattern="">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6043"
-            editPartClassName="TimeConstraintSpecificationEditPartCN"
-            itemSemanticEditPolicyClassName="TimeConstraintSpecificationItemSemanticEditPolicyCN">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getConstraintFigure"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.4">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            <editableMetaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3118"
-          editPartClassName="IntervalConstraintEditPartCN"
-          itemSemanticEditPolicyClassName="IntervalConstraintItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="IntervalConstraintCanonicalEditPolicyCN"
-          graphicalNodeEditPolicyClassName="IntervalConstraintGraphicalNodeEditPolicyCN"
-          createCommandClassName="IntervalConstraintCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/IntervalConstraint"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.13">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="6044"
-            editPartClassName="IntervalConstraintNameEditPartCN"
-            itemSemanticEditPolicyClassName="IntervalConstraintNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern=""
-              editorPattern=""
-              editPattern="">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6045"
-            editPartClassName="IntervalConstraintSpecificationEditPartCN"
-            itemSemanticEditPolicyClassName="IntervalConstraintSpecificationItemSemanticEditPolicyCN">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getConstraintFigure"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.4">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            <editableMetaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3119"
-          editPartClassName="InteractionConstraintEditPartCN"
-          itemSemanticEditPolicyClassName="InteractionConstraintItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="InteractionConstraintCanonicalEditPolicyCN"
-          graphicalNodeEditPolicyClassName="InteractionConstraintGraphicalNodeEditPolicyCN"
-          createCommandClassName="InteractionConstraintCreateCommandCN"
-          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionConstraint"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.13">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="6046"
-            editPartClassName="InteractionConstraintNameEditPartCN"
-            itemSemanticEditPolicyClassName="InteractionConstraintNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern=""
-              editorPattern=""
-              editPattern="">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6047"
-            editPartClassName="InteractionConstraintSpecificationEditPartCN"
-            itemSemanticEditPolicyClassName="InteractionConstraintSpecificationItemSemanticEditPolicyCN">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getConstraintFigure"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.4">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            <editableMetaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          visualID="3120"
-          editPartClassName="ConstraintEditPartCN"
-          itemSemanticEditPolicyClassName="ConstraintItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="ConstraintCanonicalEditPolicyCN"
-          graphicalNodeEditPolicyClassName="ConstraintGraphicalNodeEditPolicyCN"
-          createCommandClassName="ConstraintCreateCommandCN"
-          containers="/0/@diagram/@compartments.28 /0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.29">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.13">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="6048"
-            editPartClassName="ConstraintNameEditPartCN"
-            itemSemanticEditPolicyClassName="ConstraintNameItemSemanticEditPolicyCN"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern=""
-              editorPattern=""
-              editPattern="">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6049"
-            editPartClassName="ConstraintSpecificationEditPartCN"
-            itemSemanticEditPolicyClassName="ConstraintSpecificationItemSemanticEditPolicyCN">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getConstraintFigure"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.4">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            <editableMetaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-          </modelFacet>
-        </labels>
-      </childNodes>
-      <childNodes
-          xsi:type="gmfgen:GenChildLabelNode"
-          visualID="3101"
-          editPartClassName="PropertyEditPartCLN"
-          itemSemanticEditPolicyClassName="PropertyItemSemanticEditPolicyCLN"
-          canonicalEditPolicyClassName="PropertyCanonicalEditPolicyCLN"
-          graphicalNodeEditPolicyClassName="PropertyGraphicalNodeEditPolicyCLN"
-          createCommandClassName="PropertyCreateCommandCLN"
-          containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.0"
-          labelElementIcon="true">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labelModelFacet
-            xsi:type="gmfgen:FeatureLabelModelFacet"
-            parser="/0/@labelParsers/@implementations.0"
-            viewPattern="{0}  "
-            editorPattern="{0}"
-            editPattern="{0}">
-          <metaFeatures
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-        </labelModelFacet>
-      </childNodes>
-      <childNodes
-          xsi:type="gmfgen:GenChildLabelNode"
-          visualID="3102"
-          editPartClassName="OperationEditPartCLN"
-          itemSemanticEditPolicyClassName="OperationItemSemanticEditPolicyCLN"
-          canonicalEditPolicyClassName="OperationCanonicalEditPolicyCLN"
-          graphicalNodeEditPolicyClassName="OperationGraphicalNodeEditPolicyCLN"
-          createCommandClassName="OperationCreateCommandCLN"
-          containers="/0/@diagram/@compartments.3 /0/@diagram/@compartments.1"
-          labelElementIcon="true">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Operation"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/ownedOperation"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/ownedOperation"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labelModelFacet
-            xsi:type="gmfgen:FeatureLabelModelFacet"
-            parser="/0/@labelParsers/@implementations.0"
-            viewPattern="{0}  "
-            editorPattern="{0}"
-            editPattern="{0}">
-          <metaFeatures
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-        </labelModelFacet>
-      </childNodes>
-      <childNodes
-          xsi:type="gmfgen:GenChildLabelNode"
-          visualID="3066"
-          editPartClassName="EnumerationLiteralEditPartCLN"
-          itemSemanticEditPolicyClassName="EnumerationLiteralItemSemanticEditPolicyCLN"
-          canonicalEditPolicyClassName="EnumerationLiteralCanonicalEditPolicyCLN"
-          graphicalNodeEditPolicyClassName="EnumerationLiteralGraphicalNodeEditPolicyCLN"
-          createCommandClassName="EnumerationLiteralCreateCommandCLN"
-          containers="/0/@diagram/@compartments.5 /0/@diagram/@compartments.4 /0/@diagram/@topLevelNodes.14 /0/@diagram/@childNodes.20"
-          labelElementIcon="true">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="EnumerationLiteralEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/EnumerationLiteral"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Enumeration/ownedLiteral"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Enumeration/ownedLiteral"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labelModelFacet
-            xsi:type="gmfgen:FeatureLabelModelFacet"
-            parser="/0/@labelParsers/@implementations.0"
-            viewPattern="{0}  "
-            editorPattern="{0}"
-            editPattern="{0}">
-          <metaFeatures
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-        </labelModelFacet>
-      </childNodes>
-      <topLevelNodes
-          visualID="2060"
-          editPartClassName="ActivityCompositeEditPart"
-          itemSemanticEditPolicyClassName="ActivityCompositeItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ActivityCompositeCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"
-          compartments="/0/@diagram/@compartments.18"
-          graphicalNodeEditPolicyClassName="ActivityCompositeGraphicalNodeEditPolicy"
-          createCommandClassName="ActivityCompositeCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="ActivityEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5112"
-            editPartClassName="ActivityCompositeNameEditPart"
-            itemSemanticEditPolicyClassName="ActivityCompositeNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2061"
-          editPartClassName="InteractionCompositeEditPart"
-          itemSemanticEditPolicyClassName="InteractionCompositeItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="InteractionCompositeCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"
-          compartments="/0/@diagram/@compartments.19"
-          graphicalNodeEditPolicyClassName="InteractionCompositeGraphicalNodeEditPolicy"
-          createCommandClassName="InteractionCompositeCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="InteractionEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5113"
-            editPartClassName="InteractionCompositeNameEditPart"
-            itemSemanticEditPolicyClassName="InteractionCompositeNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2062"
-          editPartClassName="ProtocolStateMachineCompositeEditPart"
-          itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ProtocolStateMachineCompositeCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"
-          compartments="/0/@diagram/@compartments.20"
-          graphicalNodeEditPolicyClassName="ProtocolStateMachineCompositeGraphicalNodeEditPolicy"
-          createCommandClassName="ProtocolStateMachineCompositeCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="ProtocolStateMachineEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ProtocolStateMachine"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5114"
-            editPartClassName="ProtocolStateMachineCompositeNameEditPart"
-            itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2063"
-          editPartClassName="StateMachineCompositeEditPart"
-          itemSemanticEditPolicyClassName="StateMachineCompositeItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="StateMachineCompositeCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"
-          compartments="/0/@diagram/@compartments.21"
-          graphicalNodeEditPolicyClassName="StateMachineCompositeGraphicalNodeEditPolicy"
-          createCommandClassName="StateMachineCompositeCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="StateMachineEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StateMachine"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5115"
-            editPartClassName="StateMachineCompositeNameEditPart"
-            itemSemanticEditPolicyClassName="StateMachineCompositeNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2064"
-          editPartClassName="FunctionBehaviorCompositeEditPart"
-          itemSemanticEditPolicyClassName="FunctionBehaviorCompositeItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="FunctionBehaviorCompositeCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"
-          compartments="/0/@diagram/@compartments.22"
-          graphicalNodeEditPolicyClassName="FunctionBehaviorCompositeGraphicalNodeEditPolicy"
-          createCommandClassName="FunctionBehaviorCompositeCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="FunctionBehaviorEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/FunctionBehavior"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5116"
-            editPartClassName="FunctionBehaviorCompositeNameEditPart"
-            itemSemanticEditPolicyClassName="FunctionBehaviorCompositeNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2065"
-          editPartClassName="OpaqueBehaviorCompositeEditPart"
-          itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="OpaqueBehaviorCompositeCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"
-          compartments="/0/@diagram/@compartments.23"
-          graphicalNodeEditPolicyClassName="OpaqueBehaviorCompositeGraphicalNodeEditPolicy"
-          createCommandClassName="OpaqueBehaviorCompositeCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="OpaqueBehaviorEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/OpaqueBehavior"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5117"
-            editPartClassName="OpaqueBehaviorCompositeNameEditPart"
-            itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2069"
-          editPartClassName="ComponentCompositeEditPart"
-          itemSemanticEditPolicyClassName="ComponentCompositeItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ComponentCompositeCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.1"
-          compartments="/0/@diagram/@compartments.24"
-          graphicalNodeEditPolicyClassName="ComponentCompositeGraphicalNodeEditPolicy"
-          createCommandClassName="ComponentCompositeCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="ComponentEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5121"
-            editPartClassName="ComponentCompositeNameEditPart"
-            itemSemanticEditPolicyClassName="ComponentCompositeNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2070"
-          editPartClassName="DeviceCompositeEditPart"
-          itemSemanticEditPolicyClassName="DeviceCompositeItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="DeviceCompositeCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.1"
-          compartments="/0/@diagram/@compartments.25"
-          graphicalNodeEditPolicyClassName="DeviceCompositeGraphicalNodeEditPolicy"
-          createCommandClassName="DeviceCompositeCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="DeviceEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Device"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5122"
-            editPartClassName="DeviceCompositeNameEditPart"
-            itemSemanticEditPolicyClassName="DeviceCompositeNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2071"
-          editPartClassName="ExecutionEnvironmentCompositeEditPart"
-          itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ExecutionEnvironmentCompositeCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.1"
-          compartments="/0/@diagram/@compartments.26"
-          graphicalNodeEditPolicyClassName="ExecutionEnvironmentCompositeGraphicalNodeEditPolicy"
-          createCommandClassName="ExecutionEnvironmentCompositeCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="ExecutionEnvironmentEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ExecutionEnvironment"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5123"
-            editPartClassName="ExecutionEnvironmentCompositeNameEditPart"
-            itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2072"
-          editPartClassName="NodeCompositeEditPart"
-          itemSemanticEditPolicyClassName="NodeCompositeItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="NodeCompositeCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.1"
-          compartments="/0/@diagram/@compartments.27"
-          graphicalNodeEditPolicyClassName="NodeCompositeGraphicalNodeEditPolicy"
-          createCommandClassName="NodeCompositeCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="NodeEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Node"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5124"
-            editPartClassName="NodeCompositeNameEditPart"
-            itemSemanticEditPolicyClassName="NodeCompositeNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2073"
-          editPartClassName="ClassCompositeEditPart"
-          itemSemanticEditPolicyClassName="ClassCompositeItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ClassCompositeCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.1"
-          compartments="/0/@diagram/@compartments.28"
-          graphicalNodeEditPolicyClassName="ClassCompositeGraphicalNodeEditPolicy"
-          createCommandClassName="ClassCompositeCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="ClassEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5156"
-            editPartClassName="ClassCompositeNameEditPart"
-            itemSemanticEditPolicyClassName="ClassCompositeNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2075"
-          editPartClassName="CollaborationCompositeEditPart"
-          itemSemanticEditPolicyClassName="CollaborationCompositeItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="CollaborationCompositeCanonicalEditPolicy"
-          compartments="/0/@diagram/@compartments.29"
-          graphicalNodeEditPolicyClassName="CollaborationCompositeGraphicalNodeEditPolicy"
-          createCommandClassName="CollaborationCompositeCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@childNodes.17/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Collaboration"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5158"
-            editPartClassName="CollaborationCompositeNameEditPart"
-            itemSemanticEditPolicyClassName="CollaborationCompositeNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2076"
-          editPartClassName="InterfaceEditPart"
-          itemSemanticEditPolicyClassName="InterfaceItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="InterfaceCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="InterfaceGraphicalNodeEditPolicy"
-          createCommandClassName="InterfaceCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@childNodes.18/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5159"
-            editPartClassName="InterfaceNameEditPart"
-            itemSemanticEditPolicyClassName="InterfaceNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2066"
-          editPartClassName="PrimitiveTypeEditPart"
-          itemSemanticEditPolicyClassName="PrimitiveTypeItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="PrimitiveTypeCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="PrimitiveTypeGraphicalNodeEditPolicy"
-          createCommandClassName="PrimitiveTypeCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="PrimitiveTypeEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/PrimitiveType"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5118"
-            editPartClassName="PrimitiveTypeNameEditPart"
-            itemSemanticEditPolicyClassName="PrimitiveTypeNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2067"
-          editPartClassName="EnumerationEditPart"
-          itemSemanticEditPolicyClassName="EnumerationItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="EnumerationCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.36"
-          compartments="/0/@diagram/@compartments.4"
-          graphicalNodeEditPolicyClassName="EnumerationGraphicalNodeEditPolicy"
-          createCommandClassName="EnumerationCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="EnumerationEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Enumeration"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5119"
-            editPartClassName="EnumerationNameEditPart"
-            itemSemanticEditPolicyClassName="EnumerationNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2068"
-          editPartClassName="DataTypeEditPart"
-          itemSemanticEditPolicyClassName="DataTypeItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="DataTypeCanonicalEditPolicy"
-          compartments="/0/@diagram/@compartments.0 /0/@diagram/@compartments.1"
-          graphicalNodeEditPolicyClassName="DataTypeGraphicalNodeEditPolicy"
-          createCommandClassName="DataTypeCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="DataTypeEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DataType"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5120"
-            editPartClassName="DataTypeNameEditPart"
-            itemSemanticEditPolicyClassName="DataTypeNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2077"
-          editPartClassName="ActorEditPart"
-          itemSemanticEditPolicyClassName="ActorItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ActorCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="ActorGraphicalNodeEditPolicy"
-          createCommandClassName="ActorCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@childNodes.22/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Actor"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5160"
-            editPartClassName="ActorNameEditPart"
-            itemSemanticEditPolicyClassName="ActorNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2078"
-          editPartClassName="DeploymentSpecificationEditPart"
-          itemSemanticEditPolicyClassName="DeploymentSpecificationItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="DeploymentSpecificationCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="DeploymentSpecificationGraphicalNodeEditPolicy"
-          createCommandClassName="DeploymentSpecificationCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@childNodes.23/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DeploymentSpecification"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5161"
-            editPartClassName="DeploymentSpecificationNameEditPart"
-            itemSemanticEditPolicyClassName="DeploymentSpecificationNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2079"
-          editPartClassName="ArtifactEditPart"
-          itemSemanticEditPolicyClassName="ArtifactItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ArtifactCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="ArtifactGraphicalNodeEditPolicy"
-          createCommandClassName="ArtifactCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@childNodes.24/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Artifact"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5162"
-            editPartClassName="ArtifactNameEditPart"
-            itemSemanticEditPolicyClassName="ArtifactNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2080"
-          editPartClassName="InformationItemEditPart"
-          itemSemanticEditPolicyClassName="InformationItemItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="InformationItemCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="InformationItemGraphicalNodeEditPolicy"
-          createCommandClassName="InformationItemCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@childNodes.25/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure">
-          <attributes
-              xsi:type="gmfgen:DefaultSizeAttributes"
-              width="80"
-              height="40"/>
-        </viewmap>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationItem"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.7">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/isAbstract"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5163"
-            editPartClassName="InformationItemNameEditPart"
-            itemSemanticEditPolicyClassName="InformationItemNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2081"
-          editPartClassName="SignalEditPart"
-          itemSemanticEditPolicyClassName="SignalItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="SignalCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="SignalGraphicalNodeEditPolicy"
-          createCommandClassName="SignalCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@childNodes.26/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Signal"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5164"
-            editPartClassName="SignalNameEditPart"
-            itemSemanticEditPolicyClassName="SignalNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2082"
-          editPartClassName="UseCaseEditPart"
-          itemSemanticEditPolicyClassName="UseCaseItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="UseCaseCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="UseCaseGraphicalNodeEditPolicy"
-          createCommandClassName="UseCaseCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@childNodes.27/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/UseCase"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5165"
-            editPartClassName="UseCaseNameEditPart"
-            itemSemanticEditPolicyClassName="UseCaseNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2083"
-          editPartClassName="SignalEventEditPart"
-          itemSemanticEditPolicyClassName="SignalEventItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="SignalEventCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="SignalEventGraphicalNodeEditPolicy"
-          createCommandClassName="SignalEventCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="SignalEventEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/SignalEvent"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5166"
-            editPartClassName="SignalEventNameEditPart"
-            itemSemanticEditPolicyClassName="SignalEventNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2084"
-          editPartClassName="CallEventEditPart"
-          itemSemanticEditPolicyClassName="CallEventItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="CallEventCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="CallEventGraphicalNodeEditPolicy"
-          createCommandClassName="CallEventCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="CallEventEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/CallEvent"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5167"
-            editPartClassName="CallEventNameEditPart"
-            itemSemanticEditPolicyClassName="CallEventNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2085"
-          editPartClassName="AnyReceiveEventEditPart"
-          itemSemanticEditPolicyClassName="AnyReceiveEventItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="AnyReceiveEventCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="AnyReceiveEventGraphicalNodeEditPolicy"
-          createCommandClassName="AnyReceiveEventCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="AnyReceiveEventEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/AnyReceiveEvent"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5168"
-            editPartClassName="AnyReceiveEventNameEditPart"
-            itemSemanticEditPolicyClassName="AnyReceiveEventNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2088"
-          editPartClassName="ChangeEventEditPart"
-          itemSemanticEditPolicyClassName="ChangeEventItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ChangeEventCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="ChangeEventGraphicalNodeEditPolicy"
-          createCommandClassName="ChangeEventCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="ChangeEventEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ChangeEvent"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5171"
-            editPartClassName="ChangeEventNameEditPart"
-            itemSemanticEditPolicyClassName="ChangeEventNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2089"
-          editPartClassName="TimeEventEditPart"
-          itemSemanticEditPolicyClassName="TimeEventItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="TimeEventCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="TimeEventGraphicalNodeEditPolicy"
-          createCommandClassName="TimeEventCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="TimeEventEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeEvent"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5172"
-            editPartClassName="TimeEventNameEditPart"
-            itemSemanticEditPolicyClassName="TimeEventNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2093"
-          editPartClassName="DurationObservationEditPart"
-          itemSemanticEditPolicyClassName="DurationObservationItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="DurationObservationCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="DurationObservationGraphicalNodeEditPolicy"
-          createCommandClassName="DurationObservationCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="DurationObservationEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.DurationObservationNodeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ObservationLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationObservation"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            xsi:type="gmfgen:GenExternalNodeLabel"
-            visualID="5151"
-            editPartClassName="DurationObservationNameEditPart"
-            itemSemanticEditPolicyClassName="DurationObservationNameItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:FigureViewmap"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                x="25"
-                y="3"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            xsi:type="gmfgen:GenExternalNodeLabel"
-            visualID="5152"
-            editPartClassName="DurationObservationStereotypeLabelEditPart"
-            itemSemanticEditPolicyClassName="DurationObservationStereotypeLabelItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:FigureViewmap"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                x="25"
-                y="-10"/>
-          </viewmap>
-          <behaviour
-              xsi:type="gmfgen:CustomBehaviour"
-              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.1"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2094"
-          editPartClassName="TimeObservationEditPart"
-          itemSemanticEditPolicyClassName="TimeObservationItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="TimeObservationCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="TimeObservationGraphicalNodeEditPolicy"
-          createCommandClassName="TimeObservationCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="TimeObservationEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.TimeObservationNodeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ObservationLayoutEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeObservation"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            xsi:type="gmfgen:GenExternalNodeLabel"
-            visualID="5142"
-            editPartClassName="TimeObservationNameEditPart"
-            itemSemanticEditPolicyClassName="TimeObservationNameItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:FigureViewmap"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                x="25"
-                y="3"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            xsi:type="gmfgen:GenExternalNodeLabel"
-            visualID="5143"
-            editPartClassName="TimeObservationStereotypeLabelEditPart"
-            itemSemanticEditPolicyClassName="TimeObservationStereotypeLabelItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:FigureViewmap"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                x="25"
-                y="-10"/>
-          </viewmap>
-          <behaviour
-              xsi:type="gmfgen:CustomBehaviour"
-              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.1"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2095"
-          editPartClassName="LiteralBooleanEditPart"
-          itemSemanticEditPolicyClassName="LiteralBooleanItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="LiteralBooleanCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="LiteralBooleanGraphicalNodeEditPolicy"
-          createCommandClassName="LiteralBooleanCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="LiteralBooleanEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralBoolean"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5178"
-            editPartClassName="LiteralBooleanNameEditPart"
-            itemSemanticEditPolicyClassName="LiteralBooleanNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2096"
-          editPartClassName="LiteralIntegerEditPart"
-          itemSemanticEditPolicyClassName="LiteralIntegerItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="LiteralIntegerCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="LiteralIntegerGraphicalNodeEditPolicy"
-          createCommandClassName="LiteralIntegerCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="LiteralIntegerEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralInteger"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5179"
-            editPartClassName="LiteralIntegerNameEditPart"
-            itemSemanticEditPolicyClassName="LiteralIntegerNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2097"
-          editPartClassName="LiteralNullEditPart"
-          itemSemanticEditPolicyClassName="LiteralNullItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="LiteralNullCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="LiteralNullGraphicalNodeEditPolicy"
-          createCommandClassName="LiteralNullCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="LiteralNullEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralNull"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5180"
-            editPartClassName="LiteralNullNameEditPart"
-            itemSemanticEditPolicyClassName="LiteralNullNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2098"
-          editPartClassName="LiteralStringEditPart"
-          itemSemanticEditPolicyClassName="LiteralStringItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="LiteralStringCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="LiteralStringGraphicalNodeEditPolicy"
-          createCommandClassName="LiteralStringCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="LiteralStringEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralString"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5181"
-            editPartClassName="LiteralStringNameEditPart"
-            itemSemanticEditPolicyClassName="LiteralStringNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2099"
-          editPartClassName="LiteralUnlimitedNaturalEditPart"
-          itemSemanticEditPolicyClassName="LiteralUnlimitedNaturalItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="LiteralUnlimitedNaturalCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="LiteralUnlimitedNaturalGraphicalNodeEditPolicy"
-          createCommandClassName="LiteralUnlimitedNaturalCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="LiteralUnlimitedNaturalEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralUnlimitedNatural"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5182"
-            editPartClassName="LiteralUnlimitedNaturalNameEditPart"
-            itemSemanticEditPolicyClassName="LiteralUnlimitedNaturalNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2100"
-          editPartClassName="StringExpressionEditPart"
-          itemSemanticEditPolicyClassName="StringExpressionItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="StringExpressionCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="StringExpressionGraphicalNodeEditPolicy"
-          createCommandClassName="StringExpressionCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="StringExpressionEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StringExpression"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5183"
-            editPartClassName="StringExpressionNameEditPart"
-            itemSemanticEditPolicyClassName="StringExpressionNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2101"
-          editPartClassName="OpaqueExpressionEditPart"
-          itemSemanticEditPolicyClassName="OpaqueExpressionItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="OpaqueExpressionCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="OpaqueExpressionGraphicalNodeEditPolicy"
-          createCommandClassName="OpaqueExpressionCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="OpaqueExpressionEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/OpaqueExpression"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5184"
-            editPartClassName="OpaqueExpressionNameEditPart"
-            itemSemanticEditPolicyClassName="OpaqueExpressionNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2102"
-          editPartClassName="TimeExpressionEditPart"
-          itemSemanticEditPolicyClassName="TimeExpressionItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="TimeExpressionCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="TimeExpressionGraphicalNodeEditPolicy"
-          createCommandClassName="TimeExpressionCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="TimeExpressionEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeExpression"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5185"
-            editPartClassName="TimeExpressionNameEditPart"
-            itemSemanticEditPolicyClassName="TimeExpressionNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2103"
-          editPartClassName="ExpressionEditPart"
-          itemSemanticEditPolicyClassName="ExpressionItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ExpressionCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="ExpressionGraphicalNodeEditPolicy"
-          createCommandClassName="ExpressionCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="ExpressionEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Expression"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5186"
-            editPartClassName="ExpressionNameEditPart"
-            itemSemanticEditPolicyClassName="ExpressionNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2104"
-          editPartClassName="DurationEditPart"
-          itemSemanticEditPolicyClassName="DurationItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="DurationCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="DurationGraphicalNodeEditPolicy"
-          createCommandClassName="DurationCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="DurationEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Duration"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5187"
-            editPartClassName="DurationNameEditPart"
-            itemSemanticEditPolicyClassName="DurationNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2105"
-          editPartClassName="TimeIntervalEditPart"
-          itemSemanticEditPolicyClassName="TimeIntervalItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="TimeIntervalCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="TimeIntervalGraphicalNodeEditPolicy"
-          createCommandClassName="TimeIntervalCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="TimeIntervalEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeInterval"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5188"
-            editPartClassName="TimeIntervalNameEditPart"
-            itemSemanticEditPolicyClassName="TimeIntervalNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2106"
-          editPartClassName="DurationIntervalEditPart"
-          itemSemanticEditPolicyClassName="DurationIntervalItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="DurationIntervalCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="DurationIntervalGraphicalNodeEditPolicy"
-          createCommandClassName="DurationIntervalCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="DurationIntervalEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationInterval"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5189"
-            editPartClassName="DurationIntervalNameEditPart"
-            itemSemanticEditPolicyClassName="DurationIntervalNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2107"
-          editPartClassName="IntervalEditPart"
-          itemSemanticEditPolicyClassName="IntervalItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="IntervalCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="IntervalGraphicalNodeEditPolicy"
-          createCommandClassName="IntervalCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="IntervalEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interval"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5190"
-            editPartClassName="IntervalNameEditPart"
-            itemSemanticEditPolicyClassName="IntervalNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2108"
-          editPartClassName="InstanceValueEditPart"
-          itemSemanticEditPolicyClassName="InstanceValueItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="InstanceValueCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="InstanceValueGraphicalNodeEditPolicy"
-          createCommandClassName="InstanceValueCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="InstanceValueEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InstanceValue"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5191"
-            editPartClassName="InstanceValueNameEditPart"
-            itemSemanticEditPolicyClassName="InstanceValueNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="{0}  "
-              editorPattern="{0}"
-              editPattern="{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2109"
-          editPartClassName="CommentEditPart"
-          itemSemanticEditPolicyClassName="CommentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="CommentCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="CommentGraphicalNodeEditPolicy"
-          createCommandClassName="CommentCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            metamodelType="/0/@diagram/@childNodes.28/@elementType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.12">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5192"
-            editPartClassName="CommentBodyEditPart"
-            itemSemanticEditPolicyClassName="CommentBodyItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getCornerBentFigure"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.3">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2110"
-          editPartClassName="DurationConstraintEditPart"
-          itemSemanticEditPolicyClassName="DurationConstraintItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="DurationConstraintCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="DurationConstraintGraphicalNodeEditPolicy"
-          createCommandClassName="DurationConstraintCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationConstraint"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.13">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5193"
-            editPartClassName="DurationConstraintNameEditPart"
-            itemSemanticEditPolicyClassName="DurationConstraintNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern=""
-              editorPattern=""
-              editPattern="">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6035"
-            editPartClassName="DurationConstraintSpecificationEditPart"
-            itemSemanticEditPolicyClassName="DurationConstraintSpecificationItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getConstraintFigure"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.4">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            <editableMetaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2111"
-          editPartClassName="TimeConstraintEditPart"
-          itemSemanticEditPolicyClassName="TimeConstraintItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="TimeConstraintCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="TimeConstraintGraphicalNodeEditPolicy"
-          createCommandClassName="TimeConstraintCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="TimeConstraintEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeConstraint"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.13">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5194"
-            editPartClassName="TimeConstraintNameEditPart"
-            itemSemanticEditPolicyClassName="TimeConstraintNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern=""
-              editorPattern=""
-              editPattern="">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6036"
-            editPartClassName="TimeConstraintSpecificationEditPart"
-            itemSemanticEditPolicyClassName="TimeConstraintSpecificationItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getConstraintFigure"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.4">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            <editableMetaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2112"
-          editPartClassName="IntervalConstraintEditPart"
-          itemSemanticEditPolicyClassName="IntervalConstraintItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="IntervalConstraintCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="IntervalConstraintGraphicalNodeEditPolicy"
-          createCommandClassName="IntervalConstraintCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="IntervalConstraintEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/IntervalConstraint"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.13">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5195"
-            editPartClassName="IntervalConstraintNameEditPart"
-            itemSemanticEditPolicyClassName="IntervalConstraintNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern=""
-              editorPattern=""
-              editPattern="">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6037"
-            editPartClassName="IntervalConstraintSpecificationEditPart"
-            itemSemanticEditPolicyClassName="IntervalConstraintSpecificationItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getConstraintFigure"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.4">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            <editableMetaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2113"
-          editPartClassName="InteractionConstraintEditPart"
-          itemSemanticEditPolicyClassName="InteractionConstraintItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="InteractionConstraintCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="InteractionConstraintGraphicalNodeEditPolicy"
-          createCommandClassName="InteractionConstraintCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="InteractionConstraintEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionConstraint"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.13">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5196"
-            editPartClassName="InteractionConstraintNameEditPart"
-            itemSemanticEditPolicyClassName="InteractionConstraintNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern=""
-              editorPattern=""
-              editPattern="">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6038"
-            editPartClassName="InteractionConstraintSpecificationEditPart"
-            itemSemanticEditPolicyClassName="InteractionConstraintSpecificationItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getConstraintFigure"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.4">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            <editableMetaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <topLevelNodes
-          visualID="2114"
-          editPartClassName="ConstraintEditPart"
-          itemSemanticEditPolicyClassName="ConstraintItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ConstraintCanonicalEditPolicy"
-          graphicalNodeEditPolicyClassName="ConstraintGraphicalNodeEditPolicy"
-          createCommandClassName="ConstraintCreateCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="ConstraintEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
-        <modelFacet>
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.13">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            </initializers>
-          </modelElementInitializer>
-        </modelFacet>
-        <labels
-            visualID="5197"
-            editPartClassName="ConstraintNameEditPart"
-            itemSemanticEditPolicyClassName="ConstraintNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern=""
-              editorPattern=""
-              editPattern="">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6039"
-            editPartClassName="ConstraintSpecificationEditPart"
-            itemSemanticEditPolicyClassName="ConstraintSpecificationItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getConstraintFigure"
-              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.4">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-            <editableMetaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
-          </modelFacet>
-        </labels>
-      </topLevelNodes>
-      <links
-          visualID="4022"
-          editPartClassName="BehaviorPortLinkEditPart"
-          itemSemanticEditPolicyClassName="BehaviorPortLinkItemSemanticEditPolicy"
-          createCommandClassName="BehaviorPortLinkCreateCommand"
-          reorientCommandClassName="BehaviorPortLinkReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:NotationType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.NoConnectableEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.COMPONENT_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.NoDeleteFromDiagramEditPolicy"/>
-      </links>
-      <links
-          visualID="4001"
-          editPartClassName="LinkDescriptorEditPart"
-          itemSemanticEditPolicyClassName="LinkDescriptorItemSemanticEditPolicy"
-          createCommandClassName="LinkDescriptorCreateCommand"
-          reorientCommandClassName="LinkDescriptorReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:NotationType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>
-      </links>
-      <links
-          visualID="4002"
-          editPartClassName="CommentAnnotatedElementEditPart"
-          itemSemanticEditPolicyClassName="CommentAnnotatedElementItemSemanticEditPolicy"
-          createCommandClassName="CommentAnnotatedElementCreateCommand"
-          reorientCommandClassName="CommentAnnotatedElementReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            displayName="CommentAnnotatedElement"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>
-        <modelFacet
-            xsi:type="gmfgen:FeatureLinkModelFacet">
-          <metaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/annotatedElement"/>
-        </modelFacet>
-      </links>
-      <links
-          visualID="4003"
-          editPartClassName="ConstraintConstrainedElementEditPart"
-          itemSemanticEditPolicyClassName="ConstraintConstrainedElementItemSemanticEditPolicy"
-          createCommandClassName="ConstraintConstrainedElementCreateCommand"
-          reorientCommandClassName="ConstraintConstrainedElementReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            displayName="ConstraintConstrainedElement"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>
-        <modelFacet
-            xsi:type="gmfgen:FeatureLinkModelFacet">
-          <metaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/constrainedElement"/>
-        </modelFacet>
-      </links>
-      <links
-          visualID="4004"
-          editPartClassName="ComponentRealizationEditPart"
-          itemSemanticEditPolicyClassName="ComponentRealizationItemSemanticEditPolicy"
-          createCommandClassName="ComponentRealizationCreateCommand"
-          reorientCommandClassName="ComponentRealizationReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="ComponentRealizationEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ComponentRealization"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>
-        </modelFacet>
-        <labels
-            visualID="6001"
-            editPartClassName="ComponentRealizationNameEditPart"
-            itemSemanticEditPolicyClassName="ComponentRealizationNameItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6015"
-            editPartClassName="ComponentRealizationAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="ComponentRealizationAppliedStereotypeItemSemanticEditPolicy"
-            readOnly="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="30"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.1"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </links>
-      <links
-          visualID="4005"
-          editPartClassName="InterfaceRealizationEditPart"
-          itemSemanticEditPolicyClassName="InterfaceRealizationItemSemanticEditPolicy"
-          createCommandClassName="InterfaceRealizationCreateCommand"
-          reorientCommandClassName="InterfaceRealizationReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="InterfaceRealizationEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InterfaceRealization"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>
-        </modelFacet>
-        <labels
-            visualID="6002"
-            editPartClassName="InterfaceRealizationNameEditPart"
-            itemSemanticEditPolicyClassName="InterfaceRealizationNameItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6016"
-            editPartClassName="InterfaceRealizationAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="InterfaceRealizationAppliedStereotypeItemSemanticEditPolicy"
-            readOnly="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="30"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.1"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </links>
-      <links
-          visualID="4011"
-          editPartClassName="SubstitutionEditPart"
-          itemSemanticEditPolicyClassName="SubstitutionItemSemanticEditPolicy"
-          createCommandClassName="SubstitutionCreateCommand"
-          reorientCommandClassName="SubstitutionReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="SubstitutionEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeSubstitutionLabelDisplayEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Substitution"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>
-        </modelFacet>
-        <labels
-            visualID="6003"
-            editPartClassName="SubstitutionNameEditPart"
-            itemSemanticEditPolicyClassName="SubstitutionNameItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6017"
-            editPartClassName="SubstitutionAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="SubstitutionAppliedStereotypeItemSemanticEditPolicy"
-            readOnly="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="30"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.1"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </links>
-      <links
-          visualID="4006"
-          editPartClassName="RealizationEditPart"
-          itemSemanticEditPolicyClassName="RealizationItemSemanticEditPolicy"
-          createCommandClassName="RealizationCreateCommand"
-          reorientCommandClassName="RealizationReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="RealizationEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Realization"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>
-        </modelFacet>
-        <labels
-            visualID="6004"
-            editPartClassName="RealizationNameEditPart"
-            itemSemanticEditPolicyClassName="RealizationNameItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6018"
-            editPartClassName="RealizationAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="RealizationAppliedStereotypeItemSemanticEditPolicy"
-            readOnly="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="30"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.1"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </links>
-      <links
-          visualID="4012"
-          editPartClassName="ManifestationEditPart"
-          itemSemanticEditPolicyClassName="ManifestationItemSemanticEditPolicy"
-          createCommandClassName="ManifestationCreateCommand"
-          reorientCommandClassName="ManifestationReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="ManifestationEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeManifestationLabelDisplayEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Manifestation"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>
-        </modelFacet>
-        <labels
-            visualID="6005"
-            editPartClassName="ManifestationNameEditPart"
-            itemSemanticEditPolicyClassName="ManifestationNameItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6019"
-            editPartClassName="ManifestationAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="ManifestationAppliedStereotypeItemSemanticEditPolicy"
-            readOnly="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="30"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.1"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </links>
-      <links
-          visualID="4007"
-          editPartClassName="AbstractionEditPart"
-          itemSemanticEditPolicyClassName="AbstractionItemSemanticEditPolicy"
-          createCommandClassName="AbstractionCreateCommand"
-          reorientCommandClassName="AbstractionReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="AbstractionEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeAbstractionLabelDisplayEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Abstraction"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>
-        </modelFacet>
-        <labels
-            visualID="6006"
-            editPartClassName="AbstractionNameEditPart"
-            itemSemanticEditPolicyClassName="AbstractionNameItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6020"
-            editPartClassName="AbstractionAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="AbstractionAppliedStereotypeItemSemanticEditPolicy"
-            readOnly="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="30"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.1"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </links>
-      <links
-          visualID="4008"
-          editPartClassName="UsageEditPart"
-          itemSemanticEditPolicyClassName="UsageItemSemanticEditPolicy"
-          createCommandClassName="UsageCreateCommand"
-          reorientCommandClassName="UsageReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="UsageEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeUsageLabelDisplayEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Usage"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>
-        </modelFacet>
-        <labels
-            visualID="6007"
-            editPartClassName="UsageNameEditPart"
-            itemSemanticEditPolicyClassName="UsageNameItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6021"
-            editPartClassName="UsageAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="UsageAppliedStereotypeItemSemanticEditPolicy"
-            readOnly="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="30"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.1"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </links>
-      <links
-          visualID="4009"
-          editPartClassName="DeploymentEditPart"
-          itemSemanticEditPolicyClassName="DeploymentItemSemanticEditPolicy"
-          createCommandClassName="DeploymentCreateCommand"
-          reorientCommandClassName="DeploymentReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="DeploymentEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeDeploymentLabelDisplayEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Deployment"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>
-        </modelFacet>
-        <labels
-            visualID="6008"
-            editPartClassName="DeploymentNameEditPart"
-            itemSemanticEditPolicyClassName="DeploymentNameItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6022"
-            editPartClassName="DeploymentAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="DeploymentAppliedStereotypeItemSemanticEditPolicy"
-            readOnly="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="30"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.1"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </links>
-      <links
-          visualID="4017"
-          editPartClassName="RoleBindingEditPart"
-          itemSemanticEditPolicyClassName="RoleBindingItemSemanticEditPolicy"
-          sourceReorientingAllowed="false"
-          createCommandClassName="RoleBindingCreateCommand"
-          reorientCommandClassName="RoleBindingReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017"
-            displayName="RoleBinding"
-            editHelperClassName="RoleBindingEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.RoleBindingFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet"
-            modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.4">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>
-        </modelFacet>
-        <labels
-            visualID="6027"
-            editPartClassName="RoleBindingRoleNameEditPart"
-            itemSemanticEditPolicyClassName="RoleBindingRoleNameItemSemanticEditPolicy"
-            readOnly="true"
-            alignment="SOURCE">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getRoleLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="20"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.2">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6028"
-            editPartClassName="RoleBindingAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="RoleBindingAppliedStereotypeItemSemanticEditPolicy"
-            readOnly="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.1"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <creationConstraints
-            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.5"
-            targetEnd="/0/@expressionProviders/@providers.0/@expressions.6"/>
-      </links>
-      <links
-          visualID="4010"
-          editPartClassName="DependencyEditPart"
-          itemSemanticEditPolicyClassName="DependencyItemSemanticEditPolicy"
-          createCommandClassName="DependencyCreateCommand"
-          reorientCommandClassName="DependencyReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="DependencyEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet"
-            modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.3">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>
-        </modelFacet>
-        <labels
-            visualID="6009"
-            editPartClassName="DependencyNameEditPart"
-            itemSemanticEditPolicyClassName="DependencyNameItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6023"
-            editPartClassName="DependencyAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="DependencyAppliedStereotypeItemSemanticEditPolicy"
-            readOnly="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.1"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </links>
-      <links
-          visualID="4013"
-          editPartClassName="ConnectorEditPart"
-          itemSemanticEditPolicyClassName="ConnectorItemSemanticEditPolicy"
-          createCommandClassName="ConnectorCreateCommand"
-          reorientCommandClassName="ConnectorReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="ConnectorEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ConnectorFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedConnector"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedConnector"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector/end"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector/end"/>
-        </modelFacet>
-        <labels
-            visualID="6025"
-            editPartClassName="ConnectorAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="ConnectorAppliedStereotypeItemSemanticEditPolicy"
-            readOnly="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.1"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6050"
-            editPartClassName="ConnectorNameEditPart"
-            itemSemanticEditPolicyClassName="ConnectorNameItemSemanticEditPolicy"
-            elementIcon="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getNameLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="-20"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern=""
-              editorPattern=""
-              editPattern="">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6051"
-            editPartClassName="ConnectorMultiplicitySourceEditPart"
-            itemSemanticEditPolicyClassName="ConnectorMultiplicitySourceItemSemanticEditPolicy"
-            readOnly="true"
-            alignment="SOURCE">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getMultiplicitySourceLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="20"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="sourceMul{0}"
-              editorPattern="sourceMul{0}"
-              editPattern="sourceMul{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <labels
-            visualID="6052"
-            editPartClassName="ConnectorMultiplicityTargetEditPart"
-            itemSemanticEditPolicyClassName="ConnectorMultiplicityTargetItemSemanticEditPolicy"
-            readOnly="true"
-            alignment="TARGET">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getMultiplicityTargetLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="20"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.0"
-              viewPattern="targetMul{0}"
-              editorPattern="targetMul{0}"
-              editPattern="targetMul{0}">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-      </links>
-      <links
-          visualID="4015"
-          editPartClassName="GeneralizationEditPart"
-          itemSemanticEditPolicyClassName="GeneralizationItemSemanticEditPolicy"
-          createCommandClassName="GeneralizationCreateCommand"
-          reorientCommandClassName="GeneralizationReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"
-            editHelperClassName="GeneralizationEditHelper"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.GeneralizationFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/generalization"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/generalization"/>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization/specific"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization/general"/>
-        </modelFacet>
-        <labels
-            visualID="6024"
-            editPartClassName="GeneralizationAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="GeneralizationAppliedStereotypeItemSemanticEditPolicy"
-            readOnly="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="60"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.1"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization/isSubstitutable"/>
-          </modelFacet>
-        </labels>
-      </links>
-      <links
-          visualID="4018"
-          editPartClassName="TimeObservationEventEditPart"
-          itemSemanticEditPolicyClassName="TimeObservationEventSemanticEditPolicy"
-          createCommandClassName="TimeObservationEventCreateCommand"
-          reorientCommandClassName="TimeObservationEventReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            displayName="TimeObservationEvent"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>
-        <modelFacet
-            xsi:type="gmfgen:FeatureLinkModelFacet">
-          <metaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeObservation/event"/>
-        </modelFacet>
-      </links>
-      <links
-          visualID="4019"
-          editPartClassName="DurationObservationEventEditPart"
-          itemSemanticEditPolicyClassName="DurationObservationEventItemSemanticEditPolicy"
-          createCommandClassName="DurationObservationEventCreateCommand"
-          reorientCommandClassName="DurationObservationEventReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            displayName="DurationObservationEvent"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>
-        <modelFacet
-            xsi:type="gmfgen:FeatureLinkModelFacet">
-          <metaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationObservation/event"/>
-        </modelFacet>
-      </links>
-      <links
-          visualID="4020"
-          editPartClassName="RepresentationEditPart"
-          itemSemanticEditPolicyClassName="RepresentationItemSemanticEditPolicy"
-          createCommandClassName="RepresentationCreateCommand"
-          reorientCommandClassName="RepresentationReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:SpecializationType"
-            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.composite.Representation_4020"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.RepresentationFigure">
-          <attributes
-              xsi:type="gmfgen:ColorAttributes"
-              foregroundColor="black"/>
-        </viewmap>
-        <modelFacet
-            xsi:type="gmfgen:FeatureLinkModelFacet">
-          <metaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationItem/represented"/>
-        </modelFacet>
-        <labels
-            visualID="6030"
-            editPartClassName="RepresentationTagLabelEditPart"
-            itemSemanticEditPolicyClassName="RepresentationTagLabelItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getTagLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="15"/>
-          </viewmap>
-        </labels>
-        <creationConstraints
-            targetEnd="/0/@expressionProviders/@providers.0/@expressions.8"/>
-      </links>
-      <links
-          visualID="4021"
-          editPartClassName="InformationFlowEditPart"
-          itemSemanticEditPolicyClassName="InformationFlowItemSemanticEditPolicy"
-          createCommandClassName="InformationFlowCreateCommand"
-          reorientCommandClassName="InformationFlowReorientCommand">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-        <elementType
-            xsi:type="gmfgen:MetamodelType"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationFlowFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeInformationFlowLabelDisplayEditPolicy"/>
-        <modelFacet
-            xsi:type="gmfgen:TypeLinkModelFacet">
-          <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationFlow"/>
-          <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
-          <modelElementInitializer
-              xsi:type="gmfgen:GenFeatureSeqInitializer">
-            <initializers
-                xsi:type="gmfgen:GenFeatureValueSpec"
-                value="/0/@expressionProviders/@providers.0/@expressions.0">
-              <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-            </initializers>
-          </modelElementInitializer>
-          <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationFlow/informationSource"/>
-          <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationFlow/informationTarget"/>
-        </modelFacet>
-        <labels
-            visualID="6031"
-            editPartClassName="InformationFlowConveyedLabelEditPart"
-            itemSemanticEditPolicyClassName="InformationFlowConveyedLabelItemSemanticEditPolicy">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getConveyedLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="30"/>
-          </viewmap>
-          <behaviour
-              xsi:type="gmfgen:CustomBehaviour"
-              key="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.AbstractCustomLabelEditPolicy.SPECIFIC_NAME_LABEL_POLICY"
-              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.InformationFlowCustomLabelEditPolicy"/>
-        </labels>
-        <labels
-            visualID="6032"
-            editPartClassName="InformationFlowAppliedStereotypeEditPart"
-            itemSemanticEditPolicyClassName="InformationFlowAppliedStereotypeItemSemanticEditPolicy"
-            readOnly="true">
-          <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-          <viewmap
-              xsi:type="gmfgen:ParentAssignedViewmap"
-              getterName="getAppliedStereotypeLabel"
-              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes
-                xsi:type="gmfgen:LabelOffsetAttributes"
-                y="15"/>
-          </viewmap>
-          <modelFacet
-              xsi:type="gmfgen:FeatureLabelModelFacet"
-              parser="/0/@labelParsers/@implementations.1"
-              viewPattern="&lt;&lt;{0}>>"
-              editorPattern="&lt;&lt;{0}>>"
-              editPattern="&lt;&lt;{0}>>">
-            <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-          </modelFacet>
-        </labels>
-        <creationConstraints
-            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.9"
-            targetEnd="/0/@expressionProviders/@providers.0/@expressions.10"/>
-      </links>
-      <compartments
-          visualID="7033"
-          editPartClassName="DataTypeAttributeCompartmentEditPart"
-          itemSemanticEditPolicyClassName="DataTypeAttributeCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="DataTypeAttributeCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.34"
-          title="attributes"
-          node="/0/@diagram/@topLevelNodes.15">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getAttributeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7034"
-          editPartClassName="DataTypeOperationCompartmentEditPart"
-          itemSemanticEditPolicyClassName="DataTypeOperationCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="DataTypeOperationCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.35"
-          title="operations"
-          node="/0/@diagram/@topLevelNodes.15">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getOperationCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7036"
-          editPartClassName="DataTypeAttributeCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="DataTypeAttributeCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="DataTypeAttributeCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.34"
-          title="attributes"
-          node="/0/@diagram/@childNodes.21">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getAttributeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7037"
-          editPartClassName="DataTypeOperationCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="DataTypeOperationCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="DataTypeOperationCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.35"
-          title="operations"
-          node="/0/@diagram/@childNodes.21">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getOperationCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7048"
-          editPartClassName="EnumerationEnumerationLiteralCompartmentEditPart"
-          itemSemanticEditPolicyClassName="EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="EnumerationEnumerationLiteralCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.36"
-          title="literals"
-          node="/0/@diagram/@topLevelNodes.14">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getEnumerationLiteralCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7049"
-          editPartClassName="EnumerationEnumerationLiteralCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="EnumerationEnumerationLiteralCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.36"
-          title="literals"
-          node="/0/@diagram/@childNodes.20">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getEnumerationLiteralCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7050"
-          editPartClassName="ActivityCompositeCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="ActivityCompositeCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="ActivityCompositeCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@childNodes.6"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7051"
-          editPartClassName="InteractionCompositeCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="InteractionCompositeCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="InteractionCompositeCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@childNodes.7"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7052"
-          editPartClassName="ProtocolStateMachineCompositeCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="ProtocolStateMachineCompositeCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@childNodes.8"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7053"
-          editPartClassName="StateMachineCompositeCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="StateMachineCompositeCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="StateMachineCompositeCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@childNodes.9"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7054"
-          editPartClassName="FunctionBehaviorCompositeCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="FunctionBehaviorCompositeCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@childNodes.10"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7055"
-          editPartClassName="OpaqueBehaviorCompositeCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="OpaqueBehaviorCompositeCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@childNodes.11"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7056"
-          editPartClassName="ComponentCompositeCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@childNodes.12"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7057"
-          editPartClassName="DeviceCompositeCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="DeviceCompositeCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="DeviceCompositeCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@childNodes.13"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7058"
-          editPartClassName="ExecutionEnvironmentCompositeCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="ExecutionEnvironmentCompositeCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@childNodes.14"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7059"
-          editPartClassName="NodeCompositeCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="NodeCompositeCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="NodeCompositeCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@childNodes.15"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7060"
-          editPartClassName="ClassCompositeCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="ClassCompositeCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="ClassCompositeCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.0"
-          title="internal structure"
-          node="/0/@diagram/@childNodes.16"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7061"
-          editPartClassName="CollaborationCompositeCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="CollaborationCompositeCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="CollaborationCompositeCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@childNodes.17"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomCollaborationCompositeCompartmentItemSemanticEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7063"
-          editPartClassName="ActivityCompositeCompartmentEditPart"
-          itemSemanticEditPolicyClassName="ActivityCompositeCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ActivityCompositeCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@topLevelNodes.0"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7064"
-          editPartClassName="InteractionCompositeCompartmentEditPart"
-          itemSemanticEditPolicyClassName="InteractionCompositeCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="InteractionCompositeCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@topLevelNodes.1"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7065"
-          editPartClassName="ProtocolStateMachineCompositeCompartmentEditPart"
-          itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ProtocolStateMachineCompositeCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@topLevelNodes.2"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7066"
-          editPartClassName="StateMachineCompositeCompartmentEditPart"
-          itemSemanticEditPolicyClassName="StateMachineCompositeCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="StateMachineCompositeCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@topLevelNodes.3"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7067"
-          editPartClassName="FunctionBehaviorCompositeCompartmentEditPart"
-          itemSemanticEditPolicyClassName="FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="FunctionBehaviorCompositeCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@topLevelNodes.4"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7068"
-          editPartClassName="OpaqueBehaviorCompositeCompartmentEditPart"
-          itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="OpaqueBehaviorCompositeCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@topLevelNodes.5"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7069"
-          editPartClassName="ComponentCompositeCompartmentEditPart"
-          itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@topLevelNodes.6"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7070"
-          editPartClassName="DeviceCompositeCompartmentEditPart"
-          itemSemanticEditPolicyClassName="DeviceCompositeCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="DeviceCompositeCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@topLevelNodes.7"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7071"
-          editPartClassName="ExecutionEnvironmentCompositeCompartmentEditPart"
-          itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ExecutionEnvironmentCompositeCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@topLevelNodes.8"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7072"
-          editPartClassName="NodeCompositeCompartmentEditPart"
-          itemSemanticEditPolicyClassName="NodeCompositeCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="NodeCompositeCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@topLevelNodes.9"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7073"
-          editPartClassName="ClassCompositeCompartmentEditPart"
-          itemSemanticEditPolicyClassName="ClassCompositeCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="ClassCompositeCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32"
-          title="internal structure"
-          node="/0/@diagram/@topLevelNodes.10"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7075"
-          editPartClassName="CollaborationCompositeCompartmentEditPart"
-          itemSemanticEditPolicyClassName="CollaborationCompositeCompartmentItemSemanticEditPolicy"
-          canonicalEditPolicyClassName="CollaborationCompositeCompartmentCanonicalEditPolicy"
-          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-          title="internal structure"
-          node="/0/@diagram/@topLevelNodes.11"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomCollaborationCompositeCompartmentItemSemanticEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-      </compartments>
-      <compartments
-          visualID="7077"
-          editPartClassName="PropertyPartCompartmentEditPartCN"
-          itemSemanticEditPolicyClassName="PropertyPartCompartmentItemSemanticEditPolicyCN"
-          canonicalEditPolicyClassName="PropertyPartCompartmentCanonicalEditPolicyCN"
-          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.28"
-          title="internal structure"
-          node="/0/@diagram/@childNodes.3"
-          listLayout="false">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getCompositeCompartmentFigure"
-            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="&quot;REMOVE_ORPHAN_VIEW&quot;"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomPropertyPartCompartmentItemSemanticEditPolicyCN"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>
-        <behaviour
-            xsi:type="gmfgen:CustomBehaviour"
-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"
-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>
-      </compartments>
-      <palette>
-        <groups
-            title="Nodes"
-            description="Nodes"
-            largeIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-            smallIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-            createMethodName="createNodesGroup"
-            id="&quot;composite.group.nodes&quot;">
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Class"
-              description="Create new Class"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
-              createMethodName="createClassCreationTool"
-              id="&quot;composite.tool.class&quot;"
-              genNodes="/0/@diagram/@topLevelNodes.10 /0/@diagram/@childNodes.16"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Property"
-              description="Create new Property"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
-              createMethodName="createPropertyCreationTool"
-              id="&quot;composite.tool.property&quot;"
-              genNodes="/0/@diagram/@childNodes.3"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Port"
-              description="Create new Port"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
-              createMethodName="createPortCreationTool"
-              id="&quot;composite.tool.port&quot;"
-              genNodes="/0/@diagram/@childNodes.1"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Collaboration"
-              description="Create new Collaboration"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif"
-              createMethodName="createCollaborationCreationTool"
-              id="&quot;composite.tool.collaboration&quot;"
-              genNodes="/0/@diagram/@childNodes.17 /0/@diagram/@topLevelNodes.11"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="CollaborationRole"
-              description="Create new CollaborationRole"
-              largeIconPath="icons/obj16/CollaborationRole.gif"
-              smallIconPath="icons/obj16/CollaborationRole.gif"
-              createMethodName="createCollaborationRoleCreationTool"
-              id="&quot;composite.tool.collaborationrole&quot;"
-              genNodes="/0/@diagram/@childNodes.4"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="CollaborationUse"
-              description="Create new CollaborationUse"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif"
-              createMethodName="createCollaborationUseCreationTool"
-              id="&quot;composite.tool.collaborationuse&quot;"
-              genNodes="/0/@diagram/@childNodes.5"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Comment"
-              description="Create new Comment"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
-              createMethodName="createCommentCreationTool"
-              id="&quot;composite.tool.comment&quot;"
-              genNodes="/0/@diagram/@childNodes.28 /0/@diagram/@topLevelNodes.43"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Constraint"
-              description="Create new Constraint"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
-              createMethodName="createConstraintCreationTool"
-              id="&quot;composite.tool.constraint&quot;"
-              genNodes="/0/@diagram/@topLevelNodes.48 /0/@diagram/@childNodes.33"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="TimeObservation"
-              description="Create new TimeObservation"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"
-              createMethodName="createTimeObservationCreationTool"
-              id="&quot;composite.tool.timeobservation&quot;"
-              genNodes="/0/@diagram/@topLevelNodes.28"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="DurationObservation"
-              description="Create new DurationObservation"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"
-              createMethodName="createDurationObservationCreationTool"
-              id="&quot;composite.tool.durationobservation&quot;"
-              genNodes="/0/@diagram/@topLevelNodes.27"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="InformationItem"
-              description="Create new InformationItem"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif"
-              createMethodName="createInformationItemCreationTool"
-              id="&quot;composite.tool.informationitem&quot;"
-              genNodes="/0/@diagram/@childNodes.25 /0/@diagram/@topLevelNodes.19"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Parameter"
-              description="Create new Parameter"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif"
-              createMethodName="createParameterCreationTool"
-              id="&quot;composite.tool.parameter&quot;"
-              genNodes="/0/@diagram/@childNodes.2"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Activity"
-              description="Create new Activity"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"
-              createMethodName="createActivityCreationTool"
-              id="&quot;composite.tool.activity&quot;"
-              genNodes="/0/@diagram/@childNodes.6 /0/@diagram/@topLevelNodes.0"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Interaction"
-              description="Create new Interaction"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif"
-              createMethodName="createInteractionCreationTool"
-              id="&quot;composite.tool.interaction&quot;"
-              genNodes="/0/@diagram/@childNodes.7 /0/@diagram/@topLevelNodes.1"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="ProtocolStateMachine"
-              description="Create new ProtocolStateMachine"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif"
-              createMethodName="createProtocolStateMachineCreationTool"
-              id="&quot;composite.tool.protocolstatemachine&quot;"
-              genNodes="/0/@diagram/@childNodes.8 /0/@diagram/@topLevelNodes.2"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="StateMachine"
-              description="Create new StateMachine"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif"
-              createMethodName="createStateMachineCreationTool"
-              id="&quot;composite.tool.statemachine&quot;"
-              genNodes="/0/@diagram/@childNodes.9 /0/@diagram/@topLevelNodes.3"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="FunctionBehavior"
-              description="Create new FunctionBehavior"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif"
-              createMethodName="createFunctionBehaviorCreationTool"
-              id="&quot;composite.tool.functionbehavior&quot;"
-              genNodes="/0/@diagram/@childNodes.10 /0/@diagram/@topLevelNodes.4"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="OpaqueBehavior"
-              description="Create new OpaqueBehavior"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif"
-              createMethodName="createOpaqueBehaviorCreationTool"
-              id="&quot;composite.tool.opaquebehavior&quot;"
-              genNodes="/0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.5"/>
-        </groups>
-        <groups
-            title="Edges"
-            description="Edges"
-            largeIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-            smallIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-            createMethodName="createEdgesGroup"
-            id="&quot;composite.group.edges&quot;">
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Link"
-              description="Create new Link (Comment / Constraint)"
-              largeIconPath="icons/obj16/Link.gif"
-              smallIconPath="icons/obj16/Link.gif"
-              createMethodName="createLinkCreationTool"
-              id="&quot;composite.tool.link&quot;"
-              genLinks="/0/@diagram/@links.2 /0/@diagram/@links.3 /0/@diagram/@links.16 /0/@diagram/@links.17"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Connector"
-              description="Create new Connector"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"
-              createMethodName="createConnectorCreationTool"
-              id="&quot;composite.tool.connector&quot;"
-              genLinks="/0/@diagram/@links.14"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="RoleBinding"
-              description="Create new RoleBinding"
-              largeIconPath="icons/obj16/CollaborationRoleBinding.gif"
-              smallIconPath="icons/obj16/CollaborationRoleBinding.gif"
-              createMethodName="createRoleBindingCreationTool"
-              id="&quot;composite.tool.rolebinding&quot;"
-              genLinks="/0/@diagram/@links.12"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Generalization"
-              description="Create new Generalization"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"
-              createMethodName="createGeneralizationCreationTool"
-              id="&quot;composite.tool.generalization&quot;"
-              genLinks="/0/@diagram/@links.15"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Realization"
-              description="Create new Realization"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif"
-              createMethodName="createRealizationCreationTool"
-              id="&quot;composite.tool.realization&quot;"
-              genLinks="/0/@diagram/@links.7"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Substitution"
-              description="Create new Substitution"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"
-              createMethodName="createSubstitutionCreationTool"
-              id="&quot;composite.tool.substitution&quot;"
-              genLinks="/0/@diagram/@links.6"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Abstraction"
-              description="Create new Abstraction"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"
-              createMethodName="createAbstractionCreationTool"
-              id="&quot;composite.tool.abstraction&quot;"
-              genLinks="/0/@diagram/@links.9"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Usage"
-              description="Create new Usage"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"
-              createMethodName="createUsageCreationTool"
-              id="&quot;composite.tool.usage&quot;"
-              genLinks="/0/@diagram/@links.10"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Dependency"
-              description="Create new Dependency"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
-              createMethodName="createDependencyCreationTool"
-              id="&quot;composite.tool.dependency&quot;"
-              genLinks="/0/@diagram/@links.13"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="Representation"
-              description="Create new representation for an InformationItem"
-              largeIconPath="icons/obj16/Representation.gif"
-              smallIconPath="icons/obj16/Representation.gif"
-              createMethodName="createRepresentationCreationTool"
-              id="&quot;composite.tool.representation&quot;"
-              genLinks="/0/@diagram/@links.18"/>
-          <entries
-              xsi:type="gmfgen:ToolEntry"
-              title="InformationFlow"
-              description="Create new InformationFlow"
-              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif"
-              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif"
-              createMethodName="createInformationFlowCreationTool"
-              id="&quot;composite.tool.informationflow&quot;"
-              genLinks="/0/@diagram/@links.19"/>
-        </groups>
-      </palette>
-      <preferencePages
-          xsi:type="gmfgen:GenStandardPreferencePage"
-          iD="org.eclipse.uml2.uml.diagram.general"
-          name="UML Diagram">
-        <children
-            xsi:type="gmfgen:GenStandardPreferencePage"
-            iD="org.eclipse.uml2.uml.diagram.appearance"
-            name="Appearance"
-            kind="Appearance"/>
-        <children
-            xsi:type="gmfgen:GenStandardPreferencePage"
-            iD="org.eclipse.uml2.uml.diagram.connections"
-            name="Connections"
-            kind="Connections"/>
-        <children
-            xsi:type="gmfgen:GenStandardPreferencePage"
-            iD="org.eclipse.uml2.uml.diagram.printing"
-            name="Printing"
-            kind="Printing"/>
-        <children
-            xsi:type="gmfgen:GenStandardPreferencePage"
-            iD="org.eclipse.uml2.uml.diagram.rulersAndGrid"
-            name="Rulers And Grid"
-            kind="RulersAndGrid"/>
-      </preferencePages>
-    </diagram>
-    <plugin
-        iD="org.eclipse.papyrus.uml.diagram.composite"
-        name="Papyrus Composite Structure Diagram "
-        provider="Eclipse Modeling Project">
-      <requiredPlugins>org.eclipse.draw2d</requiredPlugins>
-      <requiredPlugins>org.eclipse.gmf.runtime.draw2d.ui</requiredPlugins>
-    </plugin>
-    <editor/>
-    <diagramUpdater
-        nodeDescriptorClassName="UMLNodeDescriptor"/>
-    <propertySheet>
-      <tabs
-          xsi:type="gmfgen:GenStandardPropertyTab"
-          iD="appearance"/>
-      <tabs
-          xsi:type="gmfgen:GenStandardPropertyTab"
-          iD="diagram"/>
-      <tabs
-          xsi:type="gmfgen:GenCustomPropertyTab"
-          iD="domain"
-          label="Core">
-        <filter
-            xsi:type="gmfgen:TypeTabFilter">
-          <types>org.eclipse.gmf.runtime.notation.View</types>
-          <types>org.eclipse.gef.EditPart</types>
-          <generatedTypes>abstractNavigatorItem</generatedTypes>
-        </filter>
-      </tabs>
-    </propertySheet>
-    <domainGenModel
-        href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#/"/>
-    <expressionProviders>
-      <providers
-          xsi:type="gmfgen:GenJavaExpressionProvider"
-          injectExpressionBody="true">
-        <expressions
-            body="return org.eclipse.papyrus.uml.tools.utils.NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());"/>
-        <expressions
-            body="return it.getBody();"/>
-        <expressions
-            xsi:type="gmfgen:GenConstraint"
-            body="// Property / CollaborationRole constraint&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;// Restriction for the case where domainElement owner is a Collaboration&#xD;&#xA;&#x9;&#x9;// If the domainElement is not referenced as one of its owner role&#xD;&#xA;&#x9;&#x9;// then it should be considered as a Property creation on Collaboration,&#xD;&#xA;&#x9;&#x9;// else the test should return false and be considered as a representation of&#xD;&#xA;&#x9;&#x9;// a collaboration role (ConnectableElement).&#xD;&#xA;&#x9;&#x9;if (containerView.getElement() instanceof org.eclipse.uml2.uml.Collaboration) {&#xD;&#xA;&#x9;&#x9;&#x9;org.eclipse.uml2.uml.Collaboration graphicalParent = (org.eclipse.uml2.uml.Collaboration) containerView.getElement();&#xD;&#xA;&#x9;&#x9;&#x9;if (graphicalParent.getCollaborationRoles().contains(domainElement)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;// General case : no restriction&#xD;&#xA;&#x9;&#x9;return true;"/>
-        <expressions
-            xsi:type="gmfgen:GenConstraint"
-            body="// Test if the dependency is not a RoleBinding&#xD;&#xA;&#x9;&#x9;if (domainElement.getOwner() instanceof org.eclipse.uml2.uml.CollaborationUse) {&#xD;&#xA;&#x9;&#x9;&#x9;org.eclipse.uml2.uml.CollaborationUse owner = (org.eclipse.uml2.uml.CollaborationUse) domainElement.getOwner();&#xD;&#xA;&#x9;&#x9;&#x9;if (owner.getRoleBindings().contains(domainElement)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;return true;"/>
-        <expressions
-            xsi:type="gmfgen:GenConstraint"
-            body="// Test if the dependency is a RoleBinding&#xD;&#xA;&#x9;&#x9;if (domainElement.getOwner() instanceof org.eclipse.uml2.uml.CollaborationUse) {&#xD;&#xA;&#x9;&#x9;&#x9;org.eclipse.uml2.uml.CollaborationUse owner = (org.eclipse.uml2.uml.CollaborationUse) domainElement.getOwner();&#xD;&#xA;&#x9;&#x9;&#x9;if (owner.getRoleBindings().contains(domainElement)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;return true;&#xD;&#xA;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;return false;"/>
-        <expressions
-            xsi:type="gmfgen:GenConstraint"
-            body="// RoleBinding source constraint&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if ((source != null) &amp;&amp; !(source instanceof org.eclipse.uml2.uml.CollaborationUse)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;// RoleBinding source has a type&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if ((source != null) &amp;&amp; (((org.eclipse.uml2.uml.CollaborationUse) source).getType() == null)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}"/>
-        <expressions
-            xsi:type="gmfgen:GenConstraint"
-            body="// RoleBinding target constraint&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if ((target != null) &amp;&amp; !(target instanceof org.eclipse.uml2.uml.ConnectableElement)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;// RoleBinding source and target have the same semantic parent&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if ((source != null) &amp;&amp; (target != null) &amp;&amp; (source.getOwner() != target.getOwner())) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}"/>
-        <expressions
-            body="// InformationItem is Abstract&#xD;&#xA;return true;"/>
-        <expressions
-            xsi:type="gmfgen:GenConstraint"
-            body="// Represented InformationItem Target&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if (target != null) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (!((target instanceof org.eclipse.uml2.uml.Class)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Interface)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.InformationItem)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Signal) || &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;(target instanceof org.eclipse.uml2.uml.Component))) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}"/>
-        <expressions
-            xsi:type="gmfgen:GenConstraint"
-            body="//Information Flow source constraint&#xD;&#xA;if (source != null) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (!((source instanceof org.eclipse.uml2.uml.Actor)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Node)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.UseCase)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Artifact)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Class)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Component)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Port)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Property)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Interface)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Package)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.ActivityNode)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.ActivityPartition) || (source instanceof org.eclipse.uml2.uml.InstanceSpecification))) {&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (source instanceof org.eclipse.uml2.uml.InstanceSpecification) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;org.eclipse.emf.common.util.EList&lt; org.eclipse.uml2.uml.Classifier> classes = ((org.eclipse.uml2.uml.InstanceSpecification) source).getClassifiers();&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;for (int i = 0; i &lt; classes.size(); i++) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;if (classes.get(i) instanceof org.eclipse.uml2.uml.Relationship) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}"/>
-        <expressions
-            xsi:type="gmfgen:GenConstraint"
-            body="//Information Flow target constraint&#xD;&#xA;if (target != null) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (!((target instanceof org.eclipse.uml2.uml.Actor)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Node)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.UseCase)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Artifact)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Class)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Component)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Port)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Property)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Interface)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Package)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.ActivityNode)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.ActivityPartition) || (target instanceof org.eclipse.uml2.uml.InstanceSpecification))) {&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (target instanceof org.eclipse.uml2.uml.InstanceSpecification) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;org.eclipse.emf.common.util.EList&lt; org.eclipse.uml2.uml.Classifier> classes = ((org.eclipse.uml2.uml.InstanceSpecification) target).getClassifiers();&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;for (int i = 0; i &lt; classes.size(); i++) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;if (classes.get(i) instanceof org.eclipse.uml2.uml.Relationship) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}"/>
-        <expressions
-            xsi:type="gmfgen:GenConstraint"
-            body="// Creation constraint for TopLevelNodes&#xD;&#xA;&#x9;if(! (getElementToEdit() instanceof org.eclipse.uml2.uml.Package)) {&#xD;&#xA;&#x9;&#x9;return false;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;return true;"/>
-        <expressions
-            body="// Comment body init&#xD;&#xA;return &quot;&quot;;"/>
-        <expressions
-            body="// Constraint specification init&#xD;&#xA;org.eclipse.uml2.uml.LiteralString value = org.eclipse.uml2.uml.UMLFactory.eINSTANCE.createLiteralString();&#xD;&#xA;value.setValue(&quot;&quot;);&#xD;&#xA;return value;"/>
-      </providers>
-      <providers
-          xsi:type="gmfgen:GenLiteralExpressionProvider">
-        <expressions
-            body="org.eclipse.uml2.uml.AggregationKind.COMPOSITE_LITERAL"/>
-      </providers>
-    </expressionProviders>
-    <labelParsers
-        extensibleViaService="true">
-      <implementations
-          xsi:type="gmfgen:PredefinedParser"
-          uses="/0/@diagram/@topLevelNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.2/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.3/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.5/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.13/@labels.0/@modelFacet /0/@diagram/@childNodes.36/@labelModelFacet /0/@diagram/@topLevelNodes.14/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.15/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.6/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.7/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.9/@labels.0/@modelFacet /0/@diagram/@childNodes.1/@labels.0/@modelFacet /0/@diagram/@childNodes.3/@labels.0/@modelFacet /0/@diagram/@childNodes.5/@labels.0/@modelFacet /0/@diagram/@childNodes.6/@labels.0/@modelFacet /0/@diagram/@childNodes.7/@labels.0/@modelFacet /0/@diagram/@childNodes.8/@labels.0/@modelFacet /0/@diagram/@childNodes.9/@labels.0/@modelFacet /0/@diagram/@childNodes.10/@labels.0/@modelFacet /0/@diagram/@childNodes.11/@labels.0/@modelFacet /0/@diagram/@childNodes.19/@labels.0/@modelFacet /0/@diagram/@childNodes.20/@labels.0/@modelFacet /0/@diagram/@childNodes.21/@labels.0/@modelFacet /0/@diagram/@childNodes.12/@labels.0/@modelFacet /0/@diagram/@childNodes.13/@labels.0/@modelFacet /0/@diagram/@childNodes.14/@labels.0/@modelFacet /0/@diagram/@childNodes.15/@labels.0/@modelFacet /0/@diagram/@childNodes.17/@labels.0/@modelFacet /0/@diagram/@childNodes.22/@labels.0/@modelFacet /0/@diagram/@childNodes.23/@labels.0/@modelFacet /0/@diagram/@childNodes.24/@labels.0/@modelFacet /0/@diagram/@childNodes.25/@labels.0/@modelFacet /0/@diagram/@childNodes.26/@labels.0/@modelFacet /0/@diagram/@childNodes.27/@labels.0/@modelFacet /0/@diagram/@childNodes.18/@labels.0/@modelFacet /0/@diagram/@childNodes.16/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.10/@labels.0/@modelFacet /0/@diagram/@childNodes.34/@labelModelFacet /0/@diagram/@childNodes.35/@labelModelFacet /0/@diagram/@topLevelNodes.11/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.12/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.16/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.17/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.18/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.19/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.20/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.21/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.22/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.23/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.24/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.25/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.26/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.29/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.30/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.31/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.32/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.33/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.34/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.35/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.36/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.37/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.38/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.39/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.40/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.41/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.42/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.44/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.45/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.46/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.47/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.48/@labels.0/@modelFacet /0/@diagram/@links.4/@labels.0/@modelFacet /0/@diagram/@links.5/@labels.0/@modelFacet /0/@diagram/@links.6/@labels.0/@modelFacet /0/@diagram/@links.7/@labels.0/@modelFacet /0/@diagram/@links.8/@labels.0/@modelFacet /0/@diagram/@links.9/@labels.0/@modelFacet /0/@diagram/@links.10/@labels.0/@modelFacet /0/@diagram/@links.11/@labels.0/@modelFacet /0/@diagram/@links.13/@labels.0/@modelFacet /0/@diagram/@childNodes.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.28/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.27/@labels.0/@modelFacet /0/@diagram/@childNodes.2/@labels.0/@modelFacet /0/@diagram/@childNodes.29/@labels.0/@modelFacet /0/@diagram/@childNodes.30/@labels.0/@modelFacet /0/@diagram/@childNodes.31/@labels.0/@modelFacet /0/@diagram/@childNodes.33/@labels.0/@modelFacet /0/@diagram/@childNodes.32/@labels.0/@modelFacet /0/@diagram/@links.14/@labels.1/@modelFacet /0/@diagram/@links.14/@labels.2/@modelFacet /0/@diagram/@links.14/@labels.3/@modelFacet"/>
-      <implementations
-          xsi:type="gmfgen:CustomParser"
-          uses="/0/@diagram/@links.4/@labels.1/@modelFacet /0/@diagram/@links.5/@labels.1/@modelFacet /0/@diagram/@links.6/@labels.1/@modelFacet /0/@diagram/@links.7/@labels.1/@modelFacet /0/@diagram/@links.8/@labels.1/@modelFacet /0/@diagram/@links.9/@labels.1/@modelFacet /0/@diagram/@links.10/@labels.1/@modelFacet /0/@diagram/@links.11/@labels.1/@modelFacet /0/@diagram/@links.13/@labels.1/@modelFacet /0/@diagram/@links.15/@labels.0/@modelFacet /0/@diagram/@links.14/@labels.0/@modelFacet /0/@diagram/@links.12/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.28/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.27/@labels.1/@modelFacet /0/@diagram/@childNodes.1/@labels.1/@modelFacet /0/@diagram/@links.19/@labels.1/@modelFacet /0/@diagram/@childNodes.2/@labels.1/@modelFacet"
-          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser"/>
-      <implementations
-          xsi:type="gmfgen:CustomParser"
-          uses="/0/@diagram/@links.12/@labels.0/@modelFacet"
-          qualifiedName="org.eclipse.papyrus.uml.diagram.composite.custom.parsers.RoleBindingRoleNameParser"/>
-      <implementations
-          xsi:type="gmfgen:CustomParser"
-          uses="/0/@diagram/@topLevelNodes.43/@labels.0/@modelFacet /0/@diagram/@childNodes.28/@labels.0/@modelFacet"
-          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.CommentParser"/>
-      <implementations
-          xsi:type="gmfgen:CustomParser"
-          uses="/0/@diagram/@topLevelNodes.44/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.45/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.46/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.47/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.48/@labels.1/@modelFacet /0/@diagram/@childNodes.29/@labels.1/@modelFacet /0/@diagram/@childNodes.30/@labels.1/@modelFacet /0/@diagram/@childNodes.31/@labels.1/@modelFacet /0/@diagram/@childNodes.33/@labels.1/@modelFacet /0/@diagram/@childNodes.32/@labels.1/@modelFacet"
-          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.ConstraintParser"/>
-    </labelParsers>
-    <contextMenus
-        context="/0/@diagram">
-      <items
-          xsi:type="gmfgen:LoadResourceAction"/>
-    </contextMenus>
-  </gmfgen:GenEditorGenerator>
-  <papyrusgmfgenextension:PapyrusExtensionRootNode
-      comment="Papyrus specific extension for GMFGen">
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:ExtendedGenView"
-        comment="Add super class to a selected set of generated EditParts"
-        genView="/0/@diagram/@topLevelNodes.13 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.19 /0/@diagram/@topLevelNodes.20 /0/@diagram/@childNodes.12 /0/@diagram/@topLevelNodes.6 /0/@diagram/@childNodes.21 /0/@diagram/@topLevelNodes.15 /0/@diagram/@childNodes.20 /0/@diagram/@topLevelNodes.14 /0/@diagram/@topLevelNodes.10 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.18 /0/@diagram/@topLevelNodes.12 /0/@diagram/@childNodes.6 /0/@diagram/@topLevelNodes.0 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.17 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.11 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@topLevelNodes.19 /0/@diagram/@childNodes.25"
-        name="EP_NamedElement_NODE"
-        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:ExtendedGenView"
-        comment="Label in charge to display applied stereotypes on links"
-        genView="/0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.7 /0/@diagram/@links.8 /0/@diagram/@links.9 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@links.13 /0/@diagram/@links.15 /0/@diagram/@links.14 /0/@diagram/@links.12 /0/@diagram/@links.19 /0/@diagram/@links.18"
-        name="EP_NamedElement_EDGE"
-        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:ExtendedGenView"
-        comment="This manages graphical refresh when aggregation kind changes"
-        genView="/0/@diagram/@childNodes.3"
-        name="EP_ConnectableElement_As_Part_NODE"
-        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts.CustomPropertyPartEditPartCN"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:ExtendedGenView"
-        comment="Adds a superclass for DurationObservationEditPart, TimeObservationEditPart"
-        genView="/0/@diagram/@topLevelNodes.28 /0/@diagram/@topLevelNodes.27"
-        name="EP_Observation_NODE"
-        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts.AbstractObservationEditPart"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:ExtendedGenView"
-        comment="Manage named element figure relying on Affixed Node"
-        genView="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"
-        name="EP_NamedElement_AFF_NODE"
-        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:ExtendedGenView"
-        comment="Manages stereotype shown with External Label"
-        genView="/0/@diagram/@topLevelNodes.28/@labels.1 /0/@diagram/@topLevelNodes.27/@labels.1 /0/@diagram/@childNodes.1/@labels.1"
-        name="EP_Stereotypes_EXT_NODE"
-        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:ExtendedGenView"
-        comment="Add super class to a Comment edit parts"
-        genView="/0/@diagram/@topLevelNodes.43 /0/@diagram/@childNodes.28"
-        name="EP_Comment_NODE"
-        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:ExtendedGenView"
-        comment="Add super class to a Constraint edit parts"
-        genView="/0/@diagram/@topLevelNodes.44 /0/@diagram/@topLevelNodes.45 /0/@diagram/@topLevelNodes.46 /0/@diagram/@topLevelNodes.47 /0/@diagram/@topLevelNodes.48 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"
-        name="EP_Constraint_NODE"
-        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:SpecificLocator"
-        comment="Affixed Port locator"
-        classpath="org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator"
-        genChildSideAffixedNode="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:SpecificLocatorExternalLabel"
-        comment="External node label locator"
-        classpath="org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator"
-        genExternalNodeLabel="/0/@diagram/@topLevelNodes.28/@labels.1 /0/@diagram/@topLevelNodes.27/@labels.1 /0/@diagram/@childNodes.1/@labels.1 /0/@diagram/@childNodes.1/@labels.0 /0/@diagram/@topLevelNodes.27/@labels.0 /0/@diagram/@topLevelNodes.28/@labels.0 /0/@diagram/@childNodes.2/@labels.0 /0/@diagram/@childNodes.2/@labels.1"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:SpecificDiagramUpdater"
-        comment="Property (Part) custom DiagramUpdater"
-        classpath="org.eclipse.papyrus.uml.diagram.composite.custom.parts.PropertyDiagramUpdater"
-        genNode="/0/@diagram/@childNodes.3"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:SpecificDiagramUpdater"
-        comment="Property (Part) compartment custom DiagramUpdater"
-        classpath="org.eclipse.papyrus.uml.diagram.composite.custom.parts.PropertyDiagramUpdater"
-        genNode="/0/@diagram/@compartments.30"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:GenNodeConstraint"
-        comment="Creation constraint for TopLevelNode in virtual canvas"
-        genNode="/0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.10 /0/@diagram/@topLevelNodes.11 /0/@diagram/@topLevelNodes.12 /0/@diagram/@topLevelNodes.13 /0/@diagram/@topLevelNodes.14 /0/@diagram/@topLevelNodes.15 /0/@diagram/@topLevelNodes.16 /0/@diagram/@topLevelNodes.17 /0/@diagram/@topLevelNodes.18 /0/@diagram/@topLevelNodes.19 /0/@diagram/@topLevelNodes.20 /0/@diagram/@topLevelNodes.21 /0/@diagram/@topLevelNodes.22 /0/@diagram/@topLevelNodes.23 /0/@diagram/@topLevelNodes.24 /0/@diagram/@topLevelNodes.25 /0/@diagram/@topLevelNodes.26 /0/@diagram/@topLevelNodes.27 /0/@diagram/@topLevelNodes.28 /0/@diagram/@topLevelNodes.29 /0/@diagram/@topLevelNodes.30 /0/@diagram/@topLevelNodes.31 /0/@diagram/@topLevelNodes.32 /0/@diagram/@topLevelNodes.33 /0/@diagram/@topLevelNodes.34 /0/@diagram/@topLevelNodes.35 /0/@diagram/@topLevelNodes.36 /0/@diagram/@topLevelNodes.37 /0/@diagram/@topLevelNodes.38 /0/@diagram/@topLevelNodes.39 /0/@diagram/@topLevelNodes.40 /0/@diagram/@topLevelNodes.41 /0/@diagram/@topLevelNodes.42 /0/@diagram/@topLevelNodes.43 /0/@diagram/@topLevelNodes.44 /0/@diagram/@topLevelNodes.45 /0/@diagram/@topLevelNodes.46 /0/@diagram/@topLevelNodes.47 /0/@diagram/@topLevelNodes.48"
-        genConstraint="/0/@expressionProviders/@providers.0/@expressions.11"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:AdditionalEditPartCandies"
-        comment="Indicate specific BaseEditHelper in place of generated EditHelper"
-        baseEditHelperPackage="org.eclipse.papyrus.uml.diagram.common.helper"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:EditPartUsingDeleteService"
-        comment="The delete service is used on every TopNode Childnode and Link"
-        name="Every TopNode ChildNode Link"
-        genView="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33 /0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.10 /0/@diagram/@topLevelNodes.11 /0/@diagram/@topLevelNodes.12 /0/@diagram/@topLevelNodes.13 /0/@diagram/@topLevelNodes.14 /0/@diagram/@topLevelNodes.15 /0/@diagram/@topLevelNodes.16 /0/@diagram/@topLevelNodes.17 /0/@diagram/@topLevelNodes.18 /0/@diagram/@topLevelNodes.19 /0/@diagram/@topLevelNodes.20 /0/@diagram/@topLevelNodes.21 /0/@diagram/@topLevelNodes.22 /0/@diagram/@topLevelNodes.23 /0/@diagram/@topLevelNodes.24 /0/@diagram/@topLevelNodes.25 /0/@diagram/@topLevelNodes.26 /0/@diagram/@topLevelNodes.27 /0/@diagram/@topLevelNodes.28 /0/@diagram/@topLevelNodes.29 /0/@diagram/@topLevelNodes.30 /0/@diagram/@topLevelNodes.31 /0/@diagram/@topLevelNodes.32 /0/@diagram/@topLevelNodes.33 /0/@diagram/@topLevelNodes.34 /0/@diagram/@topLevelNodes.35 /0/@diagram/@topLevelNodes.36 /0/@diagram/@topLevelNodes.37 /0/@diagram/@topLevelNodes.38 /0/@diagram/@topLevelNodes.39 /0/@diagram/@topLevelNodes.40 /0/@diagram/@topLevelNodes.41 /0/@diagram/@topLevelNodes.42 /0/@diagram/@topLevelNodes.43 /0/@diagram/@topLevelNodes.44 /0/@diagram/@topLevelNodes.45 /0/@diagram/@topLevelNodes.46 /0/@diagram/@topLevelNodes.47 /0/@diagram/@topLevelNodes.48 /0/@diagram/@links.1 /0/@diagram/@links.2 /0/@diagram/@links.3 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.7 /0/@diagram/@links.8 /0/@diagram/@links.9 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@links.12 /0/@diagram/@links.13 /0/@diagram/@links.14 /0/@diagram/@links.15 /0/@diagram/@links.16 /0/@diagram/@links.17 /0/@diagram/@links.18 /0/@diagram/@links.19"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:EditPartUsingReorientService"
-        comment="Use the edit service for reorient command (All DirectedRelationship)"
-        name="DirectedRelationship"
-        genView="/0/@diagram/@links.15 /0/@diagram/@links.19 /0/@diagram/@links.13 /0/@diagram/@links.11 /0/@diagram/@links.10 /0/@diagram/@links.9 /0/@diagram/@links.8 /0/@diagram/@links.7 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:EditPartUsingReorientService"
-        comment="Use the edit service for reorient command (Connector)"
-        name="Connector"
-        genView="/0/@diagram/@links.14"/>
-    <extensionNodes
-        xsi:type="papyrusgmfgenextension:ExtendedGenView"
-        comment="this is an abstract class for BehaviorPortEditPart"
-        genView="/0/@diagram/@childNodes.0"
-        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts.AbstractBehaviorPortEditPart"/>
-  </papyrusgmfgenextension:PapyrusExtensionRootNode>
-</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:gmfgen="http://www.eclipse.org/gmf/2009/GenModel"

+    xmlns:papyrusgmfgenextension="http://www.eclipse.org/papyrus/2009/papyrusgmfgenextension">

+  <gmfgen:GenEditorGenerator

+      packageNamePrefix="org.eclipse.papyrus.uml.diagram.composite"

+      modelID="CompositeStructure"

+      diagramFileExtension="uml_csd"

+      domainFileExtension="uml"

+      dynamicTemplates="true"

+      templateDirectory="/org.eclipse.papyrus.def/xtend/"

+      copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation">

+    <diagram

+        visualID="1000"

+        editPartClassName="CompositeStructureDiagramEditPart"

+        itemSemanticEditPolicyClassName="CompositeStructureDiagramItemSemanticEditPolicy"

+        canonicalEditPolicyClassName="CompositeStructureDiagramCanonicalEditPolicy"

+        iconProviderPriority="Low"

+        baseEditHelperClassName="UMLBaseEditHelper"

+        creationWizardIconPath="icons/obj16/Diagram_CompositeStructure.gif"

+        validationProviderPriority="Low"

+        validationEnabled="true"

+        validationDecorators="true"

+        liveValidationUIFeedback="true"

+        synchronized="false">

+      <diagramRunTimeClass

+          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Diagram"/>

+      <elementType

+          xsi:type="gmfgen:MetamodelType"

+          displayName="CompositeStructureDiagram"

+          editHelperClassName="PackageEditHelper"/>

+      <viewmap

+          xsi:type="gmfgen:FigureViewmap"

+          figureQualifiedClassName="org.eclipse.draw2d.FreeformLayer"/>

+      <behaviour

+          xsi:type="gmfgen:CustomBehaviour"

+          key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+          editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+      <behaviour

+          xsi:type="gmfgen:CustomBehaviour"

+          key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+          editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      <domainDiagramElement

+          href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>

+      <childNodes

+          visualID="3121"

+          editPartClassName="BehaviorPortEditPart"

+          itemSemanticEditPolicyClassName="BehaviorPortItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="BehaviorPortCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="BehaviorPortGraphicalNodeEditPolicy"

+          createCommandClassName="BehaviorPortCreateCommand"

+          containers="/0/@diagram/@compartments.16">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:NotationType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusRoundedNodeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorSymbolEditPolicy.BEHAVIOR_SYMBOL"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorSymbolEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.NoConnectableEditPolicy"/>

+      </childNodes>

+      <childNodes

+          xsi:type="gmfgen:GenChildSideAffixedNode"

+          visualID="3069"

+          editPartClassName="PortEditPart"

+          itemSemanticEditPolicyClassName="PortItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="PortCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="PortGraphicalNodeEditPolicy"

+          createCommandClassName="PortCreateCommand"

+          containers="/0/@diagram/@topLevelNodes.10 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.6 /0/@diagram/@topLevelNodes.0 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.6">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="PortEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.PortFigure">

+          <attributes

+              xsi:type="gmfgen:DefaultSizeAttributes"

+              width="20"

+              height="20"/>

+        </viewmap>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomPortItemSemanticEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorPortEditPolicy.BEHAVIOR_PORT"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorPortEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Port"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property/aggregation"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            xsi:type="gmfgen:GenExternalNodeLabel"

+            visualID="5125"

+            editPartClassName="PortNameEditPart"

+            itemSemanticEditPolicyClassName="PortNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:FigureViewmap"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                x="25"

+                y="3"/>

+          </viewmap>

+          <behaviour

+              xsi:type="gmfgen:CustomBehaviour"

+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPortLabelEditPolicy"/>

+          <behaviour

+              xsi:type="gmfgen:CustomBehaviour"

+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.LabelAlignmentEditPolicy.LABEL_ALIGNMENT_KEY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.LabelAlignmentEditPolicy"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            xsi:type="gmfgen:GenExternalNodeLabel"

+            visualID="6029"

+            editPartClassName="PortAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="PortAppliedStereotypeItemSemanticEditPolicy"

+            readOnly="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:FigureViewmap"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                x="25"

+                y="-10"/>

+          </viewmap>

+          <behaviour

+              xsi:type="gmfgen:CustomBehaviour"

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.1"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          xsi:type="gmfgen:GenChildSideAffixedNode"

+          visualID="3088"

+          editPartClassName="ParameterEditPart"

+          itemSemanticEditPolicyClassName="ParameterItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ParameterCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="ParameterGraphicalNodeEditPolicy"

+          createCommandClassName="ParameterCreateCommand"

+          containers="/0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.composite.Parameter_3088"

+            displayName="Parameter"

+            editHelperClassName="ParameterEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ParameterFigure">

+          <attributes

+              xsi:type="gmfgen:DefaultSizeAttributes"

+              width="20"

+              height="20"/>

+        </viewmap>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomParameterItemSemanticEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ParameterLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Parameter"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Behavior/ownedParameter"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Behavior/ownedParameter"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            xsi:type="gmfgen:GenExternalNodeLabel"

+            visualID="6033"

+            editPartClassName="ParameterNameEditPart"

+            itemSemanticEditPolicyClassName="ParameterNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:FigureViewmap"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                x="25"

+                y="3"/>

+          </viewmap>

+          <behaviour

+              xsi:type="gmfgen:CustomBehaviour"

+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ParameterLabelEditPolicy"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            xsi:type="gmfgen:GenExternalNodeLabel"

+            visualID="6034"

+            editPartClassName="ParameterAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="ParameterAppliedStereotypeItemSemanticEditPolicy"

+            readOnly="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:FigureViewmap"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                x="25"

+                y="-10"/>

+          </viewmap>

+          <behaviour

+              xsi:type="gmfgen:CustomBehaviour"

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.1"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3070"

+          editPartClassName="PropertyPartEditPartCN"

+          itemSemanticEditPolicyClassName="PropertyPartItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="PropertyPartCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.1"

+          compartments="/0/@diagram/@compartments.30"

+          graphicalNodeEditPolicyClassName="PropertyPartGraphicalNodeEditPolicyCN"

+          createCommandClassName="PropertyPartCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29 /0/@diagram/@compartments.30">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.PropertyPartFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomPropertyPartItemSemanticEditPolicyCN"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PropertyLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy"/>

+        <modelFacet

+            modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.2">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5126"

+            editPartClassName="PropertyPartNameEditPartCN"

+            itemSemanticEditPolicyClassName="PropertyPartNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <behaviour

+              xsi:type="gmfgen:CustomBehaviour"

+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPropertyLabelEditPolicy"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3115"

+          editPartClassName="CollaborationRoleEditPartCN"

+          itemSemanticEditPolicyClassName="CollaborationRoleItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="CollaborationRoleCanonicalEditPolicyCN"

+          graphicalNodeEditPolicyClassName="CollaborationRoleGraphicalNodeEditPolicyCN"

+          createCommandClassName="CollaborationRoleCreateCommandCN"

+          containers="/0/@diagram/@compartments.17 /0/@diagram/@compartments.29">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.composite.prototype.CollaborationRole_3115"

+            displayName="CollaborationRole"

+            editHelperClassName="CollaborationRoleEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationRoleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CollaborationRoleItemSemanticEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ConnectableElement"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/role"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/role"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5198"

+            editPartClassName="CollaborationRoleNameEditPartCN"

+            itemSemanticEditPolicyClassName="CollaborationRoleNameItemSemanticEditPolicyCN"

+            readOnly="true"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}"

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3071"

+          editPartClassName="CollaborationUseEditPartCN"

+          itemSemanticEditPolicyClassName="CollaborationUseItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="CollaborationUseCanonicalEditPolicyCN"

+          graphicalNodeEditPolicyClassName="CollaborationUseGraphicalNodeEditPolicyCN"

+          createCommandClassName="CollaborationUseCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="CollaborationUseEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationUseFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomCollaborationUseItemSemanticEditPolicyCN"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/CollaborationUse"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/collaborationUse"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/collaborationUse"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5127"

+            editPartClassName="CollaborationUseNameEditPart"

+            itemSemanticEditPolicyClassName="CollaborationUseNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <behaviour

+              xsi:type="gmfgen:CustomBehaviour"

+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CollaborationUseLabelEditPolicy"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3072"

+          editPartClassName="ActivityCompositeEditPartCN"

+          itemSemanticEditPolicyClassName="ActivityCompositeItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="ActivityCompositeCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+          compartments="/0/@diagram/@compartments.6"

+          graphicalNodeEditPolicyClassName="ActivityCompositeGraphicalNodeEditPolicyCN"

+          createCommandClassName="ActivityCompositeCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@topLevelNodes.0/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5128"

+            editPartClassName="ActivityCompositeNameEditPartCN"

+            itemSemanticEditPolicyClassName="ActivityCompositeNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3073"

+          editPartClassName="InteractionCompositeEditPartCN"

+          itemSemanticEditPolicyClassName="InteractionCompositeItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="InteractionCompositeCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+          compartments="/0/@diagram/@compartments.7"

+          graphicalNodeEditPolicyClassName="InteractionCompositeGraphicalNodeEditPolicyCN"

+          createCommandClassName="InteractionCompositeCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@topLevelNodes.1/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5129"

+            editPartClassName="InteractionCompositeNameEditPartCN"

+            itemSemanticEditPolicyClassName="InteractionCompositeNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3074"

+          editPartClassName="ProtocolStateMachineCompositeEditPartCN"

+          itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="ProtocolStateMachineCompositeCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+          compartments="/0/@diagram/@compartments.8"

+          graphicalNodeEditPolicyClassName="ProtocolStateMachineCompositeGraphicalNodeEditPolicyCN"

+          createCommandClassName="ProtocolStateMachineCompositeCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@topLevelNodes.2/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ProtocolStateMachine"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5130"

+            editPartClassName="ProtocolStateMachineCompositeNameEditPartCN"

+            itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3075"

+          editPartClassName="StateMachineCompositeEditPartCN"

+          itemSemanticEditPolicyClassName="StateMachineCompositeItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="StateMachineCompositeCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+          compartments="/0/@diagram/@compartments.9"

+          graphicalNodeEditPolicyClassName="StateMachineCompositeGraphicalNodeEditPolicyCN"

+          createCommandClassName="StateMachineCompositeCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@topLevelNodes.3/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StateMachine"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5131"

+            editPartClassName="StateMachineCompositeNameEditPartCN"

+            itemSemanticEditPolicyClassName="StateMachineCompositeNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3076"

+          editPartClassName="FunctionBehaviorCompositeEditPartCN"

+          itemSemanticEditPolicyClassName="FunctionBehaviorCompositeItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="FunctionBehaviorCompositeCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+          compartments="/0/@diagram/@compartments.10"

+          graphicalNodeEditPolicyClassName="FunctionBehaviorCompositeGraphicalNodeEditPolicyCN"

+          createCommandClassName="FunctionBehaviorCompositeCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@topLevelNodes.4/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/FunctionBehavior"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5132"

+            editPartClassName="FunctionBehaviorCompositeNameEditPartCN"

+            itemSemanticEditPolicyClassName="FunctionBehaviorCompositeNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3077"

+          editPartClassName="OpaqueBehaviorCompositeEditPartCN"

+          itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="OpaqueBehaviorCompositeCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+          compartments="/0/@diagram/@compartments.11"

+          graphicalNodeEditPolicyClassName="OpaqueBehaviorCompositeGraphicalNodeEditPolicyCN"

+          createCommandClassName="OpaqueBehaviorCompositeCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@topLevelNodes.5/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/OpaqueBehavior"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5133"

+            editPartClassName="OpaqueBehaviorCompositeNameEditPartCN"

+            itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3081"

+          editPartClassName="ComponentCompositeEditPartCN"

+          itemSemanticEditPolicyClassName="ComponentCompositeItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="ComponentCompositeCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.1"

+          compartments="/0/@diagram/@compartments.12"

+          graphicalNodeEditPolicyClassName="ComponentCompositeGraphicalNodeEditPolicyCN"

+          createCommandClassName="ComponentCompositeCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@topLevelNodes.6/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5137"

+            editPartClassName="ComponentCompositeNameEditPartCN"

+            itemSemanticEditPolicyClassName="ComponentCompositeNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3082"

+          editPartClassName="DeviceCompositeEditPartCN"

+          itemSemanticEditPolicyClassName="DeviceCompositeItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="DeviceCompositeCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.1"

+          compartments="/0/@diagram/@compartments.13"

+          graphicalNodeEditPolicyClassName="DeviceCompositeGraphicalNodeEditPolicyCN"

+          createCommandClassName="DeviceCompositeCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@topLevelNodes.7/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Device"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5138"

+            editPartClassName="DeviceCompositeNameEditPartCN"

+            itemSemanticEditPolicyClassName="DeviceCompositeNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3083"

+          editPartClassName="ExecutionEnvironmentCompositeEditPartCN"

+          itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="ExecutionEnvironmentCompositeCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.1"

+          compartments="/0/@diagram/@compartments.14"

+          graphicalNodeEditPolicyClassName="ExecutionEnvironmentCompositeGraphicalNodeEditPolicyCN"

+          createCommandClassName="ExecutionEnvironmentCompositeCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@topLevelNodes.8/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ExecutionEnvironment"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5139"

+            editPartClassName="ExecutionEnvironmentCompositeNameEditPartCN"

+            itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3084"

+          editPartClassName="NodeCompositeEditPartCN"

+          itemSemanticEditPolicyClassName="NodeCompositeItemSemanticEditPolicycN"

+          canonicalEditPolicyClassName="NodeCompositeCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.1"

+          compartments="/0/@diagram/@compartments.15"

+          graphicalNodeEditPolicyClassName="NodeCompositeGraphicalNodeEditPolicyCN"

+          createCommandClassName="NodeCompositeCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@topLevelNodes.9/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Node"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5140"

+            editPartClassName="NodeCompositeNameEditPartCN"

+            itemSemanticEditPolicyClassName="NodeCompositeNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3085"

+          editPartClassName="ClassCompositeEditPartCN"

+          itemSemanticEditPolicyClassName="ClassCompositeItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="ClassCompositeCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.1"

+          compartments="/0/@diagram/@compartments.16"

+          graphicalNodeEditPolicyClassName="ClassCompositeGraphicalNodeEditPolicyCN"

+          createCommandClassName="ClassCompositeCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@topLevelNodes.10/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5155"

+            editPartClassName="ClassCompositeNameEditPartCN"

+            itemSemanticEditPolicyClassName="ClassCompositeNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3086"

+          editPartClassName="CollaborationCompositeEditPartCN"

+          itemSemanticEditPolicyClassName="CollaborationCompositeItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="CollaborationCompositeCanonicalEditPolicyCN"

+          compartments="/0/@diagram/@compartments.17"

+          graphicalNodeEditPolicyClassName="CollaborationCompositeGraphicalNodeEditPolicyCN"

+          createCommandClassName="CollaborationCompositeCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="CollaborationEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Collaboration"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5141"

+            editPartClassName="CollaborationCompositeNameEditPartCN"

+            itemSemanticEditPolicyClassName="CollaborationCompositeNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3087"

+          editPartClassName="InterfaceEditPartCN"

+          itemSemanticEditPolicyClassName="InterfaceItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="InterfaceCanonicalEditPolicyCN"

+          graphicalNodeEditPolicyClassName="InterfaceGraphicalNodeEditPolicyCN"

+          createCommandClassName="InterfaceCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="InterfaceEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5154"

+            editPartClassName="InterfaceNameEditPartCN"

+            itemSemanticEditPolicyClassName="InterfaceNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3078"

+          editPartClassName="PrimitiveTypeEditPartCN"

+          itemSemanticEditPolicyClassName="PrimitiveTypeItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="PrimitiveTypeCanonicalEditPolicyCN"

+          graphicalNodeEditPolicyClassName="PrimitiveTypeGraphicalNodeEditPolicyCN"

+          createCommandClassName="PrimitiveTypeCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@topLevelNodes.13/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/PrimitiveType"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5134"

+            editPartClassName="PrimitiveTypeNameEditPartCN"

+            itemSemanticEditPolicyClassName="PrimitiveTypeNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3079"

+          editPartClassName="EnumerationEditPartCN"

+          itemSemanticEditPolicyClassName="EnumerationItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="EnumerationCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.36"

+          compartments="/0/@diagram/@compartments.5"

+          graphicalNodeEditPolicyClassName="EnumerationGraphicalNodeEditPolicyCN"

+          createCommandClassName="EnumerationCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@topLevelNodes.14/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Enumeration"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5135"

+            editPartClassName="EnumerationNameEditPartCN"

+            itemSemanticEditPolicyClassName="EnumerationNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3080"

+          editPartClassName="DataTypeEditPartCN"

+          itemSemanticEditPolicyClassName="DataTypeItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="DataTypeCanonicalEditPolicyCN"

+          compartments="/0/@diagram/@compartments.2 /0/@diagram/@compartments.3"

+          graphicalNodeEditPolicyClassName="DataTypeGraphicalNodeEditPolicyCN"

+          createCommandClassName="DataTypeCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@topLevelNodes.15/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DataType"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5136"

+            editPartClassName="DataTypeNameEditPartCN"

+            itemSemanticEditPolicyClassName="DataTypeNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3091"

+          editPartClassName="ActorEditPartCN"

+          itemSemanticEditPolicyClassName="ActorItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="ActorCanonicalEditPolicyCN"

+          graphicalNodeEditPolicyClassName="ActorGraphicalNodeEditPolicyCN"

+          createCommandClassName="ActorCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="ActorEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Actor"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5144"

+            editPartClassName="ActorNameEditPartCN"

+            itemSemanticEditPolicyClassName="ActorNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3092"

+          editPartClassName="DeploymentSpecificationEditPartCN"

+          itemSemanticEditPolicyClassName="DeploymentSpecificationItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="DeploymentSpecificationCanonicalEditPolicyCN"

+          graphicalNodeEditPolicyClassName="DeploymentSpecificationGraphicalNodeEditPolicyCN"

+          createCommandClassName="DeploymentSpecificationCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="DeploymentSpecificationEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DeploymentSpecification"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5145"

+            editPartClassName="DeploymentSpecificationNameEditPartCN"

+            itemSemanticEditPolicyClassName="DeploymentSpecificationNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3093"

+          editPartClassName="ArtifactEditPartCN"

+          itemSemanticEditPolicyClassName="ArtifactItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="ArtifactCanonicalEditPolicyCN"

+          graphicalNodeEditPolicyClassName="ArtifactGraphicalNodeEditPolicyCN"

+          createCommandClassName="ArtifactCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="ArtifactEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Artifact"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5146"

+            editPartClassName="ArtifactNameEditPartCN"

+            itemSemanticEditPolicyClassName="ArtifactNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3094"

+          editPartClassName="InformationItemEditPartCN"

+          itemSemanticEditPolicyClassName="InformationItemItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="InformationItemCanonicalEditPolicyCN"

+          graphicalNodeEditPolicyClassName="InformationItemGraphicalNodeEditPolicyCN"

+          createCommandClassName="InformationItemCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="InformationItemEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure">

+          <attributes

+              xsi:type="gmfgen:DefaultSizeAttributes"

+              width="80"

+              height="40"/>

+        </viewmap>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationItem"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.7">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/isAbstract"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5147"

+            editPartClassName="InformationItemNameEditPartCN"

+            itemSemanticEditPolicyClassName="InformationItemNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3095"

+          editPartClassName="SignalEditPartCN"

+          itemSemanticEditPolicyClassName="SignalItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="SignalCanonicalEditPolicyCN"

+          graphicalNodeEditPolicyClassName="SignalGraphicalNodeEditPolicyCN"

+          createCommandClassName="SignalCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="SignalEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Signal"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5148"

+            editPartClassName="SignalNameEditPartCN"

+            itemSemanticEditPolicyClassName="SignalNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3096"

+          editPartClassName="UseCaseEditPartCN"

+          itemSemanticEditPolicyClassName="UseCaseItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="UseCaseCanonicalEditPolicyCN"

+          graphicalNodeEditPolicyClassName="UseCaseGraphicalNodeEditPolicyCN"

+          createCommandClassName="UseCaseCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="UseCaseEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/UseCase"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5149"

+            editPartClassName="UseCaseNameEditPartCN"

+            itemSemanticEditPolicyClassName="UseCaseNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3097"

+          editPartClassName="CommentEditPartCN"

+          itemSemanticEditPolicyClassName="CommentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="CommentCanonicalEditPolicyCN"

+          graphicalNodeEditPolicyClassName="CommentGraphicalNodeEditPolicyCN"

+          createCommandClassName="CommentCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29 /0/@diagram/@compartments.30">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            displayName="Comment"

+            editHelperClassName="CommentEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.12">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5150"

+            editPartClassName="CommentBodyEditPartCN"

+            itemSemanticEditPolicyClassName="CommentBodyItemSemanticEditPolicyCN">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getCornerBentFigure"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.3">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3116"

+          editPartClassName="DurationConstraintEditPartCN"

+          itemSemanticEditPolicyClassName="DurationConstraintItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="DurationConstraintCanonicalEditPolicyCN"

+          graphicalNodeEditPolicyClassName="DurationConstraintGraphicalNodeEditPolicyCN"

+          createCommandClassName="DurationConstraintCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationConstraint"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.13">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="6040"

+            editPartClassName="DurationConstraintNameEditPartCN"

+            itemSemanticEditPolicyClassName="DurationConstraintNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern=""

+              editorPattern=""

+              editPattern="">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6041"

+            editPartClassName="DurationConstraintSpecificationEditPartCN"

+            itemSemanticEditPolicyClassName="DurationConstraintSpecificationItemSemanticEditPolicyCN">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getConstraintFigure"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.4">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            <editableMetaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3117"

+          editPartClassName="TimeConstraintEditPartCN"

+          itemSemanticEditPolicyClassName="TimeConstraintItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="TimeConstraintCanonicalEditPolicyCN"

+          graphicalNodeEditPolicyClassName="TimeConstraintGraphicalNodeEditPolicyCN"

+          createCommandClassName="TimeConstraintCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeConstraint"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.13">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="6042"

+            editPartClassName="TimeConstraintNameEditPartCN"

+            itemSemanticEditPolicyClassName="TimeConstraintNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern=""

+              editorPattern=""

+              editPattern="">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6043"

+            editPartClassName="TimeConstraintSpecificationEditPartCN"

+            itemSemanticEditPolicyClassName="TimeConstraintSpecificationItemSemanticEditPolicyCN">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getConstraintFigure"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.4">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            <editableMetaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3118"

+          editPartClassName="IntervalConstraintEditPartCN"

+          itemSemanticEditPolicyClassName="IntervalConstraintItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="IntervalConstraintCanonicalEditPolicyCN"

+          graphicalNodeEditPolicyClassName="IntervalConstraintGraphicalNodeEditPolicyCN"

+          createCommandClassName="IntervalConstraintCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/IntervalConstraint"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.13">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="6044"

+            editPartClassName="IntervalConstraintNameEditPartCN"

+            itemSemanticEditPolicyClassName="IntervalConstraintNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern=""

+              editorPattern=""

+              editPattern="">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6045"

+            editPartClassName="IntervalConstraintSpecificationEditPartCN"

+            itemSemanticEditPolicyClassName="IntervalConstraintSpecificationItemSemanticEditPolicyCN">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getConstraintFigure"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.4">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            <editableMetaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3119"

+          editPartClassName="InteractionConstraintEditPartCN"

+          itemSemanticEditPolicyClassName="InteractionConstraintItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="InteractionConstraintCanonicalEditPolicyCN"

+          graphicalNodeEditPolicyClassName="InteractionConstraintGraphicalNodeEditPolicyCN"

+          createCommandClassName="InteractionConstraintCreateCommandCN"

+          containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionConstraint"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.13">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="6046"

+            editPartClassName="InteractionConstraintNameEditPartCN"

+            itemSemanticEditPolicyClassName="InteractionConstraintNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern=""

+              editorPattern=""

+              editPattern="">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6047"

+            editPartClassName="InteractionConstraintSpecificationEditPartCN"

+            itemSemanticEditPolicyClassName="InteractionConstraintSpecificationItemSemanticEditPolicyCN">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getConstraintFigure"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.4">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            <editableMetaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          visualID="3120"

+          editPartClassName="ConstraintEditPartCN"

+          itemSemanticEditPolicyClassName="ConstraintItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="ConstraintCanonicalEditPolicyCN"

+          graphicalNodeEditPolicyClassName="ConstraintGraphicalNodeEditPolicyCN"

+          createCommandClassName="ConstraintCreateCommandCN"

+          containers="/0/@diagram/@compartments.28 /0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.29">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.13">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="6048"

+            editPartClassName="ConstraintNameEditPartCN"

+            itemSemanticEditPolicyClassName="ConstraintNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern=""

+              editorPattern=""

+              editPattern="">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6049"

+            editPartClassName="ConstraintSpecificationEditPartCN"

+            itemSemanticEditPolicyClassName="ConstraintSpecificationItemSemanticEditPolicyCN">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getConstraintFigure"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.4">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            <editableMetaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

+      <childNodes

+          xsi:type="gmfgen:GenChildLabelNode"

+          visualID="3101"

+          editPartClassName="PropertyEditPartCLN"

+          itemSemanticEditPolicyClassName="PropertyItemSemanticEditPolicyCLN"

+          canonicalEditPolicyClassName="PropertyCanonicalEditPolicyCLN"

+          graphicalNodeEditPolicyClassName="PropertyGraphicalNodeEditPolicyCLN"

+          createCommandClassName="PropertyCreateCommandCLN"

+          containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.0"

+          labelElementIcon="true">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labelModelFacet

+            xsi:type="gmfgen:FeatureLabelModelFacet"

+            parser="/0/@labelParsers/@implementations.0"

+            viewPattern="{0}  "

+            editorPattern="{0}"

+            editPattern="{0}">

+          <metaFeatures

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+        </labelModelFacet>

+      </childNodes>

+      <childNodes

+          xsi:type="gmfgen:GenChildLabelNode"

+          visualID="3102"

+          editPartClassName="OperationEditPartCLN"

+          itemSemanticEditPolicyClassName="OperationItemSemanticEditPolicyCLN"

+          canonicalEditPolicyClassName="OperationCanonicalEditPolicyCLN"

+          graphicalNodeEditPolicyClassName="OperationGraphicalNodeEditPolicyCLN"

+          createCommandClassName="OperationCreateCommandCLN"

+          containers="/0/@diagram/@compartments.3 /0/@diagram/@compartments.1"

+          labelElementIcon="true">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Operation"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/ownedOperation"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/ownedOperation"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labelModelFacet

+            xsi:type="gmfgen:FeatureLabelModelFacet"

+            parser="/0/@labelParsers/@implementations.0"

+            viewPattern="{0}  "

+            editorPattern="{0}"

+            editPattern="{0}">

+          <metaFeatures

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+        </labelModelFacet>

+      </childNodes>

+      <childNodes

+          xsi:type="gmfgen:GenChildLabelNode"

+          visualID="3066"

+          editPartClassName="EnumerationLiteralEditPartCLN"

+          itemSemanticEditPolicyClassName="EnumerationLiteralItemSemanticEditPolicyCLN"

+          canonicalEditPolicyClassName="EnumerationLiteralCanonicalEditPolicyCLN"

+          graphicalNodeEditPolicyClassName="EnumerationLiteralGraphicalNodeEditPolicyCLN"

+          createCommandClassName="EnumerationLiteralCreateCommandCLN"

+          containers="/0/@diagram/@compartments.5 /0/@diagram/@compartments.4 /0/@diagram/@topLevelNodes.14 /0/@diagram/@childNodes.20"

+          labelElementIcon="true">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="EnumerationLiteralEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/EnumerationLiteral"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Enumeration/ownedLiteral"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Enumeration/ownedLiteral"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labelModelFacet

+            xsi:type="gmfgen:FeatureLabelModelFacet"

+            parser="/0/@labelParsers/@implementations.0"

+            viewPattern="{0}  "

+            editorPattern="{0}"

+            editPattern="{0}">

+          <metaFeatures

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+        </labelModelFacet>

+      </childNodes>

+      <topLevelNodes

+          visualID="2060"

+          editPartClassName="ActivityCompositeEditPart"

+          itemSemanticEditPolicyClassName="ActivityCompositeItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ActivityCompositeCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+          compartments="/0/@diagram/@compartments.18"

+          graphicalNodeEditPolicyClassName="ActivityCompositeGraphicalNodeEditPolicy"

+          createCommandClassName="ActivityCompositeCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="ActivityEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5112"

+            editPartClassName="ActivityCompositeNameEditPart"

+            itemSemanticEditPolicyClassName="ActivityCompositeNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2061"

+          editPartClassName="InteractionCompositeEditPart"

+          itemSemanticEditPolicyClassName="InteractionCompositeItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="InteractionCompositeCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+          compartments="/0/@diagram/@compartments.19"

+          graphicalNodeEditPolicyClassName="InteractionCompositeGraphicalNodeEditPolicy"

+          createCommandClassName="InteractionCompositeCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="InteractionEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5113"

+            editPartClassName="InteractionCompositeNameEditPart"

+            itemSemanticEditPolicyClassName="InteractionCompositeNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2062"

+          editPartClassName="ProtocolStateMachineCompositeEditPart"

+          itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ProtocolStateMachineCompositeCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+          compartments="/0/@diagram/@compartments.20"

+          graphicalNodeEditPolicyClassName="ProtocolStateMachineCompositeGraphicalNodeEditPolicy"

+          createCommandClassName="ProtocolStateMachineCompositeCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="ProtocolStateMachineEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ProtocolStateMachine"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5114"

+            editPartClassName="ProtocolStateMachineCompositeNameEditPart"

+            itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2063"

+          editPartClassName="StateMachineCompositeEditPart"

+          itemSemanticEditPolicyClassName="StateMachineCompositeItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="StateMachineCompositeCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+          compartments="/0/@diagram/@compartments.21"

+          graphicalNodeEditPolicyClassName="StateMachineCompositeGraphicalNodeEditPolicy"

+          createCommandClassName="StateMachineCompositeCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="StateMachineEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StateMachine"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5115"

+            editPartClassName="StateMachineCompositeNameEditPart"

+            itemSemanticEditPolicyClassName="StateMachineCompositeNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2064"

+          editPartClassName="FunctionBehaviorCompositeEditPart"

+          itemSemanticEditPolicyClassName="FunctionBehaviorCompositeItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="FunctionBehaviorCompositeCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+          compartments="/0/@diagram/@compartments.22"

+          graphicalNodeEditPolicyClassName="FunctionBehaviorCompositeGraphicalNodeEditPolicy"

+          createCommandClassName="FunctionBehaviorCompositeCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="FunctionBehaviorEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/FunctionBehavior"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5116"

+            editPartClassName="FunctionBehaviorCompositeNameEditPart"

+            itemSemanticEditPolicyClassName="FunctionBehaviorCompositeNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2065"

+          editPartClassName="OpaqueBehaviorCompositeEditPart"

+          itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="OpaqueBehaviorCompositeCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+          compartments="/0/@diagram/@compartments.23"

+          graphicalNodeEditPolicyClassName="OpaqueBehaviorCompositeGraphicalNodeEditPolicy"

+          createCommandClassName="OpaqueBehaviorCompositeCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="OpaqueBehaviorEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/OpaqueBehavior"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5117"

+            editPartClassName="OpaqueBehaviorCompositeNameEditPart"

+            itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2069"

+          editPartClassName="ComponentCompositeEditPart"

+          itemSemanticEditPolicyClassName="ComponentCompositeItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ComponentCompositeCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.1"

+          compartments="/0/@diagram/@compartments.24"

+          graphicalNodeEditPolicyClassName="ComponentCompositeGraphicalNodeEditPolicy"

+          createCommandClassName="ComponentCompositeCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="ComponentEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5121"

+            editPartClassName="ComponentCompositeNameEditPart"

+            itemSemanticEditPolicyClassName="ComponentCompositeNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2070"

+          editPartClassName="DeviceCompositeEditPart"

+          itemSemanticEditPolicyClassName="DeviceCompositeItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="DeviceCompositeCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.1"

+          compartments="/0/@diagram/@compartments.25"

+          graphicalNodeEditPolicyClassName="DeviceCompositeGraphicalNodeEditPolicy"

+          createCommandClassName="DeviceCompositeCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="DeviceEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Device"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5122"

+            editPartClassName="DeviceCompositeNameEditPart"

+            itemSemanticEditPolicyClassName="DeviceCompositeNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2071"

+          editPartClassName="ExecutionEnvironmentCompositeEditPart"

+          itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ExecutionEnvironmentCompositeCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.1"

+          compartments="/0/@diagram/@compartments.26"

+          graphicalNodeEditPolicyClassName="ExecutionEnvironmentCompositeGraphicalNodeEditPolicy"

+          createCommandClassName="ExecutionEnvironmentCompositeCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="ExecutionEnvironmentEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ExecutionEnvironment"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5123"

+            editPartClassName="ExecutionEnvironmentCompositeNameEditPart"

+            itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2072"

+          editPartClassName="NodeCompositeEditPart"

+          itemSemanticEditPolicyClassName="NodeCompositeItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="NodeCompositeCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.1"

+          compartments="/0/@diagram/@compartments.27"

+          graphicalNodeEditPolicyClassName="NodeCompositeGraphicalNodeEditPolicy"

+          createCommandClassName="NodeCompositeCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="NodeEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Node"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5124"

+            editPartClassName="NodeCompositeNameEditPart"

+            itemSemanticEditPolicyClassName="NodeCompositeNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2073"

+          editPartClassName="ClassCompositeEditPart"

+          itemSemanticEditPolicyClassName="ClassCompositeItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ClassCompositeCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.1"

+          compartments="/0/@diagram/@compartments.28"

+          graphicalNodeEditPolicyClassName="ClassCompositeGraphicalNodeEditPolicy"

+          createCommandClassName="ClassCompositeCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="ClassEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5156"

+            editPartClassName="ClassCompositeNameEditPart"

+            itemSemanticEditPolicyClassName="ClassCompositeNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2075"

+          editPartClassName="CollaborationCompositeEditPart"

+          itemSemanticEditPolicyClassName="CollaborationCompositeItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="CollaborationCompositeCanonicalEditPolicy"

+          compartments="/0/@diagram/@compartments.29"

+          graphicalNodeEditPolicyClassName="CollaborationCompositeGraphicalNodeEditPolicy"

+          createCommandClassName="CollaborationCompositeCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@childNodes.17/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Collaboration"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5158"

+            editPartClassName="CollaborationCompositeNameEditPart"

+            itemSemanticEditPolicyClassName="CollaborationCompositeNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2076"

+          editPartClassName="InterfaceEditPart"

+          itemSemanticEditPolicyClassName="InterfaceItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="InterfaceCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="InterfaceGraphicalNodeEditPolicy"

+          createCommandClassName="InterfaceCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@childNodes.18/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5159"

+            editPartClassName="InterfaceNameEditPart"

+            itemSemanticEditPolicyClassName="InterfaceNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2066"

+          editPartClassName="PrimitiveTypeEditPart"

+          itemSemanticEditPolicyClassName="PrimitiveTypeItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="PrimitiveTypeCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="PrimitiveTypeGraphicalNodeEditPolicy"

+          createCommandClassName="PrimitiveTypeCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="PrimitiveTypeEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/PrimitiveType"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5118"

+            editPartClassName="PrimitiveTypeNameEditPart"

+            itemSemanticEditPolicyClassName="PrimitiveTypeNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2067"

+          editPartClassName="EnumerationEditPart"

+          itemSemanticEditPolicyClassName="EnumerationItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="EnumerationCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.36"

+          compartments="/0/@diagram/@compartments.4"

+          graphicalNodeEditPolicyClassName="EnumerationGraphicalNodeEditPolicy"

+          createCommandClassName="EnumerationCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="EnumerationEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Enumeration"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5119"

+            editPartClassName="EnumerationNameEditPart"

+            itemSemanticEditPolicyClassName="EnumerationNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2068"

+          editPartClassName="DataTypeEditPart"

+          itemSemanticEditPolicyClassName="DataTypeItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="DataTypeCanonicalEditPolicy"

+          compartments="/0/@diagram/@compartments.0 /0/@diagram/@compartments.1"

+          graphicalNodeEditPolicyClassName="DataTypeGraphicalNodeEditPolicy"

+          createCommandClassName="DataTypeCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="DataTypeEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DataType"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5120"

+            editPartClassName="DataTypeNameEditPart"

+            itemSemanticEditPolicyClassName="DataTypeNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2077"

+          editPartClassName="ActorEditPart"

+          itemSemanticEditPolicyClassName="ActorItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ActorCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="ActorGraphicalNodeEditPolicy"

+          createCommandClassName="ActorCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@childNodes.22/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Actor"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5160"

+            editPartClassName="ActorNameEditPart"

+            itemSemanticEditPolicyClassName="ActorNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2078"

+          editPartClassName="DeploymentSpecificationEditPart"

+          itemSemanticEditPolicyClassName="DeploymentSpecificationItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="DeploymentSpecificationCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="DeploymentSpecificationGraphicalNodeEditPolicy"

+          createCommandClassName="DeploymentSpecificationCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@childNodes.23/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DeploymentSpecification"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5161"

+            editPartClassName="DeploymentSpecificationNameEditPart"

+            itemSemanticEditPolicyClassName="DeploymentSpecificationNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2079"

+          editPartClassName="ArtifactEditPart"

+          itemSemanticEditPolicyClassName="ArtifactItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ArtifactCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="ArtifactGraphicalNodeEditPolicy"

+          createCommandClassName="ArtifactCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@childNodes.24/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Artifact"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5162"

+            editPartClassName="ArtifactNameEditPart"

+            itemSemanticEditPolicyClassName="ArtifactNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2080"

+          editPartClassName="InformationItemEditPart"

+          itemSemanticEditPolicyClassName="InformationItemItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="InformationItemCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="InformationItemGraphicalNodeEditPolicy"

+          createCommandClassName="InformationItemCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@childNodes.25/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure">

+          <attributes

+              xsi:type="gmfgen:DefaultSizeAttributes"

+              width="80"

+              height="40"/>

+        </viewmap>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationItem"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.7">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/isAbstract"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5163"

+            editPartClassName="InformationItemNameEditPart"

+            itemSemanticEditPolicyClassName="InformationItemNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2081"

+          editPartClassName="SignalEditPart"

+          itemSemanticEditPolicyClassName="SignalItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="SignalCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="SignalGraphicalNodeEditPolicy"

+          createCommandClassName="SignalCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@childNodes.26/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Signal"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5164"

+            editPartClassName="SignalNameEditPart"

+            itemSemanticEditPolicyClassName="SignalNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2082"

+          editPartClassName="UseCaseEditPart"

+          itemSemanticEditPolicyClassName="UseCaseItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="UseCaseCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="UseCaseGraphicalNodeEditPolicy"

+          createCommandClassName="UseCaseCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@childNodes.27/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/UseCase"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5165"

+            editPartClassName="UseCaseNameEditPart"

+            itemSemanticEditPolicyClassName="UseCaseNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2083"

+          editPartClassName="SignalEventEditPart"

+          itemSemanticEditPolicyClassName="SignalEventItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="SignalEventCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="SignalEventGraphicalNodeEditPolicy"

+          createCommandClassName="SignalEventCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="SignalEventEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/SignalEvent"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5166"

+            editPartClassName="SignalEventNameEditPart"

+            itemSemanticEditPolicyClassName="SignalEventNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2084"

+          editPartClassName="CallEventEditPart"

+          itemSemanticEditPolicyClassName="CallEventItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="CallEventCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="CallEventGraphicalNodeEditPolicy"

+          createCommandClassName="CallEventCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="CallEventEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/CallEvent"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5167"

+            editPartClassName="CallEventNameEditPart"

+            itemSemanticEditPolicyClassName="CallEventNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2085"

+          editPartClassName="AnyReceiveEventEditPart"

+          itemSemanticEditPolicyClassName="AnyReceiveEventItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="AnyReceiveEventCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="AnyReceiveEventGraphicalNodeEditPolicy"

+          createCommandClassName="AnyReceiveEventCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="AnyReceiveEventEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/AnyReceiveEvent"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5168"

+            editPartClassName="AnyReceiveEventNameEditPart"

+            itemSemanticEditPolicyClassName="AnyReceiveEventNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2088"

+          editPartClassName="ChangeEventEditPart"

+          itemSemanticEditPolicyClassName="ChangeEventItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ChangeEventCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="ChangeEventGraphicalNodeEditPolicy"

+          createCommandClassName="ChangeEventCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="ChangeEventEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ChangeEvent"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5171"

+            editPartClassName="ChangeEventNameEditPart"

+            itemSemanticEditPolicyClassName="ChangeEventNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2089"

+          editPartClassName="TimeEventEditPart"

+          itemSemanticEditPolicyClassName="TimeEventItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="TimeEventCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="TimeEventGraphicalNodeEditPolicy"

+          createCommandClassName="TimeEventCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="TimeEventEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeEvent"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5172"

+            editPartClassName="TimeEventNameEditPart"

+            itemSemanticEditPolicyClassName="TimeEventNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2093"

+          editPartClassName="DurationObservationEditPart"

+          itemSemanticEditPolicyClassName="DurationObservationItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="DurationObservationCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="DurationObservationGraphicalNodeEditPolicy"

+          createCommandClassName="DurationObservationCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="DurationObservationEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.DurationObservationNodeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ObservationLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationObservation"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            xsi:type="gmfgen:GenExternalNodeLabel"

+            visualID="5151"

+            editPartClassName="DurationObservationNameEditPart"

+            itemSemanticEditPolicyClassName="DurationObservationNameItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:FigureViewmap"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                x="25"

+                y="3"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            xsi:type="gmfgen:GenExternalNodeLabel"

+            visualID="5152"

+            editPartClassName="DurationObservationStereotypeLabelEditPart"

+            itemSemanticEditPolicyClassName="DurationObservationStereotypeLabelItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:FigureViewmap"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                x="25"

+                y="-10"/>

+          </viewmap>

+          <behaviour

+              xsi:type="gmfgen:CustomBehaviour"

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.1"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2094"

+          editPartClassName="TimeObservationEditPart"

+          itemSemanticEditPolicyClassName="TimeObservationItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="TimeObservationCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="TimeObservationGraphicalNodeEditPolicy"

+          createCommandClassName="TimeObservationCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="TimeObservationEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.TimeObservationNodeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ObservationLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeObservation"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            xsi:type="gmfgen:GenExternalNodeLabel"

+            visualID="5142"

+            editPartClassName="TimeObservationNameEditPart"

+            itemSemanticEditPolicyClassName="TimeObservationNameItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:FigureViewmap"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                x="25"

+                y="3"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            xsi:type="gmfgen:GenExternalNodeLabel"

+            visualID="5143"

+            editPartClassName="TimeObservationStereotypeLabelEditPart"

+            itemSemanticEditPolicyClassName="TimeObservationStereotypeLabelItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:FigureViewmap"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                x="25"

+                y="-10"/>

+          </viewmap>

+          <behaviour

+              xsi:type="gmfgen:CustomBehaviour"

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.1"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2095"

+          editPartClassName="LiteralBooleanEditPart"

+          itemSemanticEditPolicyClassName="LiteralBooleanItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="LiteralBooleanCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="LiteralBooleanGraphicalNodeEditPolicy"

+          createCommandClassName="LiteralBooleanCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="LiteralBooleanEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralBoolean"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5178"

+            editPartClassName="LiteralBooleanNameEditPart"

+            itemSemanticEditPolicyClassName="LiteralBooleanNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2096"

+          editPartClassName="LiteralIntegerEditPart"

+          itemSemanticEditPolicyClassName="LiteralIntegerItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="LiteralIntegerCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="LiteralIntegerGraphicalNodeEditPolicy"

+          createCommandClassName="LiteralIntegerCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="LiteralIntegerEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralInteger"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5179"

+            editPartClassName="LiteralIntegerNameEditPart"

+            itemSemanticEditPolicyClassName="LiteralIntegerNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2097"

+          editPartClassName="LiteralNullEditPart"

+          itemSemanticEditPolicyClassName="LiteralNullItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="LiteralNullCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="LiteralNullGraphicalNodeEditPolicy"

+          createCommandClassName="LiteralNullCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="LiteralNullEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralNull"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5180"

+            editPartClassName="LiteralNullNameEditPart"

+            itemSemanticEditPolicyClassName="LiteralNullNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2098"

+          editPartClassName="LiteralStringEditPart"

+          itemSemanticEditPolicyClassName="LiteralStringItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="LiteralStringCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="LiteralStringGraphicalNodeEditPolicy"

+          createCommandClassName="LiteralStringCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="LiteralStringEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralString"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5181"

+            editPartClassName="LiteralStringNameEditPart"

+            itemSemanticEditPolicyClassName="LiteralStringNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2099"

+          editPartClassName="LiteralUnlimitedNaturalEditPart"

+          itemSemanticEditPolicyClassName="LiteralUnlimitedNaturalItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="LiteralUnlimitedNaturalCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="LiteralUnlimitedNaturalGraphicalNodeEditPolicy"

+          createCommandClassName="LiteralUnlimitedNaturalCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="LiteralUnlimitedNaturalEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralUnlimitedNatural"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5182"

+            editPartClassName="LiteralUnlimitedNaturalNameEditPart"

+            itemSemanticEditPolicyClassName="LiteralUnlimitedNaturalNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2100"

+          editPartClassName="StringExpressionEditPart"

+          itemSemanticEditPolicyClassName="StringExpressionItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="StringExpressionCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="StringExpressionGraphicalNodeEditPolicy"

+          createCommandClassName="StringExpressionCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="StringExpressionEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StringExpression"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5183"

+            editPartClassName="StringExpressionNameEditPart"

+            itemSemanticEditPolicyClassName="StringExpressionNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2101"

+          editPartClassName="OpaqueExpressionEditPart"

+          itemSemanticEditPolicyClassName="OpaqueExpressionItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="OpaqueExpressionCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="OpaqueExpressionGraphicalNodeEditPolicy"

+          createCommandClassName="OpaqueExpressionCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="OpaqueExpressionEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/OpaqueExpression"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5184"

+            editPartClassName="OpaqueExpressionNameEditPart"

+            itemSemanticEditPolicyClassName="OpaqueExpressionNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2102"

+          editPartClassName="TimeExpressionEditPart"

+          itemSemanticEditPolicyClassName="TimeExpressionItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="TimeExpressionCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="TimeExpressionGraphicalNodeEditPolicy"

+          createCommandClassName="TimeExpressionCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="TimeExpressionEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeExpression"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5185"

+            editPartClassName="TimeExpressionNameEditPart"

+            itemSemanticEditPolicyClassName="TimeExpressionNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2103"

+          editPartClassName="ExpressionEditPart"

+          itemSemanticEditPolicyClassName="ExpressionItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ExpressionCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="ExpressionGraphicalNodeEditPolicy"

+          createCommandClassName="ExpressionCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="ExpressionEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Expression"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5186"

+            editPartClassName="ExpressionNameEditPart"

+            itemSemanticEditPolicyClassName="ExpressionNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2104"

+          editPartClassName="DurationEditPart"

+          itemSemanticEditPolicyClassName="DurationItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="DurationCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="DurationGraphicalNodeEditPolicy"

+          createCommandClassName="DurationCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="DurationEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Duration"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5187"

+            editPartClassName="DurationNameEditPart"

+            itemSemanticEditPolicyClassName="DurationNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2105"

+          editPartClassName="TimeIntervalEditPart"

+          itemSemanticEditPolicyClassName="TimeIntervalItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="TimeIntervalCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="TimeIntervalGraphicalNodeEditPolicy"

+          createCommandClassName="TimeIntervalCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="TimeIntervalEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeInterval"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5188"

+            editPartClassName="TimeIntervalNameEditPart"

+            itemSemanticEditPolicyClassName="TimeIntervalNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2106"

+          editPartClassName="DurationIntervalEditPart"

+          itemSemanticEditPolicyClassName="DurationIntervalItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="DurationIntervalCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="DurationIntervalGraphicalNodeEditPolicy"

+          createCommandClassName="DurationIntervalCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="DurationIntervalEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationInterval"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5189"

+            editPartClassName="DurationIntervalNameEditPart"

+            itemSemanticEditPolicyClassName="DurationIntervalNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2107"

+          editPartClassName="IntervalEditPart"

+          itemSemanticEditPolicyClassName="IntervalItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="IntervalCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="IntervalGraphicalNodeEditPolicy"

+          createCommandClassName="IntervalCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="IntervalEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interval"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5190"

+            editPartClassName="IntervalNameEditPart"

+            itemSemanticEditPolicyClassName="IntervalNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2108"

+          editPartClassName="InstanceValueEditPart"

+          itemSemanticEditPolicyClassName="InstanceValueItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="InstanceValueCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="InstanceValueGraphicalNodeEditPolicy"

+          createCommandClassName="InstanceValueCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="InstanceValueEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InstanceValue"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5191"

+            editPartClassName="InstanceValueNameEditPart"

+            itemSemanticEditPolicyClassName="InstanceValueNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}  "

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2109"

+          editPartClassName="CommentEditPart"

+          itemSemanticEditPolicyClassName="CommentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="CommentCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="CommentGraphicalNodeEditPolicy"

+          createCommandClassName="CommentCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            metamodelType="/0/@diagram/@childNodes.28/@elementType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.12">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5192"

+            editPartClassName="CommentBodyEditPart"

+            itemSemanticEditPolicyClassName="CommentBodyItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getCornerBentFigure"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.3">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2110"

+          editPartClassName="DurationConstraintEditPart"

+          itemSemanticEditPolicyClassName="DurationConstraintItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="DurationConstraintCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="DurationConstraintGraphicalNodeEditPolicy"

+          createCommandClassName="DurationConstraintCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationConstraint"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.13">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5193"

+            editPartClassName="DurationConstraintNameEditPart"

+            itemSemanticEditPolicyClassName="DurationConstraintNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern=""

+              editorPattern=""

+              editPattern="">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6035"

+            editPartClassName="DurationConstraintSpecificationEditPart"

+            itemSemanticEditPolicyClassName="DurationConstraintSpecificationItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getConstraintFigure"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.4">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            <editableMetaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2111"

+          editPartClassName="TimeConstraintEditPart"

+          itemSemanticEditPolicyClassName="TimeConstraintItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="TimeConstraintCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="TimeConstraintGraphicalNodeEditPolicy"

+          createCommandClassName="TimeConstraintCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="TimeConstraintEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeConstraint"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.13">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5194"

+            editPartClassName="TimeConstraintNameEditPart"

+            itemSemanticEditPolicyClassName="TimeConstraintNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern=""

+              editorPattern=""

+              editPattern="">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6036"

+            editPartClassName="TimeConstraintSpecificationEditPart"

+            itemSemanticEditPolicyClassName="TimeConstraintSpecificationItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getConstraintFigure"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.4">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            <editableMetaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2112"

+          editPartClassName="IntervalConstraintEditPart"

+          itemSemanticEditPolicyClassName="IntervalConstraintItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="IntervalConstraintCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="IntervalConstraintGraphicalNodeEditPolicy"

+          createCommandClassName="IntervalConstraintCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="IntervalConstraintEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/IntervalConstraint"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.13">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5195"

+            editPartClassName="IntervalConstraintNameEditPart"

+            itemSemanticEditPolicyClassName="IntervalConstraintNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern=""

+              editorPattern=""

+              editPattern="">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6037"

+            editPartClassName="IntervalConstraintSpecificationEditPart"

+            itemSemanticEditPolicyClassName="IntervalConstraintSpecificationItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getConstraintFigure"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.4">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            <editableMetaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2113"

+          editPartClassName="InteractionConstraintEditPart"

+          itemSemanticEditPolicyClassName="InteractionConstraintItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="InteractionConstraintCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="InteractionConstraintGraphicalNodeEditPolicy"

+          createCommandClassName="InteractionConstraintCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="InteractionConstraintEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionConstraint"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.13">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5196"

+            editPartClassName="InteractionConstraintNameEditPart"

+            itemSemanticEditPolicyClassName="InteractionConstraintNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern=""

+              editorPattern=""

+              editPattern="">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6038"

+            editPartClassName="InteractionConstraintSpecificationEditPart"

+            itemSemanticEditPolicyClassName="InteractionConstraintSpecificationItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getConstraintFigure"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.4">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            <editableMetaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <topLevelNodes

+          visualID="2114"

+          editPartClassName="ConstraintEditPart"

+          itemSemanticEditPolicyClassName="ConstraintItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ConstraintCanonicalEditPolicy"

+          graphicalNodeEditPolicyClassName="ConstraintGraphicalNodeEditPolicy"

+          createCommandClassName="ConstraintCreateCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="ConstraintEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.13">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5197"

+            editPartClassName="ConstraintNameEditPart"

+            itemSemanticEditPolicyClassName="ConstraintNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern=""

+              editorPattern=""

+              editPattern="">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6039"

+            editPartClassName="ConstraintSpecificationEditPart"

+            itemSemanticEditPolicyClassName="ConstraintSpecificationItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getConstraintFigure"

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.4">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+            <editableMetaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

+          </modelFacet>

+        </labels>

+      </topLevelNodes>

+      <links

+          visualID="4022"

+          editPartClassName="BehaviorPortLinkEditPart"

+          itemSemanticEditPolicyClassName="BehaviorPortLinkItemSemanticEditPolicy"

+          createCommandClassName="BehaviorPortLinkCreateCommand"

+          reorientCommandClassName="BehaviorPortLinkReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:NotationType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.NoConnectableEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.COMPONENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.NoDeleteFromDiagramEditPolicy"/>

+      </links>

+      <links

+          visualID="4001"

+          editPartClassName="LinkDescriptorEditPart"

+          itemSemanticEditPolicyClassName="LinkDescriptorItemSemanticEditPolicy"

+          createCommandClassName="LinkDescriptorCreateCommand"

+          reorientCommandClassName="LinkDescriptorReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:NotationType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>

+      </links>

+      <links

+          visualID="4002"

+          editPartClassName="CommentAnnotatedElementEditPart"

+          itemSemanticEditPolicyClassName="CommentAnnotatedElementItemSemanticEditPolicy"

+          createCommandClassName="CommentAnnotatedElementCreateCommand"

+          reorientCommandClassName="CommentAnnotatedElementReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            displayName="CommentAnnotatedElement"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>

+        <modelFacet

+            xsi:type="gmfgen:FeatureLinkModelFacet">

+          <metaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/annotatedElement"/>

+        </modelFacet>

+      </links>

+      <links

+          visualID="4003"

+          editPartClassName="ConstraintConstrainedElementEditPart"

+          itemSemanticEditPolicyClassName="ConstraintConstrainedElementItemSemanticEditPolicy"

+          createCommandClassName="ConstraintConstrainedElementCreateCommand"

+          reorientCommandClassName="ConstraintConstrainedElementReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            displayName="ConstraintConstrainedElement"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>

+        <modelFacet

+            xsi:type="gmfgen:FeatureLinkModelFacet">

+          <metaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/constrainedElement"/>

+        </modelFacet>

+      </links>

+      <links

+          visualID="4004"

+          editPartClassName="ComponentRealizationEditPart"

+          itemSemanticEditPolicyClassName="ComponentRealizationItemSemanticEditPolicy"

+          createCommandClassName="ComponentRealizationCreateCommand"

+          reorientCommandClassName="ComponentRealizationReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="ComponentRealizationEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ComponentRealization"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

+        </modelFacet>

+        <labels

+            visualID="6001"

+            editPartClassName="ComponentRealizationNameEditPart"

+            itemSemanticEditPolicyClassName="ComponentRealizationNameItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6015"

+            editPartClassName="ComponentRealizationAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="ComponentRealizationAppliedStereotypeItemSemanticEditPolicy"

+            readOnly="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="30"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.1"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </links>

+      <links

+          visualID="4005"

+          editPartClassName="InterfaceRealizationEditPart"

+          itemSemanticEditPolicyClassName="InterfaceRealizationItemSemanticEditPolicy"

+          createCommandClassName="InterfaceRealizationCreateCommand"

+          reorientCommandClassName="InterfaceRealizationReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="InterfaceRealizationEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InterfaceRealization"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

+        </modelFacet>

+        <labels

+            visualID="6002"

+            editPartClassName="InterfaceRealizationNameEditPart"

+            itemSemanticEditPolicyClassName="InterfaceRealizationNameItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6016"

+            editPartClassName="InterfaceRealizationAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="InterfaceRealizationAppliedStereotypeItemSemanticEditPolicy"

+            readOnly="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="30"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.1"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </links>

+      <links

+          visualID="4011"

+          editPartClassName="SubstitutionEditPart"

+          itemSemanticEditPolicyClassName="SubstitutionItemSemanticEditPolicy"

+          createCommandClassName="SubstitutionCreateCommand"

+          reorientCommandClassName="SubstitutionReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="SubstitutionEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeSubstitutionLabelDisplayEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Substitution"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

+        </modelFacet>

+        <labels

+            visualID="6003"

+            editPartClassName="SubstitutionNameEditPart"

+            itemSemanticEditPolicyClassName="SubstitutionNameItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6017"

+            editPartClassName="SubstitutionAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="SubstitutionAppliedStereotypeItemSemanticEditPolicy"

+            readOnly="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="30"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.1"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </links>

+      <links

+          visualID="4006"

+          editPartClassName="RealizationEditPart"

+          itemSemanticEditPolicyClassName="RealizationItemSemanticEditPolicy"

+          createCommandClassName="RealizationCreateCommand"

+          reorientCommandClassName="RealizationReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="RealizationEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Realization"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

+        </modelFacet>

+        <labels

+            visualID="6004"

+            editPartClassName="RealizationNameEditPart"

+            itemSemanticEditPolicyClassName="RealizationNameItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6018"

+            editPartClassName="RealizationAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="RealizationAppliedStereotypeItemSemanticEditPolicy"

+            readOnly="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="30"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.1"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </links>

+      <links

+          visualID="4012"

+          editPartClassName="ManifestationEditPart"

+          itemSemanticEditPolicyClassName="ManifestationItemSemanticEditPolicy"

+          createCommandClassName="ManifestationCreateCommand"

+          reorientCommandClassName="ManifestationReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="ManifestationEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeManifestationLabelDisplayEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Manifestation"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

+        </modelFacet>

+        <labels

+            visualID="6005"

+            editPartClassName="ManifestationNameEditPart"

+            itemSemanticEditPolicyClassName="ManifestationNameItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6019"

+            editPartClassName="ManifestationAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="ManifestationAppliedStereotypeItemSemanticEditPolicy"

+            readOnly="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="30"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.1"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </links>

+      <links

+          visualID="4007"

+          editPartClassName="AbstractionEditPart"

+          itemSemanticEditPolicyClassName="AbstractionItemSemanticEditPolicy"

+          createCommandClassName="AbstractionCreateCommand"

+          reorientCommandClassName="AbstractionReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="AbstractionEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeAbstractionLabelDisplayEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Abstraction"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

+        </modelFacet>

+        <labels

+            visualID="6006"

+            editPartClassName="AbstractionNameEditPart"

+            itemSemanticEditPolicyClassName="AbstractionNameItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6020"

+            editPartClassName="AbstractionAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="AbstractionAppliedStereotypeItemSemanticEditPolicy"

+            readOnly="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="30"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.1"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </links>

+      <links

+          visualID="4008"

+          editPartClassName="UsageEditPart"

+          itemSemanticEditPolicyClassName="UsageItemSemanticEditPolicy"

+          createCommandClassName="UsageCreateCommand"

+          reorientCommandClassName="UsageReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="UsageEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeUsageLabelDisplayEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Usage"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

+        </modelFacet>

+        <labels

+            visualID="6007"

+            editPartClassName="UsageNameEditPart"

+            itemSemanticEditPolicyClassName="UsageNameItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6021"

+            editPartClassName="UsageAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="UsageAppliedStereotypeItemSemanticEditPolicy"

+            readOnly="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="30"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.1"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </links>

+      <links

+          visualID="4009"

+          editPartClassName="DeploymentEditPart"

+          itemSemanticEditPolicyClassName="DeploymentItemSemanticEditPolicy"

+          createCommandClassName="DeploymentCreateCommand"

+          reorientCommandClassName="DeploymentReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="DeploymentEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeDeploymentLabelDisplayEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Deployment"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

+        </modelFacet>

+        <labels

+            visualID="6008"

+            editPartClassName="DeploymentNameEditPart"

+            itemSemanticEditPolicyClassName="DeploymentNameItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6022"

+            editPartClassName="DeploymentAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="DeploymentAppliedStereotypeItemSemanticEditPolicy"

+            readOnly="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="30"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.1"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </links>

+      <links

+          visualID="4017"

+          editPartClassName="RoleBindingEditPart"

+          itemSemanticEditPolicyClassName="RoleBindingItemSemanticEditPolicy"

+          sourceReorientingAllowed="false"

+          createCommandClassName="RoleBindingCreateCommand"

+          reorientCommandClassName="RoleBindingReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017"

+            displayName="RoleBinding"

+            editHelperClassName="RoleBindingEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.RoleBindingFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet"

+            modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.4">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

+        </modelFacet>

+        <labels

+            visualID="6027"

+            editPartClassName="RoleBindingRoleNameEditPart"

+            itemSemanticEditPolicyClassName="RoleBindingRoleNameItemSemanticEditPolicy"

+            readOnly="true"

+            alignment="SOURCE">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getRoleLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="20"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.2">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6028"

+            editPartClassName="RoleBindingAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="RoleBindingAppliedStereotypeItemSemanticEditPolicy"

+            readOnly="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.1"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <creationConstraints

+            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.5"

+            targetEnd="/0/@expressionProviders/@providers.0/@expressions.6"/>

+      </links>

+      <links

+          visualID="4010"

+          editPartClassName="DependencyEditPart"

+          itemSemanticEditPolicyClassName="DependencyItemSemanticEditPolicy"

+          createCommandClassName="DependencyCreateCommand"

+          reorientCommandClassName="DependencyReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="DependencyEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet"

+            modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.3">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

+        </modelFacet>

+        <labels

+            visualID="6009"

+            editPartClassName="DependencyNameEditPart"

+            itemSemanticEditPolicyClassName="DependencyNameItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6023"

+            editPartClassName="DependencyAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="DependencyAppliedStereotypeItemSemanticEditPolicy"

+            readOnly="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.1"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </links>

+      <links

+          visualID="4013"

+          editPartClassName="ConnectorEditPart"

+          itemSemanticEditPolicyClassName="ConnectorItemSemanticEditPolicy"

+          createCommandClassName="ConnectorCreateCommand"

+          reorientCommandClassName="ConnectorReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="ConnectorEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ConnectorFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedConnector"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedConnector"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector/end"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector/end"/>

+        </modelFacet>

+        <labels

+            visualID="6025"

+            editPartClassName="ConnectorAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="ConnectorAppliedStereotypeItemSemanticEditPolicy"

+            readOnly="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.1"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6050"

+            editPartClassName="ConnectorNameEditPart"

+            itemSemanticEditPolicyClassName="ConnectorNameItemSemanticEditPolicy"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="-20"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern=""

+              editorPattern=""

+              editPattern="">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6051"

+            editPartClassName="ConnectorMultiplicitySourceEditPart"

+            itemSemanticEditPolicyClassName="ConnectorMultiplicitySourceItemSemanticEditPolicy"

+            readOnly="true"

+            alignment="SOURCE">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getMultiplicitySourceLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="20"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="sourceMul{0}"

+              editorPattern="sourceMul{0}"

+              editPattern="sourceMul{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6052"

+            editPartClassName="ConnectorMultiplicityTargetEditPart"

+            itemSemanticEditPolicyClassName="ConnectorMultiplicityTargetItemSemanticEditPolicy"

+            readOnly="true"

+            alignment="TARGET">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getMultiplicityTargetLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="20"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="targetMul{0}"

+              editorPattern="targetMul{0}"

+              editPattern="targetMul{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </links>

+      <links

+          visualID="4015"

+          editPartClassName="GeneralizationEditPart"

+          itemSemanticEditPolicyClassName="GeneralizationItemSemanticEditPolicy"

+          createCommandClassName="GeneralizationCreateCommand"

+          reorientCommandClassName="GeneralizationReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"

+            editHelperClassName="GeneralizationEditHelper"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.GeneralizationFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/generalization"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/generalization"/>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization/specific"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization/general"/>

+        </modelFacet>

+        <labels

+            visualID="6024"

+            editPartClassName="GeneralizationAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="GeneralizationAppliedStereotypeItemSemanticEditPolicy"

+            readOnly="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.1"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization/isSubstitutable"/>

+          </modelFacet>

+        </labels>

+      </links>

+      <links

+          visualID="4018"

+          editPartClassName="TimeObservationEventEditPart"

+          itemSemanticEditPolicyClassName="TimeObservationEventSemanticEditPolicy"

+          createCommandClassName="TimeObservationEventCreateCommand"

+          reorientCommandClassName="TimeObservationEventReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            displayName="TimeObservationEvent"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>

+        <modelFacet

+            xsi:type="gmfgen:FeatureLinkModelFacet">

+          <metaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeObservation/event"/>

+        </modelFacet>

+      </links>

+      <links

+          visualID="4019"

+          editPartClassName="DurationObservationEventEditPart"

+          itemSemanticEditPolicyClassName="DurationObservationEventItemSemanticEditPolicy"

+          createCommandClassName="DurationObservationEventCreateCommand"

+          reorientCommandClassName="DurationObservationEventReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            displayName="DurationObservationEvent"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>

+        <modelFacet

+            xsi:type="gmfgen:FeatureLinkModelFacet">

+          <metaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationObservation/event"/>

+        </modelFacet>

+      </links>

+      <links

+          visualID="4020"

+          editPartClassName="RepresentationEditPart"

+          itemSemanticEditPolicyClassName="RepresentationItemSemanticEditPolicy"

+          createCommandClassName="RepresentationCreateCommand"

+          reorientCommandClassName="RepresentationReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:SpecializationType"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.composite.Representation_4020"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.RepresentationFigure">

+          <attributes

+              xsi:type="gmfgen:ColorAttributes"

+              foregroundColor="black"/>

+        </viewmap>

+        <modelFacet

+            xsi:type="gmfgen:FeatureLinkModelFacet">

+          <metaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationItem/represented"/>

+        </modelFacet>

+        <labels

+            visualID="6030"

+            editPartClassName="RepresentationTagLabelEditPart"

+            itemSemanticEditPolicyClassName="RepresentationTagLabelItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getTagLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="15"/>

+          </viewmap>

+        </labels>

+        <creationConstraints

+            targetEnd="/0/@expressionProviders/@providers.0/@expressions.8"/>

+      </links>

+      <links

+          visualID="4021"

+          editPartClassName="InformationFlowEditPart"

+          itemSemanticEditPolicyClassName="InformationFlowItemSemanticEditPolicy"

+          createCommandClassName="InformationFlowCreateCommand"

+          reorientCommandClassName="InformationFlowReorientCommand">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationFlowFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeInformationFlowLabelDisplayEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationFlow"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <childMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.0/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationFlow/informationSource"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationFlow/informationTarget"/>

+        </modelFacet>

+        <labels

+            visualID="6031"

+            editPartClassName="InformationFlowConveyedLabelEditPart"

+            itemSemanticEditPolicyClassName="InformationFlowConveyedLabelItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getConveyedLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="30"/>

+          </viewmap>

+          <behaviour

+              xsi:type="gmfgen:CustomBehaviour"

+              key="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.AbstractCustomLabelEditPolicy.SPECIFIC_NAME_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.InformationFlowCustomLabelEditPolicy"/>

+        </labels>

+        <labels

+            visualID="6032"

+            editPartClassName="InformationFlowAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="InformationFlowAppliedStereotypeItemSemanticEditPolicy"

+            readOnly="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="15"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.1"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <creationConstraints

+            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.9"

+            targetEnd="/0/@expressionProviders/@providers.0/@expressions.10"/>

+      </links>

+      <compartments

+          visualID="7033"

+          editPartClassName="DataTypeAttributeCompartmentEditPart"

+          itemSemanticEditPolicyClassName="DataTypeAttributeCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="DataTypeAttributeCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.34"

+          title="attributes"

+          node="/0/@diagram/@topLevelNodes.15">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getAttributeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7034"

+          editPartClassName="DataTypeOperationCompartmentEditPart"

+          itemSemanticEditPolicyClassName="DataTypeOperationCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="DataTypeOperationCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.35"

+          title="operations"

+          node="/0/@diagram/@topLevelNodes.15">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getOperationCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7036"

+          editPartClassName="DataTypeAttributeCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="DataTypeAttributeCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="DataTypeAttributeCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.34"

+          title="attributes"

+          node="/0/@diagram/@childNodes.21">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getAttributeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7037"

+          editPartClassName="DataTypeOperationCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="DataTypeOperationCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="DataTypeOperationCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.35"

+          title="operations"

+          node="/0/@diagram/@childNodes.21">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getOperationCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7048"

+          editPartClassName="EnumerationEnumerationLiteralCompartmentEditPart"

+          itemSemanticEditPolicyClassName="EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="EnumerationEnumerationLiteralCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.36"

+          title="literals"

+          node="/0/@diagram/@topLevelNodes.14">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getEnumerationLiteralCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7049"

+          editPartClassName="EnumerationEnumerationLiteralCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="EnumerationEnumerationLiteralCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.36"

+          title="literals"

+          node="/0/@diagram/@childNodes.20">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getEnumerationLiteralCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7050"

+          editPartClassName="ActivityCompositeCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="ActivityCompositeCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="ActivityCompositeCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@childNodes.6"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7051"

+          editPartClassName="InteractionCompositeCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="InteractionCompositeCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="InteractionCompositeCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@childNodes.7"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7052"

+          editPartClassName="ProtocolStateMachineCompositeCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="ProtocolStateMachineCompositeCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@childNodes.8"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7053"

+          editPartClassName="StateMachineCompositeCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="StateMachineCompositeCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="StateMachineCompositeCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@childNodes.9"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7054"

+          editPartClassName="FunctionBehaviorCompositeCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="FunctionBehaviorCompositeCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@childNodes.10"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7055"

+          editPartClassName="OpaqueBehaviorCompositeCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="OpaqueBehaviorCompositeCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@childNodes.11"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7056"

+          editPartClassName="ComponentCompositeCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@childNodes.12"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7057"

+          editPartClassName="DeviceCompositeCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="DeviceCompositeCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="DeviceCompositeCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@childNodes.13"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7058"

+          editPartClassName="ExecutionEnvironmentCompositeCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="ExecutionEnvironmentCompositeCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@childNodes.14"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7059"

+          editPartClassName="NodeCompositeCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="NodeCompositeCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="NodeCompositeCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@childNodes.15"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7060"

+          editPartClassName="ClassCompositeCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="ClassCompositeCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="ClassCompositeCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.0"

+          title="internal structure"

+          node="/0/@diagram/@childNodes.16"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7061"

+          editPartClassName="CollaborationCompositeCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="CollaborationCompositeCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="CollaborationCompositeCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@childNodes.17"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomCollaborationCompositeCompartmentItemSemanticEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7063"

+          editPartClassName="ActivityCompositeCompartmentEditPart"

+          itemSemanticEditPolicyClassName="ActivityCompositeCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ActivityCompositeCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@topLevelNodes.0"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7064"

+          editPartClassName="InteractionCompositeCompartmentEditPart"

+          itemSemanticEditPolicyClassName="InteractionCompositeCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="InteractionCompositeCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@topLevelNodes.1"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7065"

+          editPartClassName="ProtocolStateMachineCompositeCompartmentEditPart"

+          itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ProtocolStateMachineCompositeCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@topLevelNodes.2"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7066"

+          editPartClassName="StateMachineCompositeCompartmentEditPart"

+          itemSemanticEditPolicyClassName="StateMachineCompositeCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="StateMachineCompositeCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@topLevelNodes.3"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7067"

+          editPartClassName="FunctionBehaviorCompositeCompartmentEditPart"

+          itemSemanticEditPolicyClassName="FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="FunctionBehaviorCompositeCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@topLevelNodes.4"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7068"

+          editPartClassName="OpaqueBehaviorCompositeCompartmentEditPart"

+          itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="OpaqueBehaviorCompositeCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@topLevelNodes.5"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7069"

+          editPartClassName="ComponentCompositeCompartmentEditPart"

+          itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@topLevelNodes.6"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7070"

+          editPartClassName="DeviceCompositeCompartmentEditPart"

+          itemSemanticEditPolicyClassName="DeviceCompositeCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="DeviceCompositeCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@topLevelNodes.7"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7071"

+          editPartClassName="ExecutionEnvironmentCompositeCompartmentEditPart"

+          itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ExecutionEnvironmentCompositeCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@topLevelNodes.8"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7072"

+          editPartClassName="NodeCompositeCompartmentEditPart"

+          itemSemanticEditPolicyClassName="NodeCompositeCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="NodeCompositeCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@topLevelNodes.9"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7073"

+          editPartClassName="ClassCompositeCompartmentEditPart"

+          itemSemanticEditPolicyClassName="ClassCompositeCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="ClassCompositeCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32"

+          title="internal structure"

+          node="/0/@diagram/@topLevelNodes.10"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7075"

+          editPartClassName="CollaborationCompositeCompartmentEditPart"

+          itemSemanticEditPolicyClassName="CollaborationCompositeCompartmentItemSemanticEditPolicy"

+          canonicalEditPolicyClassName="CollaborationCompositeCompartmentCanonicalEditPolicy"

+          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+          title="internal structure"

+          node="/0/@diagram/@topLevelNodes.11"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomCollaborationCompositeCompartmentItemSemanticEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      </compartments>

+      <compartments

+          visualID="7077"

+          editPartClassName="PropertyPartCompartmentEditPartCN"

+          itemSemanticEditPolicyClassName="PropertyPartCompartmentItemSemanticEditPolicyCN"

+          canonicalEditPolicyClassName="PropertyPartCompartmentCanonicalEditPolicyCN"

+          childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.28"

+          title="internal structure"

+          node="/0/@diagram/@childNodes.3"

+          listLayout="false">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <viewmap

+            xsi:type="gmfgen:ParentAssignedViewmap"

+            getterName="getCompositeCompartmentFigure"

+            figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomPropertyPartCompartmentItemSemanticEditPolicyCN"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

+      </compartments>

+      <palette>

+        <groups

+            title="Nodes"

+            description="Nodes"

+            largeIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+            smallIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+            createMethodName="createNodesGroup"

+            id="&quot;composite.group.nodes&quot;">

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Class"

+              description="Create new Class"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"

+              createMethodName="createClassCreationTool"

+              id="&quot;composite.tool.class&quot;"

+              genNodes="/0/@diagram/@topLevelNodes.10 /0/@diagram/@childNodes.16"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Property"

+              description="Create new Property"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"

+              createMethodName="createPropertyCreationTool"

+              id="&quot;composite.tool.property&quot;"

+              genNodes="/0/@diagram/@childNodes.3"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Port"

+              description="Create new Port"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"

+              createMethodName="createPortCreationTool"

+              id="&quot;composite.tool.port&quot;"

+              genNodes="/0/@diagram/@childNodes.1"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Collaboration"

+              description="Create new Collaboration"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif"

+              createMethodName="createCollaborationCreationTool"

+              id="&quot;composite.tool.collaboration&quot;"

+              genNodes="/0/@diagram/@childNodes.17 /0/@diagram/@topLevelNodes.11"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="CollaborationRole"

+              description="Create new CollaborationRole"

+              largeIconPath="icons/obj16/CollaborationRole.gif"

+              smallIconPath="icons/obj16/CollaborationRole.gif"

+              createMethodName="createCollaborationRoleCreationTool"

+              id="&quot;composite.tool.collaborationrole&quot;"

+              genNodes="/0/@diagram/@childNodes.4"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="CollaborationUse"

+              description="Create new CollaborationUse"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif"

+              createMethodName="createCollaborationUseCreationTool"

+              id="&quot;composite.tool.collaborationuse&quot;"

+              genNodes="/0/@diagram/@childNodes.5"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Comment"

+              description="Create new Comment"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

+              createMethodName="createCommentCreationTool"

+              id="&quot;composite.tool.comment&quot;"

+              genNodes="/0/@diagram/@childNodes.28 /0/@diagram/@topLevelNodes.43"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Constraint"

+              description="Create new Constraint"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

+              createMethodName="createConstraintCreationTool"

+              id="&quot;composite.tool.constraint&quot;"

+              genNodes="/0/@diagram/@topLevelNodes.48 /0/@diagram/@childNodes.33"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="TimeObservation"

+              description="Create new TimeObservation"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"

+              createMethodName="createTimeObservationCreationTool"

+              id="&quot;composite.tool.timeobservation&quot;"

+              genNodes="/0/@diagram/@topLevelNodes.28"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="DurationObservation"

+              description="Create new DurationObservation"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"

+              createMethodName="createDurationObservationCreationTool"

+              id="&quot;composite.tool.durationobservation&quot;"

+              genNodes="/0/@diagram/@topLevelNodes.27"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="InformationItem"

+              description="Create new InformationItem"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif"

+              createMethodName="createInformationItemCreationTool"

+              id="&quot;composite.tool.informationitem&quot;"

+              genNodes="/0/@diagram/@childNodes.25 /0/@diagram/@topLevelNodes.19"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Parameter"

+              description="Create new Parameter"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif"

+              createMethodName="createParameterCreationTool"

+              id="&quot;composite.tool.parameter&quot;"

+              genNodes="/0/@diagram/@childNodes.2"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Activity"

+              description="Create new Activity"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"

+              createMethodName="createActivityCreationTool"

+              id="&quot;composite.tool.activity&quot;"

+              genNodes="/0/@diagram/@childNodes.6 /0/@diagram/@topLevelNodes.0"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Interaction"

+              description="Create new Interaction"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif"

+              createMethodName="createInteractionCreationTool"

+              id="&quot;composite.tool.interaction&quot;"

+              genNodes="/0/@diagram/@childNodes.7 /0/@diagram/@topLevelNodes.1"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="ProtocolStateMachine"

+              description="Create new ProtocolStateMachine"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif"

+              createMethodName="createProtocolStateMachineCreationTool"

+              id="&quot;composite.tool.protocolstatemachine&quot;"

+              genNodes="/0/@diagram/@childNodes.8 /0/@diagram/@topLevelNodes.2"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="StateMachine"

+              description="Create new StateMachine"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif"

+              createMethodName="createStateMachineCreationTool"

+              id="&quot;composite.tool.statemachine&quot;"

+              genNodes="/0/@diagram/@childNodes.9 /0/@diagram/@topLevelNodes.3"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="FunctionBehavior"

+              description="Create new FunctionBehavior"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif"

+              createMethodName="createFunctionBehaviorCreationTool"

+              id="&quot;composite.tool.functionbehavior&quot;"

+              genNodes="/0/@diagram/@childNodes.10 /0/@diagram/@topLevelNodes.4"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="OpaqueBehavior"

+              description="Create new OpaqueBehavior"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif"

+              createMethodName="createOpaqueBehaviorCreationTool"

+              id="&quot;composite.tool.opaquebehavior&quot;"

+              genNodes="/0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.5"/>

+        </groups>

+        <groups

+            title="Edges"

+            description="Edges"

+            largeIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+            smallIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+            createMethodName="createEdgesGroup"

+            id="&quot;composite.group.edges&quot;">

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Link"

+              description="Create new Link (Comment / Constraint)"

+              largeIconPath="icons/obj16/Link.gif"

+              smallIconPath="icons/obj16/Link.gif"

+              createMethodName="createLinkCreationTool"

+              id="&quot;composite.tool.link&quot;"

+              genLinks="/0/@diagram/@links.2 /0/@diagram/@links.3 /0/@diagram/@links.16 /0/@diagram/@links.17"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Connector"

+              description="Create new Connector"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"

+              createMethodName="createConnectorCreationTool"

+              id="&quot;composite.tool.connector&quot;"

+              genLinks="/0/@diagram/@links.14"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="RoleBinding"

+              description="Create new RoleBinding"

+              largeIconPath="icons/obj16/CollaborationRoleBinding.gif"

+              smallIconPath="icons/obj16/CollaborationRoleBinding.gif"

+              createMethodName="createRoleBindingCreationTool"

+              id="&quot;composite.tool.rolebinding&quot;"

+              genLinks="/0/@diagram/@links.12"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Generalization"

+              description="Create new Generalization"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"

+              createMethodName="createGeneralizationCreationTool"

+              id="&quot;composite.tool.generalization&quot;"

+              genLinks="/0/@diagram/@links.15"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Realization"

+              description="Create new Realization"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif"

+              createMethodName="createRealizationCreationTool"

+              id="&quot;composite.tool.realization&quot;"

+              genLinks="/0/@diagram/@links.7"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Substitution"

+              description="Create new Substitution"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"

+              createMethodName="createSubstitutionCreationTool"

+              id="&quot;composite.tool.substitution&quot;"

+              genLinks="/0/@diagram/@links.6"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Abstraction"

+              description="Create new Abstraction"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"

+              createMethodName="createAbstractionCreationTool"

+              id="&quot;composite.tool.abstraction&quot;"

+              genLinks="/0/@diagram/@links.9"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Usage"

+              description="Create new Usage"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"

+              createMethodName="createUsageCreationTool"

+              id="&quot;composite.tool.usage&quot;"

+              genLinks="/0/@diagram/@links.10"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Dependency"

+              description="Create new Dependency"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

+              createMethodName="createDependencyCreationTool"

+              id="&quot;composite.tool.dependency&quot;"

+              genLinks="/0/@diagram/@links.13"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="Representation"

+              description="Create new representation for an InformationItem"

+              largeIconPath="icons/obj16/Representation.gif"

+              smallIconPath="icons/obj16/Representation.gif"

+              createMethodName="createRepresentationCreationTool"

+              id="&quot;composite.tool.representation&quot;"

+              genLinks="/0/@diagram/@links.18"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

+              title="InformationFlow"

+              description="Create new InformationFlow"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif"

+              createMethodName="createInformationFlowCreationTool"

+              id="&quot;composite.tool.informationflow&quot;"

+              genLinks="/0/@diagram/@links.19"/>

+        </groups>

+      </palette>

+      <preferencePages

+          xsi:type="gmfgen:GenStandardPreferencePage"

+          iD="org.eclipse.uml2.uml.diagram.general"

+          name="UML Diagram">

+        <children

+            xsi:type="gmfgen:GenStandardPreferencePage"

+            iD="org.eclipse.uml2.uml.diagram.appearance"

+            name="Appearance"

+            kind="Appearance"/>

+        <children

+            xsi:type="gmfgen:GenStandardPreferencePage"

+            iD="org.eclipse.uml2.uml.diagram.connections"

+            name="Connections"

+            kind="Connections"/>

+        <children

+            xsi:type="gmfgen:GenStandardPreferencePage"

+            iD="org.eclipse.uml2.uml.diagram.printing"

+            name="Printing"

+            kind="Printing"/>

+        <children

+            xsi:type="gmfgen:GenStandardPreferencePage"

+            iD="org.eclipse.uml2.uml.diagram.rulersAndGrid"

+            name="Rulers And Grid"

+            kind="RulersAndGrid"/>

+      </preferencePages>

+    </diagram>

+    <plugin

+        iD="org.eclipse.papyrus.uml.diagram.composite"

+        name="Papyrus Composite Structure Diagram "

+        provider="Eclipse Modeling Project">

+      <requiredPlugins>org.eclipse.draw2d</requiredPlugins>

+      <requiredPlugins>org.eclipse.gmf.runtime.draw2d.ui</requiredPlugins>

+    </plugin>

+    <editor/>

+    <diagramUpdater

+        nodeDescriptorClassName="UMLNodeDescriptor"/>

+    <propertySheet>

+      <tabs

+          xsi:type="gmfgen:GenStandardPropertyTab"

+          iD="appearance"/>

+      <tabs

+          xsi:type="gmfgen:GenStandardPropertyTab"

+          iD="diagram"/>

+      <tabs

+          xsi:type="gmfgen:GenCustomPropertyTab"

+          iD="domain"

+          label="Core">

+        <filter

+            xsi:type="gmfgen:TypeTabFilter">

+          <types>org.eclipse.gmf.runtime.notation.View</types>

+          <types>org.eclipse.gef.EditPart</types>

+          <generatedTypes>abstractNavigatorItem</generatedTypes>

+        </filter>

+      </tabs>

+    </propertySheet>

+    <domainGenModel

+        href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#/"/>

+    <expressionProviders>

+      <providers

+          xsi:type="gmfgen:GenJavaExpressionProvider"

+          injectExpressionBody="true">

+        <expressions

+            body="return org.eclipse.papyrus.uml.tools.utils.NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());"/>

+        <expressions

+            body="return it.getBody();"/>

+        <expressions

+            xsi:type="gmfgen:GenConstraint"

+            body="// Property / CollaborationRole constraint&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;// Restriction for the case where domainElement owner is a Collaboration&#xD;&#xA;&#x9;&#x9;// If the domainElement is not referenced as one of its owner role&#xD;&#xA;&#x9;&#x9;// then it should be considered as a Property creation on Collaboration,&#xD;&#xA;&#x9;&#x9;// else the test should return false and be considered as a representation of&#xD;&#xA;&#x9;&#x9;// a collaboration role (ConnectableElement).&#xD;&#xA;&#x9;&#x9;if (containerView.getElement() instanceof org.eclipse.uml2.uml.Collaboration) {&#xD;&#xA;&#x9;&#x9;&#x9;org.eclipse.uml2.uml.Collaboration graphicalParent = (org.eclipse.uml2.uml.Collaboration) containerView.getElement();&#xD;&#xA;&#x9;&#x9;&#x9;if (graphicalParent.getCollaborationRoles().contains(domainElement)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;// General case : no restriction&#xD;&#xA;&#x9;&#x9;return true;"/>

+        <expressions

+            xsi:type="gmfgen:GenConstraint"

+            body="// Test if the dependency is not a RoleBinding&#xD;&#xA;&#x9;&#x9;if (domainElement.getOwner() instanceof org.eclipse.uml2.uml.CollaborationUse) {&#xD;&#xA;&#x9;&#x9;&#x9;org.eclipse.uml2.uml.CollaborationUse owner = (org.eclipse.uml2.uml.CollaborationUse) domainElement.getOwner();&#xD;&#xA;&#x9;&#x9;&#x9;if (owner.getRoleBindings().contains(domainElement)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;return true;"/>

+        <expressions

+            xsi:type="gmfgen:GenConstraint"

+            body="// Test if the dependency is a RoleBinding&#xD;&#xA;&#x9;&#x9;if (domainElement.getOwner() instanceof org.eclipse.uml2.uml.CollaborationUse) {&#xD;&#xA;&#x9;&#x9;&#x9;org.eclipse.uml2.uml.CollaborationUse owner = (org.eclipse.uml2.uml.CollaborationUse) domainElement.getOwner();&#xD;&#xA;&#x9;&#x9;&#x9;if (owner.getRoleBindings().contains(domainElement)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;return true;&#xD;&#xA;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;return false;"/>

+        <expressions

+            xsi:type="gmfgen:GenConstraint"

+            body="// RoleBinding source constraint&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if ((source != null) &amp;&amp; !(source instanceof org.eclipse.uml2.uml.CollaborationUse)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;// RoleBinding source has a type&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if ((source != null) &amp;&amp; (((org.eclipse.uml2.uml.CollaborationUse) source).getType() == null)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}"/>

+        <expressions

+            xsi:type="gmfgen:GenConstraint"

+            body="// RoleBinding target constraint&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if ((target != null) &amp;&amp; !(target instanceof org.eclipse.uml2.uml.ConnectableElement)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;// RoleBinding source and target have the same semantic parent&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if ((source != null) &amp;&amp; (target != null) &amp;&amp; (source.getOwner() != target.getOwner())) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}"/>

+        <expressions

+            body="// InformationItem is Abstract&#xD;&#xA;return true;"/>

+        <expressions

+            xsi:type="gmfgen:GenConstraint"

+            body="// Represented InformationItem Target&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if (target != null) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (!((target instanceof org.eclipse.uml2.uml.Class)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Interface)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.InformationItem)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Signal) || &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;(target instanceof org.eclipse.uml2.uml.Component))) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}"/>

+        <expressions

+            xsi:type="gmfgen:GenConstraint"

+            body="//Information Flow source constraint&#xD;&#xA;if (source != null) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (!((source instanceof org.eclipse.uml2.uml.Actor)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Node)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.UseCase)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Artifact)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Class)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Component)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Port)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Property)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Interface)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Package)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.ActivityNode)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.ActivityPartition) || (source instanceof org.eclipse.uml2.uml.InstanceSpecification))) {&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (source instanceof org.eclipse.uml2.uml.InstanceSpecification) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;org.eclipse.emf.common.util.EList&lt; org.eclipse.uml2.uml.Classifier> classes = ((org.eclipse.uml2.uml.InstanceSpecification) source).getClassifiers();&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;for (int i = 0; i &lt; classes.size(); i++) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;if (classes.get(i) instanceof org.eclipse.uml2.uml.Relationship) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}"/>

+        <expressions

+            xsi:type="gmfgen:GenConstraint"

+            body="//Information Flow target constraint&#xD;&#xA;if (target != null) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (!((target instanceof org.eclipse.uml2.uml.Actor)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Node)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.UseCase)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Artifact)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Class)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Component)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Port)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Property)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Interface)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Package)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.ActivityNode)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.ActivityPartition) || (target instanceof org.eclipse.uml2.uml.InstanceSpecification))) {&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (target instanceof org.eclipse.uml2.uml.InstanceSpecification) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;org.eclipse.emf.common.util.EList&lt; org.eclipse.uml2.uml.Classifier> classes = ((org.eclipse.uml2.uml.InstanceSpecification) target).getClassifiers();&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;for (int i = 0; i &lt; classes.size(); i++) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;if (classes.get(i) instanceof org.eclipse.uml2.uml.Relationship) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}"/>

+        <expressions

+            xsi:type="gmfgen:GenConstraint"

+            body="// Creation constraint for TopLevelNodes&#xD;&#xA;&#x9;if(! (getElementToEdit() instanceof org.eclipse.uml2.uml.Package)) {&#xD;&#xA;&#x9;&#x9;return false;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;return true;"/>

+        <expressions

+            body="// Comment body init&#xD;&#xA;return &quot;&quot;;"/>

+        <expressions

+            body="// Constraint specification init&#xD;&#xA;org.eclipse.uml2.uml.LiteralString value = org.eclipse.uml2.uml.UMLFactory.eINSTANCE.createLiteralString();&#xD;&#xA;value.setValue(&quot;&quot;);&#xD;&#xA;return value;"/>

+      </providers>

+      <providers

+          xsi:type="gmfgen:GenLiteralExpressionProvider">

+        <expressions

+            body="org.eclipse.uml2.uml.AggregationKind.COMPOSITE_LITERAL"/>

+      </providers>

+    </expressionProviders>

+    <labelParsers

+        extensibleViaService="true">

+      <implementations

+          xsi:type="gmfgen:PredefinedParser"

+          uses="/0/@diagram/@topLevelNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.2/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.3/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.5/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.13/@labels.0/@modelFacet /0/@diagram/@childNodes.36/@labelModelFacet /0/@diagram/@topLevelNodes.14/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.15/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.6/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.7/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.9/@labels.0/@modelFacet /0/@diagram/@childNodes.1/@labels.0/@modelFacet /0/@diagram/@childNodes.3/@labels.0/@modelFacet /0/@diagram/@childNodes.5/@labels.0/@modelFacet /0/@diagram/@childNodes.6/@labels.0/@modelFacet /0/@diagram/@childNodes.7/@labels.0/@modelFacet /0/@diagram/@childNodes.8/@labels.0/@modelFacet /0/@diagram/@childNodes.9/@labels.0/@modelFacet /0/@diagram/@childNodes.10/@labels.0/@modelFacet /0/@diagram/@childNodes.11/@labels.0/@modelFacet /0/@diagram/@childNodes.19/@labels.0/@modelFacet /0/@diagram/@childNodes.20/@labels.0/@modelFacet /0/@diagram/@childNodes.21/@labels.0/@modelFacet /0/@diagram/@childNodes.12/@labels.0/@modelFacet /0/@diagram/@childNodes.13/@labels.0/@modelFacet /0/@diagram/@childNodes.14/@labels.0/@modelFacet /0/@diagram/@childNodes.15/@labels.0/@modelFacet /0/@diagram/@childNodes.17/@labels.0/@modelFacet /0/@diagram/@childNodes.22/@labels.0/@modelFacet /0/@diagram/@childNodes.23/@labels.0/@modelFacet /0/@diagram/@childNodes.24/@labels.0/@modelFacet /0/@diagram/@childNodes.25/@labels.0/@modelFacet /0/@diagram/@childNodes.26/@labels.0/@modelFacet /0/@diagram/@childNodes.27/@labels.0/@modelFacet /0/@diagram/@childNodes.18/@labels.0/@modelFacet /0/@diagram/@childNodes.16/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.10/@labels.0/@modelFacet /0/@diagram/@childNodes.34/@labelModelFacet /0/@diagram/@childNodes.35/@labelModelFacet /0/@diagram/@topLevelNodes.11/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.12/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.16/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.17/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.18/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.19/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.20/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.21/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.22/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.23/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.24/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.25/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.26/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.29/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.30/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.31/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.32/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.33/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.34/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.35/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.36/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.37/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.38/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.39/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.40/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.41/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.42/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.44/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.45/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.46/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.47/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.48/@labels.0/@modelFacet /0/@diagram/@links.4/@labels.0/@modelFacet /0/@diagram/@links.5/@labels.0/@modelFacet /0/@diagram/@links.6/@labels.0/@modelFacet /0/@diagram/@links.7/@labels.0/@modelFacet /0/@diagram/@links.8/@labels.0/@modelFacet /0/@diagram/@links.9/@labels.0/@modelFacet /0/@diagram/@links.10/@labels.0/@modelFacet /0/@diagram/@links.11/@labels.0/@modelFacet /0/@diagram/@links.13/@labels.0/@modelFacet /0/@diagram/@childNodes.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.28/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.27/@labels.0/@modelFacet /0/@diagram/@childNodes.2/@labels.0/@modelFacet /0/@diagram/@childNodes.29/@labels.0/@modelFacet /0/@diagram/@childNodes.30/@labels.0/@modelFacet /0/@diagram/@childNodes.31/@labels.0/@modelFacet /0/@diagram/@childNodes.33/@labels.0/@modelFacet /0/@diagram/@childNodes.32/@labels.0/@modelFacet /0/@diagram/@links.14/@labels.1/@modelFacet /0/@diagram/@links.14/@labels.2/@modelFacet /0/@diagram/@links.14/@labels.3/@modelFacet"/>

+      <implementations

+          xsi:type="gmfgen:CustomParser"

+          uses="/0/@diagram/@links.4/@labels.1/@modelFacet /0/@diagram/@links.5/@labels.1/@modelFacet /0/@diagram/@links.6/@labels.1/@modelFacet /0/@diagram/@links.7/@labels.1/@modelFacet /0/@diagram/@links.8/@labels.1/@modelFacet /0/@diagram/@links.9/@labels.1/@modelFacet /0/@diagram/@links.10/@labels.1/@modelFacet /0/@diagram/@links.11/@labels.1/@modelFacet /0/@diagram/@links.13/@labels.1/@modelFacet /0/@diagram/@links.15/@labels.0/@modelFacet /0/@diagram/@links.14/@labels.0/@modelFacet /0/@diagram/@links.12/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.28/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.27/@labels.1/@modelFacet /0/@diagram/@childNodes.1/@labels.1/@modelFacet /0/@diagram/@links.19/@labels.1/@modelFacet /0/@diagram/@childNodes.2/@labels.1/@modelFacet"

+          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser"/>

+      <implementations

+          xsi:type="gmfgen:CustomParser"

+          uses="/0/@diagram/@links.12/@labels.0/@modelFacet"

+          qualifiedName="org.eclipse.papyrus.uml.diagram.composite.custom.parsers.RoleBindingRoleNameParser"/>

+      <implementations

+          xsi:type="gmfgen:CustomParser"

+          uses="/0/@diagram/@topLevelNodes.43/@labels.0/@modelFacet /0/@diagram/@childNodes.28/@labels.0/@modelFacet"

+          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.CommentParser"/>

+      <implementations

+          xsi:type="gmfgen:CustomParser"

+          uses="/0/@diagram/@topLevelNodes.44/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.45/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.46/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.47/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.48/@labels.1/@modelFacet /0/@diagram/@childNodes.29/@labels.1/@modelFacet /0/@diagram/@childNodes.30/@labels.1/@modelFacet /0/@diagram/@childNodes.31/@labels.1/@modelFacet /0/@diagram/@childNodes.33/@labels.1/@modelFacet /0/@diagram/@childNodes.32/@labels.1/@modelFacet"

+          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.ConstraintParser"/>

+    </labelParsers>

+    <contextMenus

+        context="/0/@diagram">

+      <items

+          xsi:type="gmfgen:LoadResourceAction"/>

+    </contextMenus>

+  </gmfgen:GenEditorGenerator>

+  <papyrusgmfgenextension:PapyrusExtensionRootNode

+      comment="Papyrus specific extension for GMFGen">

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="Add super class to a selected set of generated EditParts"

+        genView="/0/@diagram/@topLevelNodes.13 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.19 /0/@diagram/@topLevelNodes.20 /0/@diagram/@childNodes.12 /0/@diagram/@topLevelNodes.6 /0/@diagram/@childNodes.21 /0/@diagram/@topLevelNodes.15 /0/@diagram/@childNodes.20 /0/@diagram/@topLevelNodes.14 /0/@diagram/@topLevelNodes.10 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.18 /0/@diagram/@topLevelNodes.12 /0/@diagram/@childNodes.6 /0/@diagram/@topLevelNodes.0 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.17 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.11 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@topLevelNodes.19 /0/@diagram/@childNodes.25"

+        name="EP_NamedElement_NODE"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="Label in charge to display applied stereotypes on links"

+        genView="/0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.7 /0/@diagram/@links.8 /0/@diagram/@links.9 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@links.13 /0/@diagram/@links.15 /0/@diagram/@links.14 /0/@diagram/@links.12 /0/@diagram/@links.19 /0/@diagram/@links.18"

+        name="EP_NamedElement_EDGE"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="This manages graphical refresh when aggregation kind changes"

+        genView="/0/@diagram/@childNodes.3"

+        name="EP_ConnectableElement_As_Part_NODE"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts.CustomPropertyPartEditPartCN"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="Adds a superclass for DurationObservationEditPart, TimeObservationEditPart"

+        genView="/0/@diagram/@topLevelNodes.28 /0/@diagram/@topLevelNodes.27"

+        name="EP_Observation_NODE"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts.AbstractObservationEditPart"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="Manage named element figure relying on Affixed Node"

+        genView="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+        name="EP_NamedElement_AFF_NODE"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="Manages stereotype shown with External Label"

+        genView="/0/@diagram/@topLevelNodes.28/@labels.1 /0/@diagram/@topLevelNodes.27/@labels.1 /0/@diagram/@childNodes.1/@labels.1"

+        name="EP_Stereotypes_EXT_NODE"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="Add super class to a Comment edit parts"

+        genView="/0/@diagram/@topLevelNodes.43 /0/@diagram/@childNodes.28"

+        name="EP_Comment_NODE"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="Add super class to a Constraint edit parts"

+        genView="/0/@diagram/@topLevelNodes.44 /0/@diagram/@topLevelNodes.45 /0/@diagram/@topLevelNodes.46 /0/@diagram/@topLevelNodes.47 /0/@diagram/@topLevelNodes.48 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+        name="EP_Constraint_NODE"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:SpecificLocator"

+        comment="Affixed Port locator"

+        classpath="org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator"

+        genChildSideAffixedNode="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:SpecificLocatorExternalLabel"

+        comment="External node label locator"

+        classpath="org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator"

+        genExternalNodeLabel="/0/@diagram/@topLevelNodes.28/@labels.1 /0/@diagram/@topLevelNodes.27/@labels.1 /0/@diagram/@childNodes.1/@labels.1 /0/@diagram/@childNodes.1/@labels.0 /0/@diagram/@topLevelNodes.27/@labels.0 /0/@diagram/@topLevelNodes.28/@labels.0 /0/@diagram/@childNodes.2/@labels.0 /0/@diagram/@childNodes.2/@labels.1"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:SpecificDiagramUpdater"

+        comment="Property (Part) custom DiagramUpdater"

+        classpath="org.eclipse.papyrus.uml.diagram.composite.custom.parts.PropertyDiagramUpdater"

+        genNode="/0/@diagram/@childNodes.3"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:SpecificDiagramUpdater"

+        comment="Property (Part) compartment custom DiagramUpdater"

+        classpath="org.eclipse.papyrus.uml.diagram.composite.custom.parts.PropertyDiagramUpdater"

+        genNode="/0/@diagram/@compartments.30"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:GenNodeConstraint"

+        comment="Creation constraint for TopLevelNode in virtual canvas"

+        genNode="/0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.10 /0/@diagram/@topLevelNodes.11 /0/@diagram/@topLevelNodes.12 /0/@diagram/@topLevelNodes.13 /0/@diagram/@topLevelNodes.14 /0/@diagram/@topLevelNodes.15 /0/@diagram/@topLevelNodes.16 /0/@diagram/@topLevelNodes.17 /0/@diagram/@topLevelNodes.18 /0/@diagram/@topLevelNodes.19 /0/@diagram/@topLevelNodes.20 /0/@diagram/@topLevelNodes.21 /0/@diagram/@topLevelNodes.22 /0/@diagram/@topLevelNodes.23 /0/@diagram/@topLevelNodes.24 /0/@diagram/@topLevelNodes.25 /0/@diagram/@topLevelNodes.26 /0/@diagram/@topLevelNodes.27 /0/@diagram/@topLevelNodes.28 /0/@diagram/@topLevelNodes.29 /0/@diagram/@topLevelNodes.30 /0/@diagram/@topLevelNodes.31 /0/@diagram/@topLevelNodes.32 /0/@diagram/@topLevelNodes.33 /0/@diagram/@topLevelNodes.34 /0/@diagram/@topLevelNodes.35 /0/@diagram/@topLevelNodes.36 /0/@diagram/@topLevelNodes.37 /0/@diagram/@topLevelNodes.38 /0/@diagram/@topLevelNodes.39 /0/@diagram/@topLevelNodes.40 /0/@diagram/@topLevelNodes.41 /0/@diagram/@topLevelNodes.42 /0/@diagram/@topLevelNodes.43 /0/@diagram/@topLevelNodes.44 /0/@diagram/@topLevelNodes.45 /0/@diagram/@topLevelNodes.46 /0/@diagram/@topLevelNodes.47 /0/@diagram/@topLevelNodes.48"

+        genConstraint="/0/@expressionProviders/@providers.0/@expressions.11"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:AdditionalEditPartCandies"

+        comment="Indicate specific BaseEditHelper in place of generated EditHelper"

+        baseEditHelperPackage="org.eclipse.papyrus.uml.diagram.common.helper"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:EditPartUsingDeleteService"

+        comment="The delete service is used on every TopNode Childnode and Link"

+        name="Every TopNode ChildNode Link"

+        genView="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33 /0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.10 /0/@diagram/@topLevelNodes.11 /0/@diagram/@topLevelNodes.12 /0/@diagram/@topLevelNodes.13 /0/@diagram/@topLevelNodes.14 /0/@diagram/@topLevelNodes.15 /0/@diagram/@topLevelNodes.16 /0/@diagram/@topLevelNodes.17 /0/@diagram/@topLevelNodes.18 /0/@diagram/@topLevelNodes.19 /0/@diagram/@topLevelNodes.20 /0/@diagram/@topLevelNodes.21 /0/@diagram/@topLevelNodes.22 /0/@diagram/@topLevelNodes.23 /0/@diagram/@topLevelNodes.24 /0/@diagram/@topLevelNodes.25 /0/@diagram/@topLevelNodes.26 /0/@diagram/@topLevelNodes.27 /0/@diagram/@topLevelNodes.28 /0/@diagram/@topLevelNodes.29 /0/@diagram/@topLevelNodes.30 /0/@diagram/@topLevelNodes.31 /0/@diagram/@topLevelNodes.32 /0/@diagram/@topLevelNodes.33 /0/@diagram/@topLevelNodes.34 /0/@diagram/@topLevelNodes.35 /0/@diagram/@topLevelNodes.36 /0/@diagram/@topLevelNodes.37 /0/@diagram/@topLevelNodes.38 /0/@diagram/@topLevelNodes.39 /0/@diagram/@topLevelNodes.40 /0/@diagram/@topLevelNodes.41 /0/@diagram/@topLevelNodes.42 /0/@diagram/@topLevelNodes.43 /0/@diagram/@topLevelNodes.44 /0/@diagram/@topLevelNodes.45 /0/@diagram/@topLevelNodes.46 /0/@diagram/@topLevelNodes.47 /0/@diagram/@topLevelNodes.48 /0/@diagram/@links.1 /0/@diagram/@links.2 /0/@diagram/@links.3 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.7 /0/@diagram/@links.8 /0/@diagram/@links.9 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@links.12 /0/@diagram/@links.13 /0/@diagram/@links.14 /0/@diagram/@links.15 /0/@diagram/@links.16 /0/@diagram/@links.17 /0/@diagram/@links.18 /0/@diagram/@links.19"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:EditPartUsingReorientService"

+        comment="Use the edit service for reorient command (All DirectedRelationship)"

+        name="DirectedRelationship"

+        genView="/0/@diagram/@links.15 /0/@diagram/@links.19 /0/@diagram/@links.13 /0/@diagram/@links.11 /0/@diagram/@links.10 /0/@diagram/@links.9 /0/@diagram/@links.8 /0/@diagram/@links.7 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:EditPartUsingReorientService"

+        comment="Use the edit service for reorient command (Connector)"

+        name="Connector"

+        genView="/0/@diagram/@links.14"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="this is an abstract class for BehaviorPortEditPart"

+        genView="/0/@diagram/@childNodes.0"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts.AbstractBehaviorPortEditPart"/>

+  </papyrusgmfgenextension:PapyrusExtensionRootNode>

+</xmi:XMI>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/pom.xml
index 0dda389a31e..ac70bd96f1e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.composite</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java
index 7913c32f299..30ddf532741 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java
index c517e990693..e44e145a741 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
index 17efd0a1e29..e5595791b7e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java
index d83223ee147..cf2c9cb6f9d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java
index 818bcefd215..1c460bbf676 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java
index 0c8ed06b0f9..717cc7ee040 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java
index c6b6ef94809..ef010cbee27 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java
index 00c34661f03..341bcd71865 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java
@@ -61,6 +61,7 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

 import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

 import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -85,7 +86,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ConnectorNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class ConnectorNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java
index 16ccdaf5850..3bc3289281b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java
index 3892fe0e3b0..22d24f0b1a9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java
index 722c97f4e50..d25cf1eddf2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java
index fbf5fc61407..7a5e2037175 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java
index 1d3985fee92..58029503b30 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java
index 81457ce198e..53c530cd881 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java
index 982292f83e1..6eb96e45e1e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -83,7 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java
index a0374b28218..d19fb75b5fc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java
index 1ec714e9295..04db334f599 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java
index e05a884dec9..dda4e01a1b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java
index 05c542d83a1..aebe886b6fa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ManifestationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class ManifestationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java
index 6eda5066368..7bae40e14cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java
@@ -63,6 +63,7 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
 import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.LabelAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPortLabelEditPolicy;

@@ -148,6 +149,7 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

 		installEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL, new IndirectPortLabelEditPolicy());

+		installEditPolicy(LabelAlignmentEditPolicy.LABEL_ALIGNMENT_KEY, new LabelAlignmentEditPolicy());

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java
index 192fdc45ec8..94ba1ded865 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java
index a7eb109f4e8..fa0fc1ba6e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java
index 3a3b57f660c..957dec5a908 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java
index 15adf11a585..ab0f80b4187 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java
index e60e20e8e48..d8b5eda34c3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java
index c212118f4e2..0b9eb15f609 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java
index e901bf73a86..03e844b2a0d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java
index 6a504828014..8b31a19ded5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java
index b16f0179d98..404de5e7e45 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

@@ -81,7 +82,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF
index ebbe504f8e6..f1a39726646 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.7.0",

  org.eclipse.e4.ui.css.core;bundle-version="0.10.100",

  org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: UML-Specific CSS concepts

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.css.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/pom.xml
index 12d7110fb2c..6521d025c35 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.css</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
index 61d44ff156b..a0b65f1074c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
@@ -28,19 +28,19 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,

  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,

  org.eclipse.ocl.ecore,

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",

  org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

  org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0",

  org.eclipse.core.runtime,

  org.eclipse.core.resources,

@@ -53,7 +53,7 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,
  org.eclipse.gmf.runtime.emf.commands.core,

  org.eclipse.gmf.runtime.emf.ui.properties,

  org.eclipse.gmf.runtime.diagram.ui,

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.providers.ide,

  org.eclipse.gmf.runtime.diagram.ui.render,

  org.eclipse.gmf.runtime.diagram.ui.resources.editor,

@@ -64,14 +64,14 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,
  org.eclipse.emf.ecore.edit,

  org.eclipse.emf.validation,

  org.eclipse.gef,

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.deployment.part.UMLD

  iagramEditorPlugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/pom.xml
index 7e7e4019b48..544175b4597 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.deployment</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF
index 604355ccb6c..394133c7927 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF
@@ -4,21 +4,21 @@ Export-Package: org.eclipse.papyrus.uml.diagram.dnd,
  org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.command,

  org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.ui

 Require-Bundle: org.eclipse.ui,

- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: UML Drag and Drop

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.dnd.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/pom.xml
index 65245c3cb95..ba9f376edc4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.dnd</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF
index de863f99193..83cf24ef179 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
 Manifest-Version: 1.0

 Export-Package: org.eclipse.papyrus.uml.diagram.emftree

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.uml2.uml.editor;bundle-version="4.1.0",

  org.eclipse.core.runtime;bundle-version="3.7.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.emftree.Activator

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF
index e0961f21647..641aebe7e67 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/pom.xml
index 01914c4eef0..831fbfe783e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.icons</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
index e3d6b55cb4f..68d61d22707 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
@@ -14,51 +14,51 @@ Export-Package: org.eclipse.papyrus.uml.diagram.interactionoverview,
  org.eclipse.papyrus.uml.diagram.interactionoverview.provider,

  org.eclipse.papyrus.uml.diagram.interactionoverview.utils

 Require-Bundle: org.eclipse.ui,

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.providers,

  org.eclipse.gmf.runtime.diagram.ui.resources.editor,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

  org.eclipse.emf.common.ui;bundle-version="2.7.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.timing;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.timing;bundle-version="1.1.0",

  org.eclipse.ui.navigator;bundle-version="3.5.200",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.6.0",

- org.eclipse.papyrus.uml.diagram.sequence;bundle-version="1.0.1";resolution:=optional,

- org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.sequence;bundle-version="1.1.0";resolution:=optional,

+ org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",

  org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.modelexplorer;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.hyperlink;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.modelexplorer;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.hyperlink;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.interactionoverview.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/pom.xml
index 5e28851c2f3..30f3bd89470 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.interactionoverview</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
index d2de32d3de7..c0dce0de6d4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Export-Package: org.eclipse.papyrus.uml.diagram.menu,
  org.eclipse.papyrus.uml.diagram.menu.actions,

  org.eclipse.papyrus.uml.diagram.menu.actions.handlers

 Require-Bundle: org.eclipse.ui,

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.actions,

  org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.0",

  org.eclipse.core.expressions,

@@ -13,23 +13,23 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.2.0",

  org.eclipse.gmf.runtime.diagram.ui.actions,

  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.menu.Activator

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml
index da93f50162c..45bfb172b8b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.menu</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/AlignActionHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/AlignActionHelper.java
new file mode 100644
index 00000000000..fbc6affc407
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/AlignActionHelper.java
@@ -0,0 +1,346 @@
+package org.eclipse.papyrus.uml.diagram.menu.actions;

+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr 		- Initial API and implementation

+ *  Céline Janssens (ALL4TEC)  celine.janssens@all4tec.net 	- Code refractor and documentation

+ *

+ *****************************************************************************/

+import java.util.Iterator;

+import java.util.List;

+

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.geometry.Insets;

+import org.eclipse.draw2d.geometry.PrecisionPoint;

+import org.eclipse.draw2d.geometry.PrecisionRectangle;

+import org.eclipse.gef.ConnectionEditPart;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.editparts.AbstractConnectionEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart;

+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.LabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.common.layout.LayoutUtils;

+

+

+/**

+ * Helper for the CustomAlignAction class.

+ * It contains all the technical methods required for the Alignment.

+ * Basically, it makes the CustomAlignAction class lighter.

+ * 

+ * @author Céline JANSSENS

+ *

+ */

+public class AlignActionHelper {

+

+

+	/** The alignment. */

+	private int alignment;

+	

+	private EditPart refEditPart;

+	

+	private List<IGraphicalEditPart> selectedElements;

+

+

+	/**

+	 * Default Constructor

+	 */

+	public AlignActionHelper() {

+		// Default constructor

+	}

+

+	

+/** 

+ * Constructor

+ *

+ * @param customAlignAction 

+ * @param alignment

+ * @param refEditPart

+ *

+ */

+	public AlignActionHelper(int alignment, List<IGraphicalEditPart> selectedElements) {

+		this.alignment = alignment;

+		this.selectedElements = selectedElements;

+		this.refEditPart = getRefEditPart();

+	}

+

+	

+

+	/**

+	 * Tests the selection (nodes and edges). If Selection contains nodes (or Labels) and edges the method returns true

+	 * If it contains only nodes and labels, or only Edges 

+	 * @param editparts

+	 * 

+	 * @return

+	 *         <ul>

+	 *         <li> {@code true}</li> if the selection contains links and nodes

+	 *         <li> {@code false}</li> if not

+	 *         </ul>

+	 * 

+	 */

+	protected boolean isMixedSelection(List<?> editparts) {

+		boolean node = false;

+		boolean edge = false;

+		boolean isMixed = ((node) && (edge));

+

+		Iterator<?> iter = editparts.iterator();

+		while(iter.hasNext() && !isMixed){

+			if(iter.next() instanceof AbstractConnectionEditPart) {

+				edge = true;

+			} else {

+				node = true;

+			}

+			isMixed = ((node) && (edge));

+		}

+

+		return isMixed;

+

+

+	}

+

+	

+

+

+	/**

+	 * Tests if all the selected elements are instance of {@linkplain AbstractConnectionEditPart}

+	 * 

+	 * @param editparts

+	 *        the editparts list to test

+	 * @return

+	 *         <ul>

+	 *         <li> {@code true}</li> if all the editparts represents a link

+	 *         <li>{@code false}</li> if not

+	 *         </ul>

+	 */

+	protected boolean isLinkSelection(List<IGraphicalEditPart> editparts) {

+		boolean isEdgeOnly = true;

+		// if no selection

+		if(editparts.size() == 0) {

+			isEdgeOnly = false;

+		// at least one object is selected

+		} else {

+

+			for(Object object : editparts) {

+				if(!(object instanceof AbstractConnectionEditPart)) {

+					isEdgeOnly= false;

+				}

+			}

+		}

+		return isEdgeOnly;

+	}

+

+

+	/**

+	 * Define if Alignment is allowed.

+	 * @param selectedElements 

+	 * @return

+	 */

+	protected boolean isAlignAllowed(List<IGraphicalEditPart> selectedElements) {

+

+		boolean alignAllowable = true;

+		// Alignment is not allowed if selection is a mixed with edges and nodes (or labels)

+		alignAllowable = alignAllowable && !isMixedSelection(selectedElements);

+		alignAllowable = alignAllowable && (selectedElements.size() >= 2);

+		

+		return alignAllowable;

+	}

+

+	/**

+	 * Define if the New calculated position is allowed for the Alignment

+	 * 

+	 * @param currentEP current Edit Part to be aligned

+	 * @param newPosition theoretical position after alignment

+	 * @return true if the new Position fits to the alignment rules

+	 */

+	protected boolean isPositionAllowed(EditPart currentEP, PrecisionRectangle newPosition) {

+

+		boolean isAllow = true;

+

+		isAllow = isAllow && isContained(newPosition, currentEP);

+		isAllow = isAllow && !isRefChild(refEditPart, currentEP);

+		isAllow = isAllow && isPortPositionAllowed(newPosition, currentEP);

+		isAllow = isAllow && !isDependent(refEditPart, currentEP);

+		

+		

+		return isAllow;

+

+	}

+

+	/**

+	 * Define if the EditPart position depends on the other EditPart position

+	 * @param ref

+	 * @param currentEP

+	 * @return

+	 */

+	private boolean isDependent(EditPart ref, EditPart currentEP) {

+		boolean isDependent = false;

+		// If The reference is a Connection Label   

+		if (ref instanceof LabelEditPart) {

+			if (ref.getParent() instanceof AbstractConnectionEditPart){

+				// Alignment is not allowed if it should moves at the same time as the connector

+				// That means if the Extremities of the Edge have to be aligned.

+				EditPart source = ((ConnectionEditPart)ref.getParent()).getSource();

+				EditPart target = ((ConnectionEditPart)ref.getParent()).getTarget();

+				//If extremities EditPart cannot be a child of the Current Edit part

+				if (currentEP.equals(source) || currentEP.equals(target) ) {

+					isDependent = true ;

+				} else if (isRefChild(source, currentEP) || isRefChild(target, currentEP)) {

+					isDependent = true ;

+				}

+			}

+		}

+		return isDependent;

+	}

+

+

+	/**

+	 * Alignment Rule: In case of a Border Item, the Alignment is allowed only if the Port Position stay on his Parent Bounds.

+	 * @param newPosition

+	 * @param currentEP

+	 * @return

+	 */

+	private boolean isPortPositionAllowed(PrecisionRectangle newPosition,

+			EditPart currentEP) {

+		boolean isPortAllow ;

+	

+		if (currentEP instanceof AbstractBorderItemEditPart){

+

+			

+			PrecisionPoint portCenter = (PrecisionPoint) newPosition.getCenter();

+			PrecisionRectangle parentBounds = LayoutUtils.getAbsolutePosition(currentEP.getParent());

+

+			boolean isOnVerticalBounds = (portCenter.preciseX() == parentBounds.preciseX()) || (portCenter.preciseX() == parentBounds.preciseX()+ parentBounds.preciseWidth() );

+			boolean isOnHorizontalBounds = (portCenter.preciseY() == parentBounds.preciseY()) || (portCenter.preciseY() == parentBounds.preciseY()+ parentBounds.preciseHeight() );

+			boolean isBetweenHorizontalBounds = (portCenter.preciseY() >= parentBounds.preciseY()) && (portCenter.preciseY() <= parentBounds.preciseY()+parentBounds.preciseHeight());

+			boolean isBetweenVerticalBounds = (portCenter.preciseX() >= parentBounds.preciseX()) && (portCenter.preciseX() <= parentBounds.preciseX()+parentBounds.preciseWidth());

+

+			if ((isOnHorizontalBounds) && (isBetweenVerticalBounds)) {

+				isPortAllow = true;

+			} else if ((isOnVerticalBounds) && (isBetweenHorizontalBounds)) {

+				isPortAllow = true;

+			} else {

+				isPortAllow = false;

+			}

+

+		} else {

+			

+			isPortAllow = true;

+		}

+

+		return isPortAllow;

+	}

+

+

+	/**

+	 * Alignment Rule: the EditPart should be still contained in its parent after the alignment

+	 * @param newPosition

+	 * @param currentEP

+	 * @return

+	 */

+	protected boolean isContained(PrecisionRectangle newPosition, EditPart currentEP) {

+

+		boolean isContained;

+

+		EditPart container = DiagramEditPartsUtil.getContainerEditPart((GraphicalEditPart) currentEP);

+		PrecisionRectangle containerBounds = LayoutUtils.getAbsolutePosition(container);

+		//reduce the reference of 1 pixel in order to avoid the Scrollbar apparition when trying to Align on the parent.

+		containerBounds.expand(new Insets(-1));

+		isContained = containerBounds.contains(newPosition.getBottomLeft()) && containerBounds.contains(newPosition.getTopRight())  ;

+

+		return isContained;

+

+	}

+

+	/**

+	 * Alignment Rule : The parent cannot be aligned on its children

+	 * @param ref

+	 * @param ep

+	 * @return

+	 */

+	protected boolean isRefChild(EditPart ref, EditPart ep) {

+

+		boolean refIsChild = false;

+		List<?> children = ep.getChildren();

+		Iterator<?> iter = children.iterator();

+		while(iter.hasNext() && !refIsChild ){

+

+			Object child =  iter.next();

+			if (ref.equals(child)){

+				refIsChild = true;

+

+			} else if (child instanceof EditPart){

+				refIsChild = isRefChild(ref, (EditPart) child);

+			} 

+

+		}

+		return refIsChild;

+	}

+

+	/**

+	 * Get the reference Edit part for the alignment.

+	 * @return reference edit part for the alignment

+	 */

+	protected EditPart getRefEditPart() {

+		Iterator<IGraphicalEditPart> iter = selectedElements.iterator();

+		EditPart ref = null;

+

+		while (iter.hasNext() && ref == null){

+			EditPart ep = iter.next();

+			if (ep.getSelected() == EditPart.SELECTED_PRIMARY){

+				ref = ep;

+			}

+		}

+		return ref;

+	}

+	

+	/**

+	 * 

+	 * @param currentEPBounds

+	 * @param refBounds

+	 * @return

+	 */

+	protected PrecisionRectangle getNewPosition(

+			PrecisionRectangle currentEPBounds, PrecisionRectangle refBounds) {

+

+		// Initialise new Position with the current Position

+		PrecisionRectangle newPosition = new PrecisionRectangle(currentEPBounds);

+		PrecisionPoint distance = new PrecisionPoint (0.0,0.0);

+		switch(this.alignment) {

+		case PositionConstants.LEFT:

+			newPosition.setPreciseX(refBounds.preciseX());

+			break;

+		case PositionConstants.CENTER:

+			distance.setPreciseX(refBounds.getCenter().preciseX() - currentEPBounds.getCenter().preciseX());

+			newPosition.translate(distance);

+			break;

+		case PositionConstants.RIGHT:

+			distance.setPreciseX(refBounds.getTopRight().preciseX() - currentEPBounds.getTopRight().preciseX());

+			newPosition.translate(distance);

+			break;

+		case PositionConstants.TOP:

+			newPosition.setPreciseY(refBounds.preciseY());

+			break;

+		case PositionConstants.MIDDLE:

+			distance.setPreciseY(refBounds.getCenter().preciseY() - currentEPBounds.getCenter().preciseY());

+			newPosition.translate(distance);

+			break;

+		case PositionConstants.BOTTOM:

+			distance.setPreciseY( refBounds.getBottomLeft().preciseY() - currentEPBounds.getBottomLeft().preciseY());

+			newPosition.translate(distance);

+			break;

+		default:

+			break;

+		}

+

+		return newPosition;

+	}

+

+}
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/CustomAlignAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/CustomAlignAction.java
index 70975d3ce7c..f7a9a68182c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/CustomAlignAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/CustomAlignAction.java
@@ -1,39 +1,31 @@
 /*****************************************************************************

  * Copyright (c) 2010 CEA LIST.

  *

- *

+ *    

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr 		- Initial API and implementation

+ *  Céline Janssens (ALL4TEC)  celine.janssens@all4tec.net 	- Bug 442582 : Code refactor and documentation

  *

  *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.menu.actions;

 

-import java.util.ArrayList;

-import java.util.Enumeration;

 import java.util.List;

 

-import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.geometry.Point;

 import org.eclipse.draw2d.geometry.PrecisionRectangle;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gef.EditPolicy;

 import org.eclipse.gef.RequestConstants;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.CompoundCommand;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.editparts.AbstractConnectionEditPart;

 import org.eclipse.gef.requests.AlignmentRequest;

-import org.eclipse.gef.tools.ToolUtilities;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.papyrus.uml.diagram.common.helper.AlignmentLinkHelper;

-import org.eclipse.papyrus.uml.diagram.common.layout.AlignmentTree;

-import org.eclipse.papyrus.uml.diagram.common.layout.EditPartTree;

 import org.eclipse.papyrus.uml.diagram.common.layout.LayoutUtils;

 

 

@@ -51,591 +43,120 @@ import org.eclipse.papyrus.uml.diagram.common.layout.LayoutUtils;
  * </li>

  * </ul>

  * If the containing figure is different, a correct alignment is not guaranteed.

- *

+ * 

  * With this class, we can align nodes, by selecting them, or by selecting the link between them, thanks to {@link AlignmentLinkHelper}

  */

 public class CustomAlignAction {

 

-	/**

-	 * the Tree used to sort editparts

-	 * It contains all the selected editpart AND the intermediate editparts which can exist between two selected editparts

-	 *

-	 */

-	private AlignmentTree rootTree;

-

-	/** The alignment. */

+	/** The alignment type. */

 	private int alignment;

-

-	/** the selected elements */

+	

+	/** the selected elements. */

 	private List<IGraphicalEditPart> selectedElements;

 

+	/** Reference Edit Part for the Alignment. */

+	private EditPart refEditPart;

+

+	/** Reference Rectangle on which the alignment is based. */

+	private PrecisionRectangle refBounds;

+

+	/** Helper for specific treatment*/

+	private AlignActionHelper helper ;

+

+

 	/**

-	 *

 	 * Constructor.

-	 *

-	 * @param alignment

-	 * @param selectedElements

+	 * 

+	 * @param alignment Alignment Type

+	 * @param selectedElements List of selected EditParts

 	 */

 	public CustomAlignAction(int alignment, List<IGraphicalEditPart> selectedElements) {

 		this.alignment = alignment;

 		this.selectedElements = selectedElements;

+		helper = new AlignActionHelper(alignment, selectedElements);

 	}

 

-

 	/**

 	 * Returns the command for this action

-	 *

+	 * 

 	 * @return

 	 *         the command for this action

 	 */

 	public Command getCommand() {

-		List<EditPart> editparts = new ArrayList<EditPart>();

-		for (IGraphicalEditPart current : this.selectedElements) {

-			editparts.add(current);

-		}

-		if (!isMixedSelection(editparts)) {// if selection contains links and nodes, we do nothing

-			if (isLinkSelection(editparts)) {

-				AlignmentLinkHelper helper = new AlignmentLinkHelper(editparts, alignment);

-				return helper.createCommand();

-			}

 

+		CompoundCommand commands = new CompoundCommand("Alignment Commands");

 

-			if (editparts.size() >= 2) {

-				rootTree = new AlignmentTree(editparts);

-

-				createRequests(editparts);

-

-				CompoundCommand command = new CompoundCommand("Alignment Command"); //$NON-NLS-1$

-				Enumeration eptEnum = rootTree.breadthFirstEnumeration();

-				while (eptEnum.hasMoreElements()) {

-					EditPartTree ept = (EditPartTree) eptEnum.nextElement();

-					if (ept.getEditPart() != null) {

-						AlignmentRequest currentReq = (AlignmentRequest) ept.getRequest();

-						if (currentReq != null) {

-							Command curCommand = null;

-							curCommand = ept.getEditPart().getCommand(currentReq);

-							if (curCommand != null) {

-								command.add(curCommand);

-							}

-						}

-					}

-				}

-				return command.isEmpty() ? UnexecutableCommand.INSTANCE : (Command) command;

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

+		// In case of only Edges selected, a specific alignment is done

+		if(helper.isLinkSelection(selectedElements)) {

+			// Align Source and target Nodes of the edge depending on the alignment type

+			AlignmentLinkHelper helper = new AlignmentLinkHelper(selectedElements, alignment);

+			commands.add(helper.createCommand());

 

-	/**

-	 * <ul>

-	 * <li>Calculates the initial conditions to align each nodes owned by {@link #rootTree}</li>

-	 * <li>Call {@link #createConstrainedRequest(PrecisionRectangle, PrecisionRectangle, PrecisionRectangle, EditPartTree)} for each node to create the request</li>

-	 * </ul>

-	 *

-	 * @param editparts

-	 *            the editparts to align (the last editpart is the reference for the alignment)

-	 * @param request

-	 *            the initial request

-	 */

-	protected void createRequests(List<?> editparts) {

+		} else if (helper.isAlignAllowed(selectedElements)){

 

-		EditPart refEP = (EditPart) editparts.get(editparts.size() - 1);

-		PrecisionRectangle boundsRef = LayoutUtils.getAbsolutePosition(refEP);

+			// Define the reference

+			refEditPart = helper.getRefEditPart();

+			// Get absolute bounds of the Reference Edit Part

+			refBounds = LayoutUtils.getAbsolutePosition(refEditPart);

 

-		int depth = this.rootTree.getDepth();

-		for (int i = 1; i <= depth; i++) {// we iterate by level in the rootTree

-			List<EditPartTree> epTrees = rootTree.getChildLevel(i);

+			for (EditPart currentEP: selectedElements){

+				if (currentEP.getSelected() == EditPart.SELECTED){

+					PrecisionRectangle currentEPBounds = LayoutUtils.getAbsolutePosition(currentEP);

+					PrecisionRectangle newPosition = helper.getNewPosition(currentEPBounds , refBounds );

 

-

-			for (EditPartTree ept : epTrees) {// we create the request for each children

-				List<EditPart> nodeChild = new ArrayList<EditPart>();

-

-				// used to calculate the shift between each element!

-				Enumeration vectorisedChildren = ((EditPartTree) ept.getPath()[1]).breadthFirstEnumeration();

-				while (vectorisedChildren.hasMoreElements()) {

-					nodeChild.add(((EditPartTree) vectorisedChildren.nextElement()).getEditPart());

-				}

-

-				if (ept.isSelected()) {// the edit part is selected

-					if (ept.getEditPart() != refEP && (!ept.existsUnselectedChild())) {

-						/*

-						 * calculus of the shift

-						 *

-						 * the shift is the first selected element when the reference is not a child of the editpart

-						 * the shift is the number of levels between the current editpart and the reference if this reference is a child

-						 */

-						int level = ept.getLevelForFirstSelectedElement();

-						if (ToolUtilities.isAncestorContainedIn(nodeChild, refEP)) {

-							level = rootTree.getTree(refEP).getLevel();

-							int currentLevel = ept.getLevel();

-							level = level - currentLevel + 1;

-						}

-

-						/* collection used to test if the ept.getEditPart() contains the refEP */

-						List<EditPart> coll = new ArrayList<EditPart>(1);

-						coll.add(ept.getEditPart());

-

-						/* the reference used for the alignment */

-						PrecisionRectangle alignRef = new PrecisionRectangle(boundsRef);

-

-						PrecisionRectangle containerBounds = ((AlignmentTree) ept).getNewContainerBounds();

-

-

-						if (!containerBounds.equals(LayoutUtils.getAbsolutePosition(ept.getEditPart().getRoot()))) {

-							containerBounds.setX(containerBounds.preciseX + LayoutUtils.scrollBarSize);

-							containerBounds.setY(containerBounds.preciseY + LayoutUtils.scrollBarSize);

-							containerBounds.setWidth(containerBounds.preciseWidth - 2 * LayoutUtils.scrollBarSize);

-							containerBounds.setHeight(containerBounds.preciseHeight - 2 * LayoutUtils.scrollBarSize);

-						}

-

-						switch (this.alignment) {

-						case PositionConstants.LEFT:

-							alignRef.setX(boundsRef.preciseX - ((level - 1) * LayoutUtils.scrollBarSize));

-							alignRef.setWidth(boundsRef.preciseWidth + 2 * ((level - 1) * LayoutUtils.scrollBarSize));

-

-							break;

-						case PositionConstants.CENTER:// Useful?

-							// alignRef.setX(boundsRef.preciseX - ((level - 1) * LayoutUtils.scrollBarSize));

-							// alignRef.setWidth(boundsRef.preciseWidth + 2 * ((level - 1) * LayoutUtils.scrollBarSize));

-							break;

-						case PositionConstants.RIGHT:

-

-							alignRef.setX(boundsRef.preciseX + ((-level + 1) * LayoutUtils.scrollBarSize));

-							alignRef.setWidth(boundsRef.preciseWidth - 2 * ((-level + 1) * LayoutUtils.scrollBarSize));

-							break;

-

-						case PositionConstants.BOTTOM:

-							alignRef.setY(boundsRef.preciseY + ((-level + 1) * LayoutUtils.scrollBarSize));

-							alignRef.setHeight(boundsRef.preciseHeight - 2 * ((-level + 1) * LayoutUtils.scrollBarSize));

-							break;

-						case PositionConstants.MIDDLE:// here we can have a problem with the label for the element inheriting from Package

-

-							// useful?

-							// alignRef.setY(boundsRef.preciseY - ((level - 1) * LayoutUtils.scrollBarSize));

-							// alignRef.setHeight(boundsRef.preciseHeight + 2 * ((level - 1) * LayoutUtils.scrollBarSize));

-

-							/*

-							 * we don't want that the scrollbar appears

-							 * with the top alignment, we need to consider the label of the container element

-							 */

-

-

-							/* obtain the size of the highest child */

-							double heightMax = 0;

-							Enumeration children = ept.children();

-							while (children.hasMoreElements()) {

-								EditPartTree currentChild = (EditPartTree) children.nextElement();

-								double height = LayoutUtils.getAbsolutePosition(currentChild.getEditPart()).preciseHeight();

-								heightMax = (height > heightMax) ? height : heightMax;

-							}

-

-

-							/* obtain the size of the compartment for this figure! */

-							List childrenEP = ept.getEditPart().getChildren();

-							double compartmentHeight = 0;

-							for (int iter = 0; iter < childrenEP.size(); iter++) {

-								if (childrenEP.get(iter) instanceof CompartmentEditPart) {

-									CompartmentEditPart child = (CompartmentEditPart) childrenEP.get(iter);

-									EditPolicy policy = child.getEditPolicy(EditPolicy.LAYOUT_ROLE);

-									if (policy != null) {

-										compartmentHeight = LayoutUtils.getAbsolutePosition(child).preciseHeight();

-										break;

-									}

-								}

-							}

-

-							double heightToRemove = getLabelHeightToRemove(ept);

-							// test to know if the initial alignment is possible without seeing the scrollbar

-							if (compartmentHeight < (heightMax + LayoutUtils.scrollBarSize + heightToRemove)) {

-								alignRef.setY(alignRef.preciseY - heightToRemove);

-								alignRef.setHeight(alignRef.preciseHeight + heightToRemove);

-							}

-

-							break;

-						case PositionConstants.TOP: // here we can have a problem with the label for the element inheriting from Package

-							alignRef.setY(boundsRef.preciseY - ((level - 1) * LayoutUtils.scrollBarSize));

-							alignRef.setHeight(boundsRef.preciseHeight + 2 * ((level - 1) * LayoutUtils.scrollBarSize));

-							/*

-							 * we don't want that the scrollbar appears

-							 * with the top alignment, we need to consider the label of the container element

-							 */

-							if (ept.children().hasMoreElements()) {

-								double dist = getLabelHeightToRemove(ept);

-								alignRef.setY(alignRef.preciseY() - dist);

-							}

-							break;

-						default:

-							break;

-						}

-

-						createConstrainedRequest(alignRef, containerBounds, null, (AlignmentTree) ept);

-

-

-					} else if (ept.getEditPart() != refEP && (ept.existsUnselectedChild())) {

-						List<EditPart> parent = new ArrayList<EditPart>(1);

-						parent.add(ept.getEditPart());

-

-						int distance = ept.getDistanceWithTheFirstUnselectedChild();

-						EditPartTree unselectedTree = ept.getFirstUnselectedChild();

-

-						PrecisionRectangle boundsLimit = null;

-						// we needn't correct unselected element location when the reference is not inside them

-						if (ToolUtilities.isAncestorContainedIn(parent, refEP)) {

-							boundsLimit = new PrecisionRectangle(LayoutUtils.getAbsolutePosition(unselectedTree.getEditPart()));

-							// we increase the size of the child, to avoid scrollbar in its parent

-							boundsLimit.setX(boundsLimit.preciseX - (distance * LayoutUtils.scrollBarSize));

-							boundsLimit.setY(boundsLimit.preciseY - (distance * LayoutUtils.scrollBarSize));

-							boundsLimit.setWidth(boundsLimit.width + (2 * distance * LayoutUtils.scrollBarSize));

-							boundsLimit.setHeight(boundsLimit.height + (2 * distance * LayoutUtils.scrollBarSize));

-							if (this.alignment == PositionConstants.TOP) {

-								double dist = getLabelHeightToRemove(ept);

-								boundsLimit.setY(boundsLimit.preciseY() - dist);

-							}

-						}

-

-						PrecisionRectangle containerBounds = ((AlignmentTree) ept).getNewContainerBounds();

-

-						if (!containerBounds.equals(LayoutUtils.getAbsolutePosition(ept.getEditPart().getRoot()))) {

-							// we reduce the container bounds used to avoid scrollbar

-							containerBounds.setX(containerBounds.preciseX + LayoutUtils.scrollBarSize);

-							containerBounds.setY(containerBounds.preciseY + LayoutUtils.scrollBarSize);

-							containerBounds.setWidth(containerBounds.width - 2 * LayoutUtils.scrollBarSize);

-							containerBounds.setHeight(containerBounds.height - 2 * LayoutUtils.scrollBarSize);

-						}

-

-						createConstrainedRequest(boundsRef, containerBounds, boundsLimit, (AlignmentTree) ept);

-

-					} else if (ept.getEditPart() == refEP && ToolUtilities.isAncestorContainedIn(nodeChild, refEP)) {

-						if (!((EditPartTree) ept.getParent()).isSelected()) {

-							// nothing to do

-						} else {

-

-							/*

-							 * we need to create a command for the reference, only if

-							 * its direct parent is selected.

-							 * If the reference has ancestor in the selection and if this ancestor is not selected, itn's not necessary to move the

-							 * reference, because it's the ancestor which must move.

-							 */

-							PrecisionRectangle containerBounds = ((AlignmentTree) ept).getNewContainerBounds();

-							containerBounds.setX(containerBounds.preciseX + LayoutUtils.scrollBarSize);

-							containerBounds.setY(containerBounds.preciseY + LayoutUtils.scrollBarSize);

-							containerBounds.setWidth(containerBounds.width - 2 * LayoutUtils.scrollBarSize);

-							containerBounds.setHeight(containerBounds.height - 2 * LayoutUtils.scrollBarSize);

-							createConstrainedRequest(LayoutUtils.getAbsolutePosition(refEP), containerBounds, null, (AlignmentTree) ept);

-						}

-					} else if (ept.getEditPart() == refEP && (!ToolUtilities.isAncestorContainedIn(nodeChild, refEP))) {

-						// nothing to do

+					if (helper.isPositionAllowed(currentEP, newPosition)){

+						commands.add(getAlignmentCommand(currentEP, newPosition));

 					}

-				} else {// the editpart is not selected! We need to maintain its location

-

-					PrecisionRectangle containerBounds = ((AlignmentTree) ept).getNewContainerBounds();

-					containerBounds.setX(containerBounds.preciseX + LayoutUtils.scrollBarSize);

-					containerBounds.setY(containerBounds.preciseY + LayoutUtils.scrollBarSize);

-					containerBounds.setWidth(containerBounds.width - 2 * LayoutUtils.scrollBarSize);

-					containerBounds.setHeight(containerBounds.height - 2 * LayoutUtils.scrollBarSize);

-

-					createConstrainedRequest(LayoutUtils.getAbsolutePosition(ept.getEditPart()), containerBounds, null, (AlignmentTree) ept);

-

 				}

 			}

+		} else {

+			commands = null;

 		}

 

-

-

+		return (Command)commands;

 	}

 

+

 	/**

-	 *

-	 * <ul>

-	 * <li>Completes the {@link EditPartTree} with the correct new position for the object</li>

-	 * <li>Adds the created request to the {@link EditPartTree}</li>

-	 * </ul>

-	 *

-	 * @param ref

-	 *            the reference used for the alignment

-	 * @param containerBounds

-	 *            the size of the editpart container

-	 * @param dontCross

-	 *            the shift must be done, without the figure bounds are drawn in this rectangle

-	 * @param tree

-	 *            the tree for which we create the request

+	 * Get the Alignment Commands of selected editParts

+	 * @param newPosition 

+	 * @param currentEP 

+	 * @return

+	 * 			the Command related to the selected editParts and the Alignment Request

 	 */

+	private Command getAlignmentCommand(EditPart currentEP, PrecisionRectangle newPosition) {

 

+		Command curCommand = null;

+		if(currentEP != null) {

+			// get the alignment request associated to the EditPartTree

+			AlignmentRequest currentReq = (AlignmentRequest) getRequest(currentEP , newPosition);

+			if(currentReq != null) {

 

-	protected void createConstrainedRequest(PrecisionRectangle ref, PrecisionRectangle containerBounds, PrecisionRectangle dontCross, AlignmentTree tree) {

-

-		// variables used to write the request

-		double xMinForObject = 0;

-		double xMaxForObject = 0;

-		double yMinForObject = 0;

-		double yMaxForObject = 0;

-

-		PrecisionRectangle editpartBounds = LayoutUtils.getAbsolutePosition(tree.getEditPart());

-

-

-		PrecisionRectangle newPosition = new PrecisionRectangle(editpartBounds);

-

-		// 1-we determine the bounds!

-		if (dontCross == null && containerBounds.equals(LayoutUtils.getAbsolutePosition(tree.getEditPart().getRoot()))) {

-			AlignmentRequest newRequest = new AlignmentRequest(RequestConstants.REQ_ALIGN);

-			PrecisionRectangle newPrecisionRectangle = new PrecisionRectangle(ref);

-			newRequest.setAlignment(this.alignment);

-			newRequest.setAlignmentRectangle(newPrecisionRectangle);

-			double pos = 0;

-			switch (this.alignment) {

-			case PositionConstants.LEFT:

-				newPosition.setX(ref.preciseX());

-				break;

-			case PositionConstants.CENTER:

-				pos = ref.getTop().preciseX() - (editpartBounds.preciseWidth() / 2.0);

-				newPosition.setX(pos);

-				break;

-			case PositionConstants.RIGHT:

-				pos = ref.getRight().preciseX() - editpartBounds.preciseWidth();

-				newPosition.setX(pos);

-				break;

-			case PositionConstants.TOP:

-				pos = ref.getTop().preciseY();

-				newPosition.setY(pos);

-				break;

-			case PositionConstants.MIDDLE:

-				pos = ref.getLeft().preciseY() - (editpartBounds.preciseHeight / 2.0);

-				newPosition.setY(pos);

-				break;

-			case PositionConstants.BOTTOM:

-				pos = ref.getBottom().preciseY() - editpartBounds.preciseHeight();

-				newPosition.setY(pos);

-				break;

-			default:

-				break;

-			}

-

-

-			tree.setNewPosition(newPosition);

-			tree.setRequest(newRequest);

-			return;

-		} else if (dontCross == null && (!containerBounds.equals(LayoutUtils.getAbsolutePosition(tree.getEditPart().getRoot())))) {

-			xMinForObject = containerBounds.preciseX;

-			xMaxForObject = containerBounds.getRight().preciseX() - editpartBounds.preciseWidth();

-			yMinForObject = containerBounds.preciseY;

-			yMaxForObject = containerBounds.getBottom().preciseY() - editpartBounds.preciseHeight();

-

+				// if this request is not null, get the associated command for this editPart

+				curCommand = currentEP.getCommand(currentReq);

 

-		} else if (dontCross != null) {

-			xMinForObject = dontCross.getRight().preciseX() - editpartBounds.preciseWidth;

-			xMaxForObject = dontCross.preciseX;

-			yMinForObject = dontCross.getBottom().preciseY() - editpartBounds.preciseHeight;

-			yMaxForObject = dontCross.preciseY;

-

-			if (!containerBounds.equals(LayoutUtils.getAbsolutePosition(tree.getEditPart().getRoot()))) {

-				// container's limits

-				double xMinContainerLimit = containerBounds.preciseX;

-				double xMaxContainerLimit = containerBounds.getRight().preciseX() - editpartBounds.preciseWidth();

-				double yMinContainerLimit = containerBounds.preciseY;

-				double yMaxContainerLimit = containerBounds.getBottom().preciseY() - editpartBounds.preciseHeight();

-

-

-				xMinForObject = (xMinForObject > xMinContainerLimit) ? xMinForObject : xMinContainerLimit;

-				xMaxForObject = (xMaxForObject > xMaxContainerLimit) ? xMaxContainerLimit : xMaxForObject;

-				yMinForObject = (yMinForObject > yMinContainerLimit) ? yMinForObject : yMinContainerLimit;

-				yMaxForObject = (yMaxForObject > yMaxContainerLimit) ? yMaxContainerLimit : yMaxForObject;

 			}

 		}

 

+		return curCommand;

+	}

 

-		/* rectangle used to do the alignment */

-		PrecisionRectangle myAlignRectangle = new PrecisionRectangle(editpartBounds);

-

-		/* the editpart's position in its container, after the shift of the container */

-		PrecisionRectangle newTmpPosition = tree.getAbsolutePositionInTheNewContainerPosition();

-

-		/* the distance between the editpart in the new container position and its alignment reference */

-		double distance = 0;

-

-		/* the point use to translate the editpart */

-		Point translationPoint = null;

-

-		/* the new request */

-		AlignmentRequest newRequest = new AlignmentRequest(RequestConstants.REQ_ALIGN);

-		newRequest.setAlignment(this.alignment);

-		switch (alignment) {

-		case PositionConstants.LEFT:

-

-			if ((ref.preciseX >= xMinForObject) && (ref.preciseX <= xMaxForObject)) {

-				distance = ref.preciseX - newTmpPosition.preciseX;

-			} else if (ref.preciseX < xMinForObject) {

-				distance = xMinForObject - newTmpPosition.preciseX;

-			} else if (ref.preciseX > xMaxForObject) {

-				distance = xMaxForObject - newTmpPosition.preciseX;

-			}

-			myAlignRectangle.setX(LayoutUtils.getAbsolutePosition(tree.getEditPart()).preciseX + distance);

-			translationPoint = new Point(distance, 0);

-

-			break;

-		case PositionConstants.CENTER:// un alignement central fait de cette façon : tous les packages aligné sur un élément extérieur ne marche pas du tout!

+	/**

+	 * Create the Alignment Request.

+	 * @param newPosition The wished new position of the EditPart after Alignment

+	 * @param currentEP 

 

-			double minCenter = xMinForObject + (editpartBounds.preciseWidth / 2.0);

-			double maxCenter = xMaxForObject + (editpartBounds.preciseWidth / 2.0);

-			if ((ref.getTop().preciseX() >= minCenter) && (ref.getTop().preciseX() <= maxCenter)) {

-				distance = (ref.preciseX + (ref.preciseWidth / 2.0) - (newTmpPosition.preciseX + (newTmpPosition.preciseWidth / 2.0)));

-			} else if (ref.getTop().preciseX() < minCenter) {

-				distance = minCenter - (newTmpPosition.preciseX + (newTmpPosition.preciseWidth / 2.0));

-			} else if (ref.getTop().preciseX() > maxCenter) {

+	 */

+	protected AlignmentRequest getRequest(EditPart currentEP, PrecisionRectangle newPosition) {

 

-				distance = maxCenter - (newTmpPosition.preciseX + ((newTmpPosition.preciseWidth) / 2.0));

+		AlignmentRequest alignReq = new AlignmentRequest(RequestConstants.REQ_ALIGN);

 

-			}

-			myAlignRectangle.setX(LayoutUtils.getAbsolutePosition(tree.getEditPart()).preciseX + distance);

-			translationPoint = new Point(distance, 0);

-

-			break;

-		case PositionConstants.RIGHT:

-			double minRight = xMinForObject + editpartBounds.preciseWidth;

-			double maxRight = xMaxForObject + editpartBounds.preciseWidth;

-			if ((ref.getRight().preciseX() >= minRight) && (ref.getRight().preciseX() <= maxRight)) {

-				distance = (ref.preciseX + ref.preciseWidth) - (newTmpPosition.preciseX + newTmpPosition.preciseWidth);

-			} else if (ref.getRight().preciseX() < minRight) {

-				distance = minRight - (newTmpPosition.preciseX + newTmpPosition.preciseWidth);

-			} else if (ref.getRight().preciseX() > maxRight) {

-				distance = maxRight - (newTmpPosition.preciseX + newTmpPosition.preciseWidth);

-			}

-			myAlignRectangle.setX(LayoutUtils.getAbsolutePosition(tree.getEditPart()).preciseX + distance);

-			translationPoint = new Point(distance, 0);

-

-			break;

-		case PositionConstants.BOTTOM:

-			double minBottom = yMinForObject + editpartBounds.preciseHeight;

-			double maxBottom = yMaxForObject + editpartBounds.preciseHeight;

-			if (((ref.getBottom().preciseY()) >= minBottom) && ((ref.getBottom().preciseY()) <= maxBottom)) {

-				distance = (ref.preciseY + ref.preciseHeight) - (newTmpPosition.preciseY + newTmpPosition.preciseHeight);

-			} else if ((ref.getBottom().preciseY()) < minBottom) {

-				distance = minBottom - (newTmpPosition.preciseY + newTmpPosition.preciseHeight);

-			} else if ((ref.getBottom().preciseY()) > maxBottom) {

-				distance = maxBottom - (newTmpPosition.preciseY + newTmpPosition.preciseHeight);

-			}

-			translationPoint = new Point(0, distance);

-			myAlignRectangle.setY(LayoutUtils.getAbsolutePosition(tree.getEditPart()).preciseY + distance);

-			break;

-

-		case PositionConstants.MIDDLE:

-			double minMiddle = yMinForObject + (editpartBounds.preciseHeight / 2.0);

-			double maxMiddle = yMaxForObject + (editpartBounds.preciseHeight / 2.0);

-			if (((ref.preciseY + (ref.preciseHeight / 2.0)) >= minMiddle) && ((ref.preciseY + (ref.preciseHeight / 2.0)) <= maxMiddle)) {

-				distance = (ref.preciseY + (ref.preciseHeight / 2.0) - (newTmpPosition.preciseY + (newTmpPosition.preciseHeight / 2.0)));

-				;

-			} else if ((ref.preciseY + (ref.height / 2.0)) < minMiddle) {

-				distance = minMiddle - (newTmpPosition.preciseY + (newTmpPosition.preciseHeight / 2.0));

-			} else if ((ref.preciseY + (ref.height / 2.0)) > maxMiddle) {

-				distance = maxMiddle - (newTmpPosition.preciseY + (newTmpPosition.preciseHeight / 2.0));

-			}

-			translationPoint = new Point(0, distance);

-			myAlignRectangle.setY(LayoutUtils.getAbsolutePosition(tree.getEditPart()).preciseY + distance);

-			break;

-		case PositionConstants.TOP:

-			if ((ref.preciseY >= yMinForObject) && (ref.preciseY <= yMaxForObject)) {

-				distance = ref.preciseY - newTmpPosition.preciseY;

-			} else if (ref.preciseY < yMinForObject) {

-				distance = yMinForObject - newTmpPosition.preciseY;

-			} else if (ref.preciseY > yMaxForObject) {

-				distance = yMaxForObject - newTmpPosition.preciseY;

-			}

-			translationPoint = new Point(0, distance);

-			myAlignRectangle.setY(LayoutUtils.getAbsolutePosition(tree.getEditPart()).preciseY + distance);

-			break;

-		default:

-			break;

-		}

+		alignReq.setAlignment(alignment);

+		alignReq.setAlignmentRectangle(newPosition);

+		alignReq.setEditParts(currentEP);

 

+		return alignReq;

 

-		newRequest.setAlignmentRectangle(myAlignRectangle);

-		newPosition = (PrecisionRectangle) tree.getAbsolutePositionInTheNewContainerPosition().translate(translationPoint);

-		tree.setNewPosition(newPosition);

-		tree.setRequest(newRequest);

-		return;

 	}

 

-	/**

-	 * Returns the height of the label for the current editpart contained in {@code ept}, more the height of the children's label

-	 *

-	 * @param ept

-	 *            The {@link EditPartTree} containing the {@link EditPart} used to calculate height

-	 * @return

-	 *         The height of the label for the current editpart, more the height of the children's label

-	 *

-	 */

-	protected double getLabelHeightToRemove(EditPartTree ept) {

-		double dist = 0;

-		List children = ept.getEditPart().getChildren();

-		// we search the correct compartment

-		for (int iter = 0; iter < children.size(); iter++) {

-			if (children.get(iter) instanceof CompartmentEditPart) {

-				CompartmentEditPart child = (CompartmentEditPart) children.get(iter);

-				EditPolicy policy = child.getEditPolicy(EditPolicy.LAYOUT_ROLE);

-				if (policy != null) {

-					PrecisionRectangle cptSize = LayoutUtils.getAbsolutePosition(child);

-					dist += cptSize.preciseY() - LayoutUtils.getAbsolutePosition(ept.getEditPart()).preciseY();

-					break;

-				}

-			}

-		}

-		Enumeration eptChildren = ept.children();

-		double max = 0;

-		while (eptChildren.hasMoreElements()) {

-			EditPartTree currentElement = (EditPartTree) eptChildren.nextElement();

-			if (currentElement.isSelected() && (!currentElement.isReference())) {

-				double tmp = getLabelHeightToRemove(currentElement);

-				max = (tmp > max) ? tmp : max;

-			}

-		}

-		dist += max;

-		return dist;

-	}

-

-	/**

-	 * Tests the selection (nodes and links)

-	 *

-	 * @param editparts

-	 *

-	 * @return

-	 *         <ul>

-	 *         <li> {@code true}</li> if the selection contains links and nodes

-	 *         <li> {@code false}</li> if not

-	 *         </ul>

-	 *

-	 */

-	protected boolean isMixedSelection(List<?> editparts) {

-		boolean node = false;

-		boolean link = false;

-		for (Object editPart : editparts) {

-			if (editPart instanceof AbstractConnectionEditPart) {

-				link = true;

-			} else {

-				node = true;

-			}

-		}

-		return !(((node == true) && (link == true))) ? false : true;

-	}

-

-	/**

-	 * Tests if all the selected elements are instance of {@linkplain AbstractConnectionEditPart}

-	 *

-	 * @param editparts

-	 *            the editparts list to test

-	 * @return

-	 *         <ul>

-	 *         <li> {@code true}</li> if all the editparts represents a link

-	 *         <li>{@code false}</li> if not

-	 *         </ul>

-	 */

-	protected boolean isLinkSelection(List<?> editparts) {

-		if (editparts.size() == 0) {

-			return false;

-		}

-		for (Object object : editparts) {

-			if (!(object instanceof AbstractConnectionEditPart)) {

-				return false;

-			}

-		}

-		return true;

-	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/SizeAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/SizeAction.java
index b4b00c4aebb..d55681a69e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/SizeAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/SizeAction.java
@@ -262,8 +262,8 @@ public class SizeAction {
 	 * @return the int

 	 */

 	private int findIndex(double currentZoomLevel, double[] zoomLevel) {

-		for (int i = 0; i <= zoomLevel.length; i++) {

-			if (zoomLevel[i] == currentZoomLevel) {

+		for(int i = 0; i < zoomLevel.length; i++) {

+			if(zoomLevel[i] == currentZoomLevel) {

 				return i;

 			}

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AlignementHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AlignementHandler.java
index 78ccdad50ec..548029dea2f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AlignementHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AlignementHandler.java
@@ -20,6 +20,7 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.papyrus.uml.diagram.common.handlers.ParametricAndListeningHandler;

 import org.eclipse.papyrus.uml.diagram.common.layout.LayoutUtils;

 import org.eclipse.papyrus.uml.diagram.menu.actions.CustomAlignAction;

+//import org.eclipse.papyrus.uml.diagram.menu.actions.CustomAlignAction2;

 

 

 /**

@@ -54,6 +55,7 @@ public class AlignementHandler extends ParametricAndListeningHandler {
 		this.action = new CustomAlignAction(getAlignment(this.parameter), this.getSelectedElements());

 		Command cmd = action.getCommand();

 		return (cmd == null) ? UnexecutableCommand.INSTANCE : cmd;

+		

 	}

 

 	/**

@@ -88,4 +90,5 @@ public class AlignementHandler extends ParametricAndListeningHandler {
 		}

 		return PositionConstants.NONE;

 	}

+	

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
index 48106c06ac3..b8f63364580 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
@@ -3,25 +3,25 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.navigator;bundle-version="3.4.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.uml2.uml.editor;bundle-version="3.1.0",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

  org.eclipse.emf.ecore,

  org.eclipse.gmf.runtime.notation,

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.modelexplorer.Activa

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/pom.xml
index ea66fa02b7d..f1bf642ec5f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.modelexplorer</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF
index 4485f933105..27200a98b82 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0

 Export-Package: org.eclipse.papyrus.uml.diagram.navigation

-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.draw2d;bundle-version="3.7.1",

  org.eclipse.jface;bundle-version="3.8.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/pom.xml
index b6045079c50..3eb719a3157 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.navigation</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
index 25abd9664be..8bccc8c8666 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.edit;visibility:=reexport,

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.1.0",

  org.eclipse.emf.edit,

  org.eclipse.emf.ecore,

  org.eclipse.emf.ecore.edit,

  org.eclipse.uml2.uml,

  org.eclipse.uml2.uml.edit,

- org.eclipse.papyrus.emf.facet.efacet.metamodel.edit;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.efacet.metamodel.edit;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration.p

  rovider

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/pom.xml
index aa42b129bdd..63192f6d837 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
index 73344a9cc59..2ab578698a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
@@ -8,10 +8,10 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.gmf.runtime.common.ui.services;bundle-version="1.3.0",

  org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration,

  org.eclipse.papyrus.uml.diagram.paletteconfiguration.descriptor,

  org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl,

@@ -20,7 +20,7 @@ Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/pom.xml
index 722af027367..9734f437143 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.paletteconfiguration</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
index 4c0e0af7389..97092778ac6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
@@ -27,35 +27,35 @@ Bundle-ClassPath: .
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.profile;bundle-version="1.0.1",
+Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.profile;bundle-version="1.1.0",
  org.eclipse.core.expressions,
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.services.validation;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
  org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
  org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0",
  org.eclipse.uml2.uml.edit;bundle-version="4.0.100",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.7.0",
  org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.7.0",
  org.eclipse.ui.navigator;bundle-version="3.5.200",
  org.eclipse.ui.navigator.resources;bundle-version="3.4.400",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.jface,
@@ -67,7 +67,7 @@ Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.
  org.eclipse.gmf.runtime.emf.commands.core,
  org.eclipse.gmf.runtime.emf.ui.properties,
  org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui.providers.ide,
  org.eclipse.gmf.runtime.diagram.ui.render,
  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
@@ -79,11 +79,11 @@ Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.
  org.eclipse.ocl.ecore,
  org.eclipse.emf.validation,
  org.eclipse.gef,
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1"
+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.profile; singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/pom.xml
index 552122904b5..a3bc75b9273 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.profile</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
index 8c5071851a3..c24682fbe3b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
@@ -15,12 +15,12 @@ Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.ui.navigator.resources,

  org.eclipse.gmf.runtime.diagram.ui.properties,

  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

  org.eclipse.ocl.ecore,

  org.junit;bundle-version="4.11.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.core.runtime,

  org.eclipse.core.resources,

  org.eclipse.jface,

@@ -45,32 +45,32 @@ Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.emf.ecore.edit,

  org.eclipse.gef,

  org.eclipse.emf.validation,

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation,

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",

  org.eclipse.emf.databinding;bundle-version="1.2.0",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime,

- org.eclipse.papyrus.uml.diagram.menu;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.diagram.menu;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.part.UMLDia

  gramEditorPlugin

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomCombinedFragmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomCombinedFragmentEditPart.java
index aff07686d2c..177eb636165 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomCombinedFragmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomCombinedFragmentEditPart.java
@@ -207,6 +207,14 @@ public class CustomCombinedFragmentEditPart extends CombinedFragmentEditPart imp
 		return getContentPane();

 	}

 

+	public InteractionInteractionCompartmentEditPart getParentInteractionCompartmentEditPart() {

+		EditPart part = this;

+		do {

+			part = part.getParent();

+		} while(part != null && !(part instanceof InteractionInteractionCompartmentEditPart));

+		return (InteractionInteractionCompartmentEditPart)part;

+	}

+	

 	public final BorderedNodeFigure getBorderedFigure() {

 		return (BorderedNodeFigure) getFigure();

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomLifelineEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomLifelineEditPart.java
index 340ba73e06e..2255fbcc38e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomLifelineEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomLifelineEditPart.java
@@ -80,8 +80,8 @@ import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.gmf.runtime.notation.datatype.GradientData;

+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.command.wrappers.GEFtoEMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.common.commands.PreserveAnchorsPositionCommand;

 import org.eclipse.papyrus.uml.diagram.common.draw2d.anchors.LifelineAnchor;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

@@ -482,9 +482,9 @@ public class CustomLifelineEditPart extends LifelineEditPart {
 				// only allow Lifeline creation for PartDecomposition.

 				if (request instanceof CreateViewRequest) {

 					CreateViewRequest req = (CreateViewRequest) request;

-					Iterator iter = req.getViewDescriptors().iterator();

+					Iterator<? extends CreateViewRequest.ViewDescriptor> iter = req.getViewDescriptors().iterator();

 					while (iter.hasNext()) {

-						CreateViewRequest.ViewDescriptor viewDescriptor = (CreateViewRequest.ViewDescriptor) iter.next();

+						CreateViewRequest.ViewDescriptor viewDescriptor = iter.next();

 						String semanticHint = viewDescriptor.getSemanticHint();

 						if (!UMLVisualIDRegistry.getType(VISUAL_ID).equals(semanticHint)) {

 							return UnexecutableCommand.INSTANCE;

@@ -503,7 +503,7 @@ public class CustomLifelineEditPart extends LifelineEditPart {
 			}

 

 			private Command getMoveResizeCommand(ChangeBoundsRequest request) {

-				List changeEditParts = request.getEditParts();

+				List<?> changeEditParts = request.getEditParts();

 				if (changeEditParts != null && changeEditParts.size() > 0) {

 					TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();

 					CompositeTransactionalCommand composite = new CompositeTransactionalCommand(editingDomain, null);

@@ -979,7 +979,7 @@ public class CustomLifelineEditPart extends LifelineEditPart {
 					CommandHelper.executeCommandWithoutHistory(editingDomain, RemoveCommand.create(editingDomain, lifeline, UMLPackage.eINSTANCE.getLifeline_CoveredBy(), oldValue), true);

 				}

 			} else if (Notification.REMOVE_MANY == notification.getEventType()) {

-				List oldValue = (List) notification.getOldValue();

+				List<?> oldValue = (List<?>) notification.getOldValue();

 				for (Object object : oldValue) {

 					if (coveredBys.contains(object)) {

 						CommandHelper.executeCommandWithoutHistory(editingDomain, RemoveCommand.create(editingDomain, lifeline, UMLPackage.eINSTANCE.getLifeline_CoveredBy(), object), true);

@@ -1039,7 +1039,7 @@ public class CustomLifelineEditPart extends LifelineEditPart {
 

 	public boolean ignoreRequest(Request request) { // moving editpart causing to add child

 		if (request instanceof ChangeBoundsRequest && (request.getType().equals(org.eclipse.gef.RequestConstants.REQ_ADD) || request.getType().equals(RequestConstants.REQ_DROP))) {

-			List parts = ((ChangeBoundsRequest) request).getEditParts();

+			List<?> parts = ((ChangeBoundsRequest) request).getEditParts();

 			if (parts != null) {

 				for (Object obj : parts) {

 					if (obj instanceof CommentEditPart || obj instanceof ConstraintEditPart || obj instanceof TimeObservationEditPart || obj instanceof CombinedFragmentEditPart) {

@@ -1075,7 +1075,7 @@ public class CustomLifelineEditPart extends LifelineEditPart {
 		// return true;

 		// }

 		// }

-		List models = super.getModelChildren();

+		List<?> models = super.getModelChildren();

 		for (Object o : models) {

 			if (o instanceof View) {

 				View view = (View) o;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomPackageEditPart.java
index d9341042b04..4332f968093 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomPackageEditPart.java
@@ -13,8 +13,6 @@
  *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EAnnotation;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gef.EditPolicy;

 import org.eclipse.gef.commands.Command;

@@ -26,7 +24,6 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.uml.diagram.common.providers.BaseViewInfo;

 import org.eclipse.papyrus.uml.diagram.common.providers.ViewInfo;

-import org.eclipse.papyrus.uml.diagram.common.util.MDTUtil;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.semantic.CustomPackageItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 

@@ -83,18 +80,6 @@ public class CustomPackageEditPart extends PackageEditPart {
 	}

 

 	@Override

-	protected void handleNotificationEvent(Notification event) {

-		super.handleNotificationEvent(event);

-		if (event.getNotifier() instanceof EAnnotation) {

-			EAnnotation eAnnotation = (EAnnotation) event.getNotifier();

-			if (eAnnotation.getSource() != null && eAnnotation.getSource().equals(MDTUtil.FilterViewAndLabelsSource)) {

-				// modification form MOSKitt approach, canonical policies are not called

-				MDTUtil.filterDiagramViews(this.getDiagramView());

-			}

-		}

-	}

-

-	@Override

 	public Object getAdapter(Class adapter) {

 		if (adapter != null && adapter.equals(ViewInfo.class)) {

 			return getDiagramViewInfo();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomDiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomDiagramDragDropEditPolicy.java
index 1ec8e6b79d4..3a3546c4512 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomDiagramDragDropEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomDiagramDragDropEditPolicy.java
@@ -22,17 +22,22 @@ import java.util.Set;
 import org.eclipse.core.commands.operations.IUndoableOperation;

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.draw2d.ConnectionAnchor;

+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.ecore.EObject;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gef.EditPart;

+import org.eclipse.gef.Request;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.CompoundCommand;

 import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gef.requests.ChangeBoundsRequest;

 import org.eclipse.gef.requests.CreateConnectionRequest;

 import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

 import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.AddCommand;

 import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;

 import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

 import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;

@@ -48,10 +53,12 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;

 import org.eclipse.gmf.runtime.diagram.ui.requests.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.core.util.EObjectAdapter;

 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.MoveRequest;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.dialogs.MessageDialog;

@@ -78,6 +85,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Constraint2EditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomCombinedFragmentEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionOccurrenceSpecificationEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

@@ -103,6 +111,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPa
 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.CombinedFragmentMoveHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.util.GateHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceLinkMappingHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

@@ -199,6 +208,102 @@ public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPo
 	}

 

 	@Override

+	public Command getCommand(Request request) {

+		Command command = super.getCommand(request);

+		if (false == request instanceof ChangeBoundsRequest) {

+			return command;

+		}

+

+		boolean someCombinedFragment = false;

+        boolean someNonCombinedFragment = false;

+		for (Object part : ((ChangeBoundsRequest)request).getEditParts()) {

+			someCombinedFragment    |=  (part instanceof CustomCombinedFragmentEditPart);

+			someNonCombinedFragment |= !(part instanceof CustomCombinedFragmentEditPart);

+		}

+		

+		if (someCombinedFragment && someNonCombinedFragment) {

+			// Can't Drop CombinedFragment and other nodes at the same time

+			return UnexecutableCommand.INSTANCE;

+		}

+		else if (someNonCombinedFragment) {

+			return command;

+		}

+		else {

+			return getMoveCombinedFragmentCommand((ChangeBoundsRequest)request);

+		}

+	}

+

+	/*

+	 * "In-place" drag-and-drop command for Combined Fragment

+	 *

+	 */

+	protected Command getMoveCombinedFragmentCommand(ChangeBoundsRequest request) {

+        CompoundCommand cc = new CompoundCommand("move CombinedFragments to new parent"); //$NON-NLS-1$

+		

+		Rectangle rectangleDroppedCombined = CombinedFragmentMoveHelper.calcCombinedRect(request);

+		GraphicalEditPart newParentEP = CombinedFragmentMoveHelper.findNewParentEP(request, getHost());

+		

+		// Move the request's CFs models and views

+        for (Object part : ((ChangeBoundsRequest)request).getEditParts()) {

+			CustomCombinedFragmentEditPart combinedFragmentEP = (CustomCombinedFragmentEditPart)part;

+			CombinedFragment combinedFragment = (CombinedFragment)ViewUtil.

+					resolveSemanticElement((View)((IGraphicalEditPart)combinedFragmentEP).getModel());

+		

+			if (combinedFragmentEP.getParent() == newParentEP) {

+				continue; // no change of the parent 

+			}

+			

+			View containerNewParent = (View)newParentEP.getModel();

+			EObject contextNewParent = ViewUtil.resolveSemanticElement(containerNewParent);

+	        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart)getHost()).getEditingDomain();

+	        

+			// Move semantic

+			Command moveSemanticCmd = getHost().getCommand(new EditCommandRequestWrapper(

+					new MoveRequest(editingDomain, contextNewParent, combinedFragment)));

+			if (moveSemanticCmd == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			cc.add(moveSemanticCmd);

+

+			// Move view

+			View container = (View)newParentEP.getModel();

+			View view = (View)combinedFragmentEP.getModel();

+			cc.add(new ICommandProxy(new AddCommand(combinedFragmentEP.getEditingDomain(), new EObjectAdapter(container),

+								  new EObjectAdapter(view))));

+        }			

+			

+		// Calc new parent rect

+		Rectangle newParentOldRect = newParentEP.getFigure().getBounds().getCopy();

+		newParentEP.getFigure().translateToAbsolute(newParentOldRect);

+		Rectangle newParentNewRect = new Rectangle(newParentOldRect.getUnion(rectangleDroppedCombined));

+

+		if (getHost().getParent() instanceof CustomCombinedFragmentEditPart) {

+			CombinedFragmentMoveHelper.adjustNewParentOperands(cc, newParentNewRect, newParentOldRect, getHost());

+		}			

+		// TODO: resize parent's parent (and so on)

+		

+		// Move & resize parent CF

+		Point newParentOffsetSW = new Point(newParentNewRect.x - newParentOldRect.x, newParentNewRect.y - newParentOldRect.y);

+		if (newParentEP.getParent().getParent() != null) {

+			final ChangeBoundsRequest moveParentRequest = new ChangeBoundsRequest();

+			moveParentRequest.setType(REQ_MOVE);

+			moveParentRequest.setMoveDelta(newParentOffsetSW);

+			moveParentRequest.setEditParts(newParentEP.getParent().getParent());

+			moveParentRequest.setSizeDelta(new Dimension(newParentNewRect.width - newParentOldRect.width,

+					newParentNewRect.height - newParentOldRect.height));

+			moveParentRequest.setResizeDirection(PositionConstants.SOUTH_WEST);

+			cc.add(newParentEP.getParent().getParent().getCommand(moveParentRequest));

+		}

+		

+        for (Object part : ((ChangeBoundsRequest)request).getEditParts()) {

+			CustomCombinedFragmentEditPart combinedFragmentEP = (CustomCombinedFragmentEditPart)part;

+			CombinedFragmentMoveHelper.moveCombinedFragmentEP(cc, request, combinedFragmentEP, newParentEP, newParentOffsetSW);

+        }

+

+		return cc;

+	}

+	

+	@Override

 	protected IUndoableOperation getDropObjectCommand(DropObjectsRequest dropRequest, final EObject droppedObject) {

 		IUndoableOperation dropObjectCommand = super.getDropObjectCommand(dropRequest, droppedObject);

 		if (dropObjectCommand != null && dropObjectCommand.canExecute()) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java
index bcee2b76db6..9fe7ee77e4c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java
@@ -97,6 +97,8 @@ import org.eclipse.uml2.uml.Lifeline;
  */
 public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy {
 
+	public static final String CHILDREN_MOVEDELTA = "CHILDREN_MOVEDELTA"; //$NON-NLS-1$
+
 	@Override
 	protected Command getCreateCommand(CreateRequest request) {
 		CreateViewRequest req = (CreateViewRequest) request;
@@ -366,6 +368,10 @@ public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy
 	@SuppressWarnings("unchecked")
 	public static Command getCombinedFragmentResizeChildrenCommand(ChangeBoundsRequest request, CombinedFragmentEditPart combinedFragmentEditPart) {
 		Point moveDelta = request.getMoveDelta();
+		if (request.getExtendedData().get(CHILDREN_MOVEDELTA) instanceof Point) {
+			moveDelta = (Point) request.getExtendedData().get(CHILDREN_MOVEDELTA);
+		}
+
 		Dimension sizeDelta = request.getSizeDelta();
 		IFigure cfFigure = combinedFragmentEditPart.getFigure();
 		Rectangle origCFBounds = cfFigure.getBounds().getCopy();
@@ -650,11 +656,17 @@ public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy
 	 */
 	@Override
 	public Command getAddCommand(Request request) {
-		if (request instanceof ChangeBoundsRequest) {
-			// Only allow to move-in AppliedStereotypeCommentEditPart.
-			List editParts = ((ChangeBoundsRequest) request).getEditParts();
-			if (editParts.size() == 1 && editParts.get(0) instanceof AppliedStereotypesCommentEditPart) {
-				return super.getAddCommand(request);
+		if(request instanceof ChangeBoundsRequest) {
+			List<?> editParts = ((ChangeBoundsRequest)request).getEditParts();
+			if(editParts.size() == 1) {
+				if (editParts.get(0) instanceof AppliedStereotypesCommentEditPart) {
+					// Allow to move-in AppliedStereotypeCommentEditPart			
+					return super.getAddCommand(request);
+				}
+				if(editParts.get(0) instanceof CombinedFragmentEditPart) {
+					// Prevent UnexecutableCommand.INSTANCE to be added to a valid CombinedFragmentEditPart move command chain
+					return null;
+				}			
 			}
 			return UnexecutableCommand.INSTANCE;
 		}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CombinedFragmentMoveHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CombinedFragmentMoveHelper.java
new file mode 100644
index 00000000000..b313fc856fa
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CombinedFragmentMoveHelper.java
@@ -0,0 +1,195 @@
+/*****************************************************************************

+ * Copyright (c) 2009 CEA

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *   Alex Paperno - bug 395248

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.sequence.util;

+

+import java.util.HashMap;

+import java.util.HashSet;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.RequestConstants;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.CompoundCommand;

+import org.eclipse.gef.requests.ChangeBoundsRequest;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

+import org.eclipse.gmf.runtime.notation.Bounds;

+import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomCombinedFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomInteractionOperandEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.InteractionCompartmentXYLayoutEditPolicy;

+

+public class CombinedFragmentMoveHelper {

+	

+	protected final static int CF_PADDING = 10;

+	

+	/**

+	 * Calculate combined rect

+	 * 

+	 */

+	public static Rectangle calcCombinedRect(ChangeBoundsRequest request) {

+        Rectangle rectangleDroppedCombined = new Rectangle();

+		for (Object part : request.getEditParts()) {

+			CombinedFragmentEditPart combinedFragmentEP = (CombinedFragmentEditPart)part;

+			Rectangle rectangleDropped = combinedFragmentEP.getFigure().getBounds().getCopy();

+			combinedFragmentEP.getFigure().translateToAbsolute(rectangleDropped);

+	

+			if (!rectangleDroppedCombined.isEmpty()) {

+				rectangleDroppedCombined = new Rectangle(rectangleDropped.getUnion(rectangleDroppedCombined));

+			}

+			else {

+				rectangleDroppedCombined = rectangleDropped;

+			}

+		}

+		rectangleDroppedCombined.translate(request.getMoveDelta());

+		rectangleDroppedCombined.expand(CF_PADDING, CF_PADDING);

+		return rectangleDroppedCombined;

+	}

+

+	/**

+	 * Find the EP that we're dropping to

+	 * 

+	 */

+	public static GraphicalEditPart findNewParentEP(ChangeBoundsRequest request, EditPart hostEP) {

+		GraphicalEditPart parentEP = (GraphicalEditPart)hostEP;

+		if (hostEP.getParent() instanceof CustomCombinedFragmentEditPart) {

+			// Select which InteractionOperand we're dropping to

+			CustomCombinedFragmentEditPart hostCFEP =  (CustomCombinedFragmentEditPart)hostEP.getParent();

+			List<CustomInteractionOperandEditPart> operands = hostCFEP.getOperandChildrenEditParts();

+			if (!operands.isEmpty()) {

+				Point location = request.getLocation();

+				parentEP = operands.get(0);

+				for (CustomInteractionOperandEditPart operand : operands) {

+					Rectangle bounds = operand.getFigure().getBounds().getCopy();

+					operand.getFigure().translateToAbsolute(bounds);

+					if (bounds.contains(location)) {

+						parentEP = operand;

+					}

+				}

+			}

+		}

+		return parentEP;

+	}

+	

+	/**

+	 * Move new parent's operands

+	 * 

+	 */

+	public static void adjustNewParentOperands(CompoundCommand cc, Rectangle newParentNewRect, Rectangle newParentOldRect, EditPart hostEP) {

+		Set<Object> alreadyMovedBlocks = new HashSet<Object>();

+		CustomCombinedFragmentEditPart hostCFEP =  (CustomCombinedFragmentEditPart)hostEP.getParent();

+		List<CustomInteractionOperandEditPart> operands = hostCFEP.getOperandChildrenEditParts();

+		int moveUpperYOffset = newParentNewRect.y - newParentOldRect.y;

+		int moveLowerYOffset = newParentNewRect.height - newParentOldRect.height;

+		for (CustomInteractionOperandEditPart operand : operands) {

+			Rectangle rectangleOperand = operand.getFigure().getBounds().getCopy();

+			operand.getFigure().translateToAbsolute(rectangleOperand);

+			Bounds operandBounds = OperandBoundsComputeHelper.getEditPartBounds(operand);

+			Rectangle operandRect = OperandBoundsComputeHelper.fillRectangle(operandBounds);

+			operandRect.width = newParentNewRect.width;

+			int moveItemsOffset = moveUpperYOffset;

+			Point offsetInnerCFs = new Point(newParentOldRect.x - newParentNewRect.x, 0);

+			if (rectangleOperand.y == newParentOldRect.y) {

+				operandRect.height += moveLowerYOffset;

+				moveItemsOffset = 0;

+				offsetInnerCFs.y = -moveUpperYOffset;

+			}

+			else if (rectangleOperand.y > newParentOldRect.y) {

+				operandRect.y += moveLowerYOffset;

+				moveItemsOffset = moveLowerYOffset + moveUpperYOffset;

+			}

+			ICommand resizeOperandCommand = OperandBoundsComputeHelper.createUpdateEditPartBoundsCommand(operand, operandRect);

+			cc.add(new ICommandProxy(resizeOperandCommand));

+			Command adjustInnerCFsCommand = getShiftEnclosedCFsCommand(operand, offsetInnerCFs); 

+			if (adjustInnerCFsCommand != null) {

+				cc.add(adjustInnerCFsCommand);

+			}

+			Command shiftExecutions = OperandBoundsComputeHelper.getForcedShiftEnclosedFragmentsCommand(operand, moveItemsOffset, alreadyMovedBlocks);

+			if(shiftExecutions != null) {

+				cc.add(new ICommandProxy(new EMFtoGMFCommandWrapper(new GEFtoEMFCommandWrapper(shiftExecutions))));

+			}

+		}

+	}

+	

+	/**

+	 * Shift inner CFs so that they don't change absolute coords

+	 * 

+	 */

+	public static Command getShiftEnclosedCFsCommand(InteractionOperandEditPart editPart, Point offset) {

+		if(editPart == null || offset.x == 0 && offset.y == 0) {

+			return null;

+		}

+		CompoundCommand cc = new CompoundCommand("shift inner CFs"); //$NON-NLS-1$

+		List<?> children = editPart.getChildren();

+		for (int i = 0; i < children.size(); i++) {

+			if (false == children.get(i) instanceof CustomCombinedFragmentEditPart) {

+				continue;

+			}

+			CustomCombinedFragmentEditPart childCF = (CustomCombinedFragmentEditPart)children.get(i);

+			

+			final ChangeBoundsRequest moveChildCFRequest = new ChangeBoundsRequest();

+			moveChildCFRequest.setType(RequestConstants.REQ_MOVE);

+			moveChildCFRequest.setMoveDelta(offset);

+			moveChildCFRequest.setEditParts(childCF);

+			moveChildCFRequest.setResizeDirection(PositionConstants.SOUTH_WEST);

+			cc.add(childCF.getCommand(moveChildCFRequest));

+			

+		}

+		if (cc.size() == 0)

+			return null;

+		return cc;

+	}

+	

+	/**

+	 * Move CombinedFragment EP

+	 * 

+	 */

+	public static void moveCombinedFragmentEP(CompoundCommand cc, ChangeBoundsRequest request, CustomCombinedFragmentEditPart combinedFragmentEP, GraphicalEditPart newParentEP, Point newParentOffsetSW) {

+		// Calc CF moveDelta

+		final ChangeBoundsRequest forceLocationRequest = new ChangeBoundsRequest();

+		forceLocationRequest.setType(RequestConstants.REQ_MOVE_CHILDREN);

+		Point moveDelta = request.getMoveDelta().getCopy();

+

+		// CFs children moveDelta need special processing (no need to translate coords)

+		Point childrenMoveDelta = moveDelta.getCopy();

+		HashMap<String,Object> extData = new HashMap<String,Object>();

+		forceLocationRequest.setExtendedData(extData);

+		extData.put(InteractionCompartmentXYLayoutEditPolicy.CHILDREN_MOVEDELTA, childrenMoveDelta);

+

+		// Translate moveDelta into new parents coords

+		Rectangle oldParentBounds = ((GraphicalEditPart)combinedFragmentEP.getParent()).getFigure().getBounds().getCopy();

+		((GraphicalEditPart)combinedFragmentEP.getParent()).getFigure().translateToAbsolute(oldParentBounds);

+		moveDelta.translate(oldParentBounds.x, oldParentBounds.y);

+		Rectangle parentBounds = newParentEP.getFigure().getBounds().getCopy();

+		newParentEP.getFigure().translateToAbsolute(parentBounds);

+		moveDelta.translate(-parentBounds.x - newParentOffsetSW.x, -parentBounds.y - newParentOffsetSW.y);

+		forceLocationRequest.setMoveDelta(moveDelta);

+	

+		Point moveLocation = request.getLocation();

+		//newParentEP.getFigure().translateToRelative(moveLocation);

+		forceLocationRequest.setLocation(moveLocation);

+		forceLocationRequest.setEditParts(combinedFragmentEP);

+		cc.add(combinedFragmentEP.getParentInteractionCompartmentEditPart().getCommand(forceLocationRequest));

+	}

+	

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java
index d449676a36a..ce9d261b12b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java
@@ -33,8 +33,6 @@ import org.eclipse.emf.transaction.RollbackException;
 import org.eclipse.emf.transaction.Transaction;

 import org.eclipse.emf.transaction.TransactionalCommandStack;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;

-import org.eclipse.emf.transaction.impl.TransactionalCommandStackImpl;

 import org.eclipse.gef.EditDomain;

 import org.eclipse.gef.Tool;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

@@ -46,6 +44,8 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.papyrus.infra.core.editor.CoreMultiDiagramEditor;

 import org.eclipse.papyrus.infra.core.services.ServiceException;

 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;

+import org.eclipse.papyrus.uml.diagram.common.Activator;

 import org.eclipse.papyrus.uml.diagram.common.util.MessageDirection;

 import org.eclipse.papyrus.uml.diagram.sequence.CustomMessages;

 import org.eclipse.papyrus.uml.diagram.sequence.SequencePaletteFactory.AspectUnspecifiedTypeConnectionToolEx;

@@ -510,15 +510,13 @@ public class CommandHelper {
 	 *            The command

 	 * @param flag

 	 */

-	public static void executeCommandWithoutHistory(EditingDomain editingDomain, org.eclipse.emf.common.command.Command command, boolean flag) {

-		TransactionalCommandStackImpl stack = new TransactionalCommandStackImpl();

-		stack.setEditingDomain((InternalTransactionalEditingDomain) editingDomain);

+	public static void executeCommandWithoutHistory(TransactionalEditingDomain editingDomain, org.eclipse.emf.common.command.Command command, boolean flag) {

 		try {

-			stack.execute(command, Collections.singletonMap(Transaction.OPTION_UNPROTECTED, Boolean.TRUE));

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		} catch (RollbackException e) {

-			e.printStackTrace();

+			GMFUnsafe.write(editingDomain, command);

+		} catch (RollbackException ex) {

+			Activator.log.error(ex);

+		} catch (InterruptedException ex) {

+			Activator.log.error(ex);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineEditPartUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineEditPartUtil.java
index cde04babf35..a3c557a0e3d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineEditPartUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineEditPartUtil.java
@@ -78,7 +78,7 @@ public class LifelineEditPartUtil {
 			return null;

 		}

 		IFigure contentPane = lifelineEditPart.getContentPane();

-		NodeFigure centerFigure = null;

+

 		if (contentPane instanceof LifelineDotLineCustomFigure) {

 			return ((LifelineDotLineCustomFigure) contentPane).getDashLineRectangle();

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineHeadUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineHeadUtil.java
index 12f293e2303..83ec2e7a949 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineHeadUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineHeadUtil.java
@@ -69,7 +69,7 @@ public class LifelineHeadUtil {
 

 	public static int computeLifelineVerticalPosition(final EditPart parent) {

 		if (parent instanceof GraphicalEditPart) {

-			List children = parent.getChildren();

+			List<?> children = parent.getChildren();

 			int bottom = -1;

 			for (Object object : children) {

 				if (!(object instanceof LifelineEditPart)) {

@@ -113,7 +113,7 @@ public class LifelineHeadUtil {
 		while (parent instanceof LifelineEditPart) {

 			parent = parent.getParent();

 		}

-		List childrenList = parent.getChildren();

+		List<?> childrenList = parent.getChildren();

 		for (Object object : childrenList) {

 			if (toMovedLifelines.contains(object) || !(object instanceof LifelineEditPart)) {

 				continue;

@@ -192,7 +192,7 @@ public class LifelineHeadUtil {
 						Command cmd = getVerticalMoveShapeCommand((ShapeNodeEditPart) ep, moveDelta, false);

 						commands.appendIfCanExecute(cmd);

 						movedEditParts.add(ep);

-						List children = ep.getChildren();

+						List<?> children = ep.getChildren();

 						for (Object object : children) {

 							if (movedEditParts.contains(object)) {

 								continue;

@@ -228,7 +228,7 @@ public class LifelineHeadUtil {
 		while (parent instanceof LifelineEditPart) {

 			parent = parent.getParent();

 		}

-		List childrenList = parent.getChildren();

+		List<?> childrenList = parent.getChildren();

 		for (Object object : childrenList) {

 			if (toMovedLifelines.contains(object) || !(object instanceof LifelineEditPart)) {

 				continue;

@@ -244,7 +244,7 @@ public class LifelineHeadUtil {
 	}

 

 	private static void fillMoveDownMessageEnds(CompoundCommand commands, GraphicalEditPart editPart, int moveDelta, List<EditPart> movedEditParts) {

-		List sourceConnections = editPart.getSourceConnections();

+		List<?> sourceConnections = editPart.getSourceConnections();

 		for (Object object : sourceConnections) {

 			ConnectionEditPart conn = (ConnectionEditPart) object;

 			EditPart target = conn.getTarget();

@@ -257,7 +257,7 @@ public class LifelineHeadUtil {
 				commands.appendIfCanExecute(command);

 			}

 		}

-		List targetConnections = editPart.getTargetConnections();

+		List<?> targetConnections = editPart.getTargetConnections();

 		for (Object object : targetConnections) {

 			ConnectionEditPart conn = (ConnectionEditPart) object;

 			if (conn instanceof Message7EditPart) {

@@ -311,7 +311,7 @@ public class LifelineHeadUtil {
 			return;

 		}

 		// 1. links from current lifeline

-		List sourceConnections = editPart.getSourceConnections();

+		List<?> sourceConnections = editPart.getSourceConnections();

 		for (Object object : sourceConnections) {

 			ConnectionEditPart conn = (ConnectionEditPart) object;

 			LifelineEditPart target = getLifeline(conn.getTarget());

@@ -322,7 +322,7 @@ public class LifelineHeadUtil {
 		}

 

 		// 2. links to current lifeline.

-		List targetConnections = editPart.getTargetConnections();

+		List<?> targetConnections = editPart.getTargetConnections();

 		for (Object object : targetConnections) {

 			ConnectionEditPart conn = (ConnectionEditPart) object;

 			LifelineEditPart source = getLifeline(conn.getSource());

@@ -333,7 +333,7 @@ public class LifelineHeadUtil {
 		}

 

 		if (editPart instanceof CustomLifelineEditPart && ((CustomLifelineEditPart) editPart).isInlineMode()) {

-			List children = ((CustomLifelineEditPart) editPart).getChildren();

+			List<?> children = ((CustomLifelineEditPart) editPart).getChildren();

 			for (Object object : children) {

 				if (object instanceof LifelineEditPart) {

 					collectLifelines(toMovedLifelines, (LifelineEditPart) object);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineMessageCreateHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineMessageCreateHelper.java
index d5a69fe5e59..9202d2d4140 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineMessageCreateHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineMessageCreateHelper.java
@@ -115,7 +115,7 @@ public class LifelineMessageCreateHelper {
 

 	// when a lifleine is deleted, move its created lifelines up

 	public static Command restoreLifelineOnDelete(Command command, LifelineEditPart part) {

-		List list = part.getSourceConnections();

+		List<?> list = part.getSourceConnections();

 		if (list != null && list.size() > 0) {

 			for (Object l : list) {

 				if (l instanceof Message4EditPart) {

@@ -136,7 +136,7 @@ public class LifelineMessageCreateHelper {
 	}

 

 	public static boolean hasMessageCreate(GraphicalEditPart sourceEditPart, EditPart targetEditPart) {

-		List list = sourceEditPart.getSourceConnections();

+		List<?> list = sourceEditPart.getSourceConnections();

 		for (Object o : list) {

 			if (o instanceof Message4EditPart && targetEditPart.equals(((Message4EditPart) o).getTarget())) {

 				return true;

@@ -149,14 +149,14 @@ public class LifelineMessageCreateHelper {
 		return getIncomingMessageCreate(target).size() > 0;

 	}

 

-	public static List getIncomingMessageCreate(EditPart target) {

-		List create = new ArrayList();

+	public static List<?> getIncomingMessageCreate(EditPart target) {

+		List<EditPart> create = new ArrayList<EditPart>();

 		if (target instanceof LifelineEditPart) {

-			List list = ((LifelineEditPart) target).getTargetConnections();

+			List<?> list = ((LifelineEditPart) target).getTargetConnections();

 			if (list != null && list.size() > 0) {

 				for (Object l : list) {

 					if (l instanceof Message4EditPart) {

-						create.add(l);

+						create.add((Message4EditPart) l);

 					}

 				}

 			}

@@ -222,7 +222,7 @@ public class LifelineMessageCreateHelper {
 

 	// move all lifelines which has incoming create link from part

 	public static Command moveCascadeLifeline(LifelineEditPart part, Command command, int dy) {

-		List list = part.getSourceConnections();

+		List<?> list = part.getSourceConnections();

 		if (list != null && list.size() > 0) {

 			for (Object l : list) {

 				if (l instanceof Message4EditPart) {

@@ -251,7 +251,7 @@ public class LifelineMessageCreateHelper {
 	public static boolean canMoveLifelineVertical(LifelineEditPart child, Rectangle newBounds) {

 		int halfHeight = child.getPrimaryShape().getFigureLifelineNameContainerFigure().getBounds().height / 2;

 		// check outgoing links

-		List list = child.getSourceConnections();

+		List<?> list = child.getSourceConnections();

 		if (list != null && list.size() > 0) {

 			for (Object l : list) {

 				if (l instanceof Message4EditPart && ((Message4EditPart) l).getTarget() instanceof LifelineEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/MessageAnchorRepairer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/MessageAnchorRepairer.java
index 55f9a6deba9..7c3838823bf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/MessageAnchorRepairer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/MessageAnchorRepairer.java
@@ -20,7 +20,7 @@ import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.PrecisionPoint;

 import org.eclipse.draw2d.geometry.Rectangle;

 import org.eclipse.emf.common.command.AbstractCommand;

-import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gef.NodeEditPart;

 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

@@ -95,8 +95,8 @@ public class MessageAnchorRepairer {
 		if (oldHeight == newHeight) {

 			return;

 		}

-		EditingDomain editingDomain = ((GraphicalEditPart) editPart).getEditingDomain();

-		List sourceConnections = editPart.getSourceConnections();

+		TransactionalEditingDomain editingDomain = ((GraphicalEditPart) editPart).getEditingDomain();

+		List<?> sourceConnections = editPart.getSourceConnections();

 		for (Object object : sourceConnections) {

 			if (!(object instanceof AbstractMessageEditPart)) {

 				continue;

@@ -106,7 +106,7 @@ public class MessageAnchorRepairer {
 			final IdentityAnchor anchor = (IdentityAnchor) edge.getSourceAnchor();

 			updateAnchorTerminal(editingDomain, anchor, oldHeight, newHeight);

 		}

-		List targetConnections = editPart.getTargetConnections();

+		List<?> targetConnections = editPart.getTargetConnections();

 		for (Object object : targetConnections) {

 			if (!(object instanceof AbstractMessageEditPart)) {

 				continue;

@@ -118,7 +118,7 @@ public class MessageAnchorRepairer {
 		}

 	}

 

-	private static void updateAnchorTerminal(EditingDomain editingDomain, final IdentityAnchor anchor, int oldHeight, int newHeight) {

+	private static void updateAnchorTerminal(TransactionalEditingDomain editingDomain, final IdentityAnchor anchor, int oldHeight, int newHeight) {

 		final String oldTerminal = anchor.getId();

 		PrecisionPoint pp = BaseSlidableAnchor.parseTerminalString(oldTerminal);

 		int yPos = (int) Math.round(oldHeight * pp.preciseY());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java
index d9b8b405fe4..1601fffe1bd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java
@@ -67,6 +67,8 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractExecutionSpec
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractMessageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomCombinedFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomInteractionOperandEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GateEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionInteractionCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;

@@ -113,7 +115,7 @@ public class OperandBoundsComputeHelper {
 	 */

 	public static InteractionOperandEditPart findFirstIOEP(CombinedFragmentCombinedFragmentCompartmentEditPart compartEP) {

 		InteractionOperandEditPart firstIOEP = null;

-		List children = compartEP.getChildren();

+		List<?> children = compartEP.getChildren();

 		for (int i = 0; i < children.size(); i++) {

 			if (children.get(i) instanceof InteractionOperandEditPart) {

 				firstIOEP = (InteractionOperandEditPart) children.get(i);

@@ -131,7 +133,7 @@ public class OperandBoundsComputeHelper {
 	 */

 	public static InteractionOperandEditPart findLastIOEP(CombinedFragmentCombinedFragmentCompartmentEditPart compartEP) {

 		InteractionOperandEditPart lastIOEP = null;

-		List children = compartEP.getChildren();

+		List<?> children = compartEP.getChildren();

 		for (int i = children.size() - 1; i >= 0; i--) {

 			if (children.get(i) instanceof InteractionOperandEditPart) {

 				lastIOEP = (InteractionOperandEditPart) children.get(i);

@@ -150,7 +152,7 @@ public class OperandBoundsComputeHelper {
 	 */

 	public static InteractionOperandEditPart findPreviousIOEP(CombinedFragmentCombinedFragmentCompartmentEditPart compartEP, InteractionOperandEditPart currentIOEP) {

 		InteractionOperandEditPart previousIOEP = null;

-		List children = compartEP.getChildren();

+		List<?> children = compartEP.getChildren();

 		for (int i = 0; i < children.size() - 1; i++) {

 			if (children.get(i) instanceof InteractionOperandEditPart) {

 				if (children.get(i) == currentIOEP) {

@@ -172,7 +174,7 @@ public class OperandBoundsComputeHelper {
 	 */

 	public static InteractionOperandEditPart findLatterIOEP(CombinedFragmentCombinedFragmentCompartmentEditPart compartEP, InteractionOperandEditPart currentIOEP) {

 		InteractionOperandEditPart latterIOEP = null;

-		List children = compartEP.getChildren();

+		List<?> children = compartEP.getChildren();

 		for (int i = children.size() - 1; i > 0; i--) {

 			if (children.get(i) instanceof InteractionOperandEditPart) {

 				if (children.get(i) == currentIOEP) {

@@ -789,16 +791,50 @@ public class OperandBoundsComputeHelper {
 		return new ICommandProxy(new MoveOperandBlockCommand(editPart.getEditingDomain(), blockToMove));

 	}

 

+	public static Command getForcedShiftEnclosedFragmentsCommand(InteractionOperandEditPart editPart, int movedY, Set<Object> alreadyMovedItems) {

+		if(editPart == null || movedY == 0) {

+			return null;

+		}

+		// Recursively process children

+		CompoundCommand cc = new CompoundCommand("shift inner CFs' exec blocks"); //$NON-NLS-1$

+		List<?> children = editPart.getChildren();

+		for (int i = 0; i < children.size(); i++) {

+			if (false == children.get(i) instanceof CustomCombinedFragmentEditPart) {

+				continue;

+			}

+			CustomCombinedFragmentEditPart childCF = (CustomCombinedFragmentEditPart)children.get(i);

+			List<CustomInteractionOperandEditPart> childOperands = childCF.getOperandChildrenEditParts();

+			for (CustomInteractionOperandEditPart childOperand : childOperands) {

+				cc.add(getForcedShiftEnclosedFragmentsCommand(childOperand, movedY, alreadyMovedItems));

+			}

+		}

+		

+		List<OperandBlock> operandBlocks = getOperandBlocks(editPart);

+		if(operandBlocks.isEmpty()) {

+			return null;

+		}

+

+		final Map<OperandBlock, Integer> blockToMove = new HashMap<OperandBoundsComputeHelper.OperandBlock, Integer>();

+		for(OperandBlock blk : operandBlocks) {

+			blockToMove.put(blk, movedY);

+		}

+		if(blockToMove.isEmpty()) {

+			return null;

+		}

+		cc.add(new ICommandProxy(new MoveOperandBlockCommand(editPart.getEditingDomain(), blockToMove, alreadyMovedItems)));

+		return cc;

+	}

+

 	private static ICommand getMoveAnchorCommand(int yDelta, Rectangle figureBounds, IdentityAnchor gmfAnchor) {

 		String oldTerminal = gmfAnchor.getId();

 		PrecisionPoint pp = BaseSlidableAnchor.parseTerminalString(oldTerminal);

-		int yPos = (int) Math.round(figureBounds.height * pp.preciseY);

+		int yPos = (int) Math.round(figureBounds.height * pp.preciseY());

 		yPos += yDelta;

-		pp.preciseY = (double) yPos / figureBounds.height;

-		if (pp.preciseY > 1.0) {

-			pp.preciseY = 1.0;

-		} else if (pp.preciseY < 0.0) {

-			pp.preciseY = 0.0;

+		pp.setPreciseY((double) yPos / figureBounds.height);

+		if (pp.preciseY() > 1.0) {

+			pp.setPreciseY(1.0);

+		} else if (pp.preciseY() < 0.0) {

+			pp.setPreciseY(0.0);

 		}

 		String newTerminal = (new BaseSlidableAnchor(null, pp)).getTerminal();

 		return new SetValueCommand(new SetRequest(gmfAnchor, NotationPackage.Literals.IDENTITY_ANCHOR__ID, newTerminal));

@@ -939,7 +975,7 @@ public class OperandBoundsComputeHelper {
 	 * @param command

 	 */

 	public static void addUpdateBoundsForIOCreationCommand(CombinedFragmentCombinedFragmentCompartmentEditPart compartment, ViewDescriptor viewDescriptor, CompositeCommand command) {

-		List children = compartment.getChildren();

+		List<?> children = compartment.getChildren();

 		if (children != null && children.size() > 0) {

 			InteractionOperandEditPart lastOperandEP = OperandBoundsComputeHelper.findLastIOEP(compartment);

 			// update bounds

@@ -1475,6 +1511,7 @@ public class OperandBoundsComputeHelper {
 	private static class MoveOperandBlockCommand extends AbstractTransactionalCommand {

 

 		private Map<OperandBlock, Integer> blockToMove;

+		private Set<Object> alreadyMovedItems;

 

 		/**

 		 * Constructor.

@@ -1489,6 +1526,18 @@ public class OperandBoundsComputeHelper {
 		}

 

 		/**

+		 * Constructor.

+		 * 

+		 * @param domain

+		 * @param label

+		 * @param affectedFiles

+		 */

+		public MoveOperandBlockCommand(TransactionalEditingDomain domain, Map<OperandBlock, Integer> blockToMove, Set<Object> alreadyMovedItems) {

+			this(domain, blockToMove);

+			this.alreadyMovedItems = alreadyMovedItems; 

+		}

+

+		/**

 		 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)

 		 *

 		 * @param monitor

@@ -1544,6 +1593,14 @@ public class OperandBoundsComputeHelper {
 			if (block instanceof ExecutionOperandBlock) {

 				List<ShapeNodeEditPart> children = ((ExecutionOperandBlock) block).getShapeNodeChildren();

 				for (ShapeNodeEditPart child : children) {

+					if (alreadyMovedItems != null) {

+						if (alreadyMovedItems.contains(child)) {

+							continue;

+						}

+						else {

+							alreadyMovedItems.add(child);

+						}						

+					}

 					Bounds bounds = getInteractionOperandEPBounds(child);

 					Rectangle newBounds = fillRectangle(bounds);

 					newBounds.y += moveDelta;

@@ -1551,7 +1608,7 @@ public class OperandBoundsComputeHelper {
 					SetBoundsCommand cmd = new SetBoundsCommand(getEditingDomain(), getLabel(), child, newBounds);

 					moveCommand.add(new ICommandProxy(cmd));

 					moveCommand = OccurrenceSpecificationMoveHelper.completeMoveExecutionSpecificationCommand(moveCommand, child, newBounds, new ChangeBoundsRequest());

-					List targetConnections = child.getTargetConnections();

+					List<?> targetConnections = child.getTargetConnections();

 					for (Object object : targetConnections) {

 						if (!(object instanceof AbstractMessageEditPart)) {

 							continue;

@@ -1572,7 +1629,7 @@ public class OperandBoundsComputeHelper {
 							}

 						}

 					}

-					List sourceConnections = child.getSourceConnections();

+					List<?> sourceConnections = child.getSourceConnections();

 					for (Object object : sourceConnections) {

 						if (!(object instanceof AbstractMessageEditPart)) {

 							continue;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceDeleteHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceDeleteHelper.java
index b6d36d43e52..14993637e92 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceDeleteHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceDeleteHelper.java
@@ -306,7 +306,7 @@ public class SequenceDeleteHelper {
 		destroyMessageEvents(deleteElementsCommand, host.getTargetConnections(), transactionalEditingDomain);

 	}

 

-	static void destroyMessageEvents(CompoundCommand deleteElementsCommand, List list, TransactionalEditingDomain transactionalEditingDomain) {

+	static void destroyMessageEvents(CompoundCommand deleteElementsCommand, List<?> list, TransactionalEditingDomain transactionalEditingDomain) {

 		for (Object o : list) {

 			if (o instanceof ConnectionEditPart) {

 				EObject model = ((ConnectionEditPart) o).resolveSemanticElement();

@@ -402,7 +402,7 @@ public class SequenceDeleteHelper {
 		List<TimeObservationLabelEditPart> timeObservationEditParts = SequenceUtil.findOccurenceSpecificationRelatedTimeObservationPart(srcLifelinePart, oss);

 		for (final TimeObservationLabelEditPart timeObservationEditPart : timeObservationEditParts) {

 			View view = (View) timeObservationEditPart.getModel();

-			EList sourceEdges = view.getSourceEdges();

+			List<?> sourceEdges = view.getSourceEdges();

 			for (Object sourceEdge : sourceEdges) {

 				Command deleteTimeViewCommand = new ICommandProxy(new DeleteCommand(editingDomain, (View) sourceEdge));

 				deleteViewsCmd.add(deleteTimeViewCommand);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceLinkMappingHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceLinkMappingHelper.java
index 7ec62c53163..f74405a172c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceLinkMappingHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceLinkMappingHelper.java
@@ -81,8 +81,8 @@ public class SequenceLinkMappingHelper implements ILinkMappingHelper {
 				} else {

 					return Collections.singletonList(object.getInteraction());

 				}

-				return Collections.EMPTY_LIST;

-			};

+				return Collections.emptyList();

+			}

 

 			@Override

 			public Collection<?> caseGeneralOrdering(GeneralOrdering object) {

@@ -90,7 +90,7 @@ public class SequenceLinkMappingHelper implements ILinkMappingHelper {
 					OccurrenceSpecification before = object.getBefore();

 					return before.getCovereds();

 				}

-				return Collections.EMPTY_LIST;

+				return Collections.emptyList();

 			}

 		});

 	}

@@ -116,8 +116,8 @@ public class SequenceLinkMappingHelper implements ILinkMappingHelper {
 				} else {

 					return Collections.singletonList(object.getInteraction());

 				}

-				return Collections.EMPTY_LIST;

-			};

+				return Collections.emptyList();

+			}

 

 			@Override

 			public Collection<?> caseGeneralOrdering(GeneralOrdering object) {

@@ -125,7 +125,7 @@ public class SequenceLinkMappingHelper implements ILinkMappingHelper {
 					OccurrenceSpecification after = object.getAfter();

 					return after.getCovereds();

 				}

-				return Collections.EMPTY_LIST;

+				return Collections.emptyList();

 			}

 		});

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java
index e8520fc6e21..c8c275c8f99 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java
@@ -42,7 +42,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature.Setting;

 import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gef.commands.Command;

@@ -474,8 +473,8 @@ public class SequenceUtil {
 				String oldTerminal = ((IdentityAnchor) idAnchor).getId();

 				PrecisionPoint pp = BaseSlidableAnchor.parseTerminalString(oldTerminal);

 				if (pp.preciseX() <= 1 && pp.preciseX() >= 0 && pp.preciseY() >= 0 && pp.preciseY() <= 1) {

-					int xPos = linkedPartBounds.x + delta.width + (int) Math.round(anchorOwningFigure.getBounds().width * pp.preciseX);

-					int yPos = linkedPartBounds.y + delta.height + (int) Math.round(anchorOwningFigure.getBounds().height * pp.preciseY);

+					int xPos = linkedPartBounds.x + delta.width + (int) Math.round(anchorOwningFigure.getBounds().width * pp.preciseX());

+					int yPos = linkedPartBounds.y + delta.height + (int) Math.round(anchorOwningFigure.getBounds().height * pp.preciseY());

 					return new Point(xPos, yPos);

 				}

 			}

@@ -980,7 +979,7 @@ public class SequenceUtil {
 		return elements;

 	}

 

-	public static void handleMessageSortChange(EditingDomain editingDomain, Notification notification, Message message, MessageSort expectedMessageSort) {

+	public static void handleMessageSortChange(TransactionalEditingDomain editingDomain, Notification notification, Message message, MessageSort expectedMessageSort) {

 		// This restriction isn't needed anymore, as the Property View offers a refactoring

 		// facility for the MessageSort. The refactoring is only available for AsynchCall to

 		// AsynchSignal and vice-versa.

@@ -1560,7 +1559,7 @@ public class SequenceUtil {
 	 * @return boolean

 	 */

 	public static boolean isCreateMessageEndLifeline(LifelineEditPart lifelineEP) {

-		List<Object> targetConnections = lifelineEP.getTargetConnections();

+		List<?> targetConnections = lifelineEP.getTargetConnections();

 		if (targetConnections != null && targetConnections.size() > 0) {

 			for (int i = 0; i < targetConnections.size(); i++) {

 				Object connection = targetConnections.get(i);

@@ -1624,7 +1623,7 @@ public class SequenceUtil {
 	 * @param targetClass

 	 * @return EditPart

 	 */

-	public static EditPart getEditPart(EditPart editPart, EObject targetElement, Class targetClass) {

+	public static EditPart getEditPart(EditPart editPart, EObject targetElement, Class<?> targetClass) {

 		if (editPart == null || targetElement == null || targetClass == null) {

 			return null;

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml
index ad1fb7d4814..5d2694424a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.sequence</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ActionExecutionSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ActionExecutionSpecificationEditPart.java
index f744d94cf7d..a5860bc964d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ActionExecutionSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ActionExecutionSpecificationEditPart.java
@@ -19,7 +19,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -41,6 +40,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

@@ -230,8 +230,8 @@ public class ActionExecutionSpecificationEditPart extends AbstractExecutionSpeci
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -249,8 +249,8 @@ public class ActionExecutionSpecificationEditPart extends AbstractExecutionSpeci
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/BehaviorExecutionSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/BehaviorExecutionSpecificationEditPart.java
index bbe81425cf0..15dbdc36fa1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/BehaviorExecutionSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/BehaviorExecutionSpecificationEditPart.java
@@ -19,7 +19,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -41,6 +40,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

@@ -230,8 +230,8 @@ public class BehaviorExecutionSpecificationEditPart extends AbstractExecutionSpe
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -249,8 +249,8 @@ public class BehaviorExecutionSpecificationEditPart extends AbstractExecutionSpe
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CombinedFragmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CombinedFragmentEditPart.java
index dd9ee802dd9..ee73c99a583 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CombinedFragmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CombinedFragmentEditPart.java
@@ -18,7 +18,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -42,6 +41,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

@@ -284,8 +284,8 @@ public class CombinedFragmentEditPart extends InteractionFragmentEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -294,8 +294,8 @@ public class CombinedFragmentEditPart extends InteractionFragmentEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CommentEditPart.java
index 7995b27f533..3e2b86a2a07 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CommentEditPart.java
@@ -18,7 +18,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -40,6 +39,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

@@ -274,8 +274,8 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -284,8 +284,8 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConsiderIgnoreFragmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConsiderIgnoreFragmentEditPart.java
index 1b31bec2e53..814286a10e1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConsiderIgnoreFragmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConsiderIgnoreFragmentEditPart.java
@@ -18,7 +18,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -39,6 +38,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

@@ -220,8 +220,8 @@ public class ConsiderIgnoreFragmentEditPart extends CombinedFragmentEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -230,8 +230,8 @@ public class ConsiderIgnoreFragmentEditPart extends CombinedFragmentEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConstraintEditPart.java
index a0a15668995..07ae7ce5218 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConstraintEditPart.java
@@ -18,7 +18,6 @@ import java.util.LinkedList;
 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -40,6 +39,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

@@ -280,8 +280,8 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -290,8 +290,8 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DestructionOccurrenceSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DestructionOccurrenceSpecificationEditPart.java
index 763a7faeaaf..83d6c95e674 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DestructionOccurrenceSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DestructionOccurrenceSpecificationEditPart.java
@@ -6,7 +6,6 @@ import java.util.List;
 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.gef.EditPart;

@@ -28,6 +27,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

@@ -204,8 +204,8 @@ public class DestructionOccurrenceSpecificationEditPart extends AbstractBorderIt
 	 */

 	@Override

 	protected void setLineWidth(int width) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineWidth(width);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineWidth(width);

 		}

 	}

 

@@ -214,8 +214,8 @@ public class DestructionOccurrenceSpecificationEditPart extends AbstractBorderIt
 	 */

 	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof Shape) {

-			((Shape) primaryShape).setLineStyle(style);

+		if (primaryShape instanceof IPapyrusNodeFigure) { // Manually replaced, waiting for next generation

+			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
index e0886df854f..ddc836a66d9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
@@ -51,36 +51,36 @@ Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0",

  org.eclipse.jface,

  org.eclipse.ocl.ecore,

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.navigation;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.navigation;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

  org.eclipse.ui.views,

  org.eclipse.uml2.uml,

  org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Ant-Version: Apache Ant 1.7.0

 Eclipse-LazyStart: true

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.statemachine.part.UM

  LDiagramEditorPlugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/pom.xml
index 58b8a8faa70..931488d73a6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.statemachine</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
index 5977ab1d358..62087735cff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
@@ -3,21 +3,21 @@ Export-Package: org.eclipse.papyrus.uml.diagram.stereotype.edition.command,
  org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart,

  org.eclipse.papyrus.uml.diagram.stereotype.edition.editpolicies

 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui,

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.profile;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.profile;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.stereotype.edition.A

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/pom.xml
index cacd1eb58d3..3925921be31 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.stereotype.edition</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF
index 0f6c86e9ec3..5150c544754 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.uml.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.symbols;bundle-version="1.0.1"

+Require-Bundle: org.eclipse.papyrus.uml.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.symbols;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Symbols Properties

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.symbols.propertie

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/pom.xml
index 350da7a1b20..2a27f473981 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.symbols.properties</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
index d51cfd61a60..9643bb735f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
@@ -3,25 +3,25 @@ Export-Package: org.eclipse.papyrus.uml.diagram.symbols,
  org.eclipse.papyrus.uml.diagram.symbols.provider

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime;bundle-version="3.8.0",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.profile;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.profile;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

  org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.6.0",

  org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.w3c.dom.svg;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.symbols.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/pom.xml
index 6c0a37f5527..3c430b2b986 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.symbols</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/META-INF/MANIFEST.MF
index 79c8c5430ab..4e0447c0375 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/META-INF/MANIFEST.MF
@@ -6,15 +6,15 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gef,

  org.eclipse.gmf.runtime.diagram.ui,

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.synchronizeview.custom

  ization

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.synchronizeview.Acti

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/pom.xml
index 36f63138085..64d0c520525 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.synchronizeview</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
index b73a20114f3..f4f85b0811f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
@@ -39,10 +39,10 @@ Require-Bundle: org.eclipse.emf.ecore,
  org.eclipse.gmf.runtime.emf.commands.core,

  org.eclipse.gmf.runtime.emf.ui.properties,

  org.eclipse.gmf.runtime.diagram.ui,

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.properties,

  org.eclipse.gmf.runtime.diagram.ui.providers,

  org.eclipse.gmf.runtime.diagram.ui.providers.ide,

@@ -56,24 +56,24 @@ Require-Bundle: org.eclipse.emf.ecore,
  org.eclipse.ocl.ecore,

  org.eclipse.emf.validation,

  org.eclipse.gef,

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0",

  org.eclipse.draw2d,

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagr

  amEditorPlugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/pom.xml
index 2ad68ccfab7..817656b2b59 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.timing</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
index 6e2a49d6def..e48f49122dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
@@ -42,31 +42,31 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,

  org.eclipse.uml2.uml,

  org.eclipse.gmf.runtime.draw2d.ui,

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

  org.eclipse.emf.validation,

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.4.2",

  org.eclipse.ui.navigator;bundle-version="3.5.200",

  org.eclipse.ocl.ecore;bundle-version="3.2.0",

  org.eclipse.ui.navigator.resources;bundle-version="3.4.400",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.emf.ecore,

  org.eclipse.emf.ecore.xmi,

  org.eclipse.emf.edit.ui,

@@ -75,13 +75,13 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore.edit;visibility:=reexport,

  org.eclipse.gef,

  org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiag

  ramEditorPlugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/pom.xml
index 8620a69117f..7fd4330c2eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.usecase</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
index b158bc7c7bb..e3637c8bb12 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
@@ -4,28 +4,28 @@ Export-Package: org.eclipse.papyrus.uml.diagram.wizards,
  org.eclipse.papyrus.uml.diagram.wizards.kind,

  org.eclipse.papyrus.uml.diagram.wizards.pages,

  org.eclipse.papyrus.uml.diagram.wizards.utils

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.emf.edit.ui;bundle-version="2.4.0",

  org.eclipse.emf.ecore.edit;bundle-version="2.4.0",

  org.eclipse.ui.intro;bundle-version="3.4.0",

  org.eclipse.core.runtime;bundle-version="3.7.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0";visibility:=reexport,

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

  org.eclipse.core.expressions;bundle-version="3.4.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0"

 Bundle-Vendor: %pluginProvider

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.wizards.Activator

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/pom.xml
index dca60d650e1..5e304733720 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.wizards</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF
index 11f65611909..67bc1697e8f 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.uml.modelexplorer.widgets

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.views.modelexplorer.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.modelexplorer.widgets;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="3.2.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.modelexplorer.widgets.Activa

diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/pom.xml b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/pom.xml
index 592df37f68c..863f99aabb0 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/pom.xml
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.modelexplorer.widgets</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
index 4c462e06c93..e95042a0c62 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
@@ -6,39 +6,39 @@ Export-Package: org.eclipse.papyrus.uml.modelexplorer,
  org.eclipse.papyrus.uml.modelexplorer.util

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

  org.eclipse.ui.navigator;bundle-version="3.4.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",

  org.eclipse.ui.ide;bundle-version="3.8.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.1.0",

  org.eclipse.emf.ecore,

- org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.newchild;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.newchild;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .,

  bin/

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/pom.xml b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/pom.xml
index 3284a6abb5c..9317e5a6dd8 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/pom.xml
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.modelexplorer</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF
index 481862234b7..592a443125b 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: UML Generic Table Config

 Bundle-Activator: org.eclipse.papyrus.uml.nattable.generic.config.Acti

  vator

diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/pom.xml b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/pom.xml
index c952cbfc664..de90b712996 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/pom.xml
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.nattable.generic.config</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF
index b9485671a3b..cde00132236 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0",

  org.eclipse.emf.common,

- org.eclipse.papyrus.uml.nattable.generic.config;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.nattable.generic.config;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.uml.nattable.generic.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/pom.xml b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/pom.xml
index a456d5aaf15..b1429a8f840 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/pom.xml
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.nattable.generic</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
index 244f4de0498..c2197ee99ea 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
@@ -6,23 +6,23 @@ Export-Package: org.eclipse.papyrus.uml.nattable.menu,
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.common.core,

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0",

  org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

  org.eclipse.core.expressions,

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.uml.nattable.menu.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/pom.xml b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/pom.xml
index ad5fa8aad51..e7d3dbb845d 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/pom.xml
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.nattable.menu</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF
index 35a35fe41e8..dd1512c37a7 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF
@@ -4,19 +4,19 @@ Export-Package: org.eclipse.papyrus.uml.nattable.xtext.integration,
  org.eclipse.papyrus.uml.nattable.xtext.integration.util

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0",

  org.eclipse.emf.ecore,

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0",

  org.eclipse.xtext;bundle-version="2.4.2",

  org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",

  org.eclipse.gmf.runtime.common.core,

  org.eclipse.gmf.runtime.common.ui.services

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.uml.nattable.xtext.integration.A

  ctivator

diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/pom.xml b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/pom.xml
index 1ea60154b9e..17a19bbb7d6 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/pom.xml
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.nattable.xtext.integration</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
index dca1905efea..b1d527e3d34 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
@@ -14,29 +14,29 @@ Export-Package: org.eclipse.papyrus.uml.nattable,
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

  org.eclipse.jface,

  org.eclipse.core.expressions,

  org.eclipse.swt,

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.uml.nattable.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/pom.xml b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/pom.xml
index 2e8f389cba6..8318c6d8d6d 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/pom.xml
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.nattable</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF
index 88446f56b66..9641089a59a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF
@@ -4,14 +4,14 @@ Export-Package: org.eclipse.papyrus.uml.appearance,
  org.eclipse.papyrus.uml.appearance.helper

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.emf.ecore;bundle-version="2.8.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.uml.appearance.Activator

diff --git a/plugins/uml/org.eclipse.papyrus.uml.appearance/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.appearance/pom.xml
index ee6a9f97098..a26113937b1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.appearance/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.appearance/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.appearance</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.commands/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.commands/META-INF/MANIFEST.MF
index d142a2e1f77..2330049c285 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.commands/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.commands/META-INF/MANIFEST.MF
@@ -4,24 +4,24 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.common;bundle-version="2.7.0",

  org.eclipse.emf.ecore;bundle-version="2.7.0",

  org.eclipse.emf;bundle-version="2.6.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="3.2.0",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

  org.eclipse.core.expressions,

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.commands.command

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.commands.Activator

diff --git a/plugins/uml/org.eclipse.papyrus.uml.commands/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.commands/pom.xml
index 6d3636a9e80..6d221b78723 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.commands/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.commands/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.commands</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
index bb21604bc00..cb96f9a7f4d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
@@ -4,23 +4,23 @@ Require-Bundle: org.eclipse.core.commands,
  org.eclipse.equinox.registry,

  org.eclipse.gmf.runtime.common.core,

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.1.0",

  org.eclipse.emf.workspace,

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.resourceloading.preferences;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.resourceloading.preferences;bundle-version="1.1.0",

  org.eclipse.emf.validation.ui;bundle-version="1.7.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.controlmode.profile.Activato

diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/pom.xml
index 6f0c74bc459..42dcfee5e7f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.controlmode.profile</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/META-INF/MANIFEST.MF
index c3798731824..bd26242c386 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Export-Package: org.eclipse.papyrus.uml.documentation.Documentation,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/pom.xml
index 7ec15ac6633..7a53aa874f6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.documentation.profile</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/META-INF/MANIFEST.MF
index 3ece5468760..8b10fb74ca1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.uml2.uml,

  org.eclipse.ui.views.properties.tabbed,

  org.eclipse.emf.mapping.ecore2xml,

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.extensionpoints,

  org.eclipse.papyrus.uml.extensionpoints.library,

  org.eclipse.papyrus.uml.extensionpoints.metamodel,

@@ -12,7 +12,7 @@ Export-Package: org.eclipse.papyrus.uml.extensionpoints,
  org.eclipse.papyrus.uml.extensionpoints.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/pom.xml
index 171275e54e8..32904e09159 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.extensionpoints</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.icons/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.icons/META-INF/MANIFEST.MF
index deafa9c68f4..c3e3628d5c0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.icons/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.icons/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Require-Bundle: org.eclipse.ui,
 Export-Package: org.eclipse.papyrus.uml.icons

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/org.eclipse.papyrus.uml.icons/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.icons/pom.xml
index fa42a734752..a335742e469 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.icons/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.icons/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.icons</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF
index b10d09c7ebb..e263f798347 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF
@@ -1,23 +1,23 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="3.2.0",

  org.eclipse.uml2.common.edit,

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.core.databinding;bundle-version="1.4.1",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.importt.Activator

diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.import/pom.xml
index efd201c91cb..668c4e7d3c3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.import</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
index e4ee1ce5e85..e94036c6a7c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
@@ -10,28 +10,28 @@ Export-Package: org.eclipse.papyrus.uml.modelrepair,
  org.eclipse.papyrus.uml.modelrepair.validation

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

  org.eclipse.emf.ecore;bundle-version="2.9.0",

  org.eclipse.core.resources;bundle-version="3.8.100",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.emf.edit;bundle-version="2.9.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  com.google.guava;bundle-version="11.0.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

  org.eclipse.emf.edit.ui;bundle-version="2.10.0",

  org.eclipse.uml2.uml.edit;bundle-version="5.0.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Model Repair

 Bundle-Activator: org.eclipse.papyrus.uml.modelrepair.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/plugin.xml
index 37d0769a9cc..bd653c9c7cd 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/plugin.xml
@@ -34,29 +34,6 @@
                </visibleWhen>

             </command>

             <command

-                  commandId="org.eclipse.papyrus.uml.modelrepair.switchpackageimports"

-                  label="Switch PackageImports..."

-                  style="push">

-               <visibleWhen

-                     checkEnabled="false">

-                  <with

-                        variable="selection">

-                     <test

-                           property="org.eclipse.papyrus.views.modelexplorer.tester.eClass"

-                           value="uml::Package">

-                     </test>

-                     <iterate

-                           ifEmpty="false"

-                           operator="and">

-                        <test

-                              property="org.eclipse.papyrus.uml.tools.isRoot">

-                        </test>

-                     </iterate>

-                  </with>

-               </visibleWhen>

-            </command> 

-            <!--

-            <command

                   commandId="org.eclipse.papyrus.uml.modelrepair.switchlibraries"

                   label="Switch Libraries..."

                   style="push">

@@ -77,8 +54,7 @@
                      </iterate>

                   </with>

                </visibleWhen>

-            </command>

-            -->

+            </command> 

          </menu>

       </menuContribution>

    </extension>

@@ -95,15 +71,10 @@
             name="Switch Profiles">

       </command>

       <command

-            defaultHandler="org.eclipse.papyrus.uml.modelrepair.handler.SwitchResourceHandler"

+            defaultHandler="org.eclipse.papyrus.uml.modelrepair.handler.SwitchLibraryHandler"

             id="org.eclipse.papyrus.uml.modelrepair.switchlibraries"

             name="Switch Libraries">

       </command>

-      <command

-            defaultHandler="org.eclipse.papyrus.uml.modelrepair.handler.SwitchPackageImportHandler"

-            id="org.eclipse.papyrus.uml.modelrepair.switchpackageimports"

-            name="Switch PackageImports">

-      </command>

    </extension>

    <extension

          point="org.eclipse.papyrus.infra.emf.dependencyUpdateParticipant">

diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/pom.xml
index 27ce0df6d34..230b8945d38 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.modelrepair</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/handler/SwitchPackageImportHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/handler/SwitchLibraryHandler.java
index 76ceb0dddf7..e9faef18eff 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/handler/SwitchPackageImportHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/handler/SwitchLibraryHandler.java
@@ -13,8 +13,6 @@
  *****************************************************************************/

 package org.eclipse.papyrus.uml.modelrepair.handler;

 

-import java.util.Set;

-

 import org.eclipse.core.commands.AbstractHandler;

 import org.eclipse.core.commands.ExecutionEvent;

 import org.eclipse.core.commands.ExecutionException;

@@ -34,19 +32,17 @@ import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

 import org.eclipse.papyrus.uml.modelrepair.Activator;

-import org.eclipse.papyrus.uml.modelrepair.ui.SwitchPackageImportDialog;

-import org.eclipse.papyrus.uml.tools.util.LibraryHelper;

+import org.eclipse.papyrus.uml.modelrepair.ui.SwitchLibraryDialog;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.handlers.HandlerUtil;

 import org.eclipse.ui.statushandlers.StatusManager;

 import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.PackageImport;

 

 /**

  * A Handler to switch libraries referenced by Package imports (e.g. Local to Registered version)

  *

  */

-public class SwitchPackageImportHandler extends AbstractHandler {

+public class SwitchLibraryHandler extends AbstractHandler {

 

 	public Object execute(final ExecutionEvent event) throws ExecutionException {

 

@@ -134,20 +130,12 @@ public class SwitchPackageImportHandler extends AbstractHandler {
 		EcoreUtil.resolveAll(modelSet);

 		monitor.subTask("Open package import management dialog...");

 

-		final Set<PackageImport> allImportedPackages = LibraryHelper.getAllImportedPackages(modelSet);

-

-

 		// Go back to the UI thread and open a dialog

 		activeShell.getDisplay().asyncExec(new Runnable() {

 

 			public void run() {

-				if (allImportedPackages.isEmpty()) {

-					MessageDialog.openInformation(activeShell, "Switch Libraries", "The selected model has no Package Imports.");

-					return;

-				}

-

 				try {

-					SwitchPackageImportDialog dialog = new SwitchPackageImportDialog(activeShell, modelSet, editingDomain);

+					SwitchLibraryDialog dialog = new SwitchLibraryDialog(activeShell, modelSet, editingDomain);

 					dialog.open();

 				} catch (ServiceException e) {

 					StatusManager.getManager().handle(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Failed to open package import switching dialog.", e), StatusManager.SHOW);

diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/handler/SwitchResourceHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/handler/SwitchResourceHandler.java
deleted file mode 100644
index 1ea1d26a604..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/handler/SwitchResourceHandler.java
+++ /dev/null
@@ -1,160 +0,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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 408491

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.modelrepair.handler;

-

-import java.util.Set;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.core.runtime.jobs.Job;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.core.lifecycleevents.ISaveAndDirtyService;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.uml.modelrepair.Activator;

-import org.eclipse.papyrus.uml.modelrepair.ui.SwitchPackageImportDialog;

-import org.eclipse.papyrus.uml.tools.util.LibraryHelper;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.handlers.HandlerUtil;

-import org.eclipse.ui.statushandlers.StatusManager;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.PackageImport;

-

-/**

- * A Handler to switch libraries in general (e.g. Local to Registered version)

- *

- */

-public class SwitchResourceHandler extends AbstractHandler {

-

-	public Object execute(final ExecutionEvent event) throws ExecutionException {

-

-		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);

-		if (currentSelection.isEmpty() || !(currentSelection instanceof IStructuredSelection)) {

-			return null;

-		}

-

-		IStructuredSelection selection = (IStructuredSelection) currentSelection;

-

-		EObject selectedAdapter = EMFHelper.getEObject(selection.getFirstElement());

-

-		final Shell activeShell = HandlerUtil.getActiveShell(event);

-

-		if (activeShell == null) {

-			return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Impossible to find the active shell to switch resources");

-		}

-

-		if (selectedAdapter instanceof Package) {

-			final Package selectedPackage = (Package) selectedAdapter;

-

-			// Load the model in background and add a user information

-			Job openDialogJob = new Job("Switch libraries") {

-

-				protected IStatus status = Status.OK_STATUS;

-

-				protected boolean needsSave = false;

-

-				@Override

-				protected IStatus run(final IProgressMonitor monitor) {

-					monitor.beginTask("Analyzing model", IProgressMonitor.UNKNOWN);

-

-					try {

-						// Try first to have a model which is not dirty.

-						// In order not to have inconsistency, this is better that the model is not dirty. For example, the package import to switch should not be dirty

-						final ModelSet modelSet = ServiceUtilsForEObject.getInstance().getModelSet(selectedPackage);

-						final TransactionalEditingDomain editingDomain = modelSet.getTransactionalEditingDomain();

-

-						ISaveAndDirtyService saveAndDirtyService = ServiceUtilsForEObject.getInstance().getService(ISaveAndDirtyService.class, selectedPackage);

-

-						if (saveAndDirtyService.isDirty()) {

-							needsSave = true;

-							activeShell.getDisplay().syncExec(new Runnable() {

-

-								public void run() {

-									// pop-up a message to check if save should be performed or if action should be cancelled

-									boolean openQuestion = MessageDialog.openQuestion(activeShell, "Switch Library", "Model should be saved before switching libraries. Would you like to save it now? \nOperation will be cancelled if you press no.");

-									if (!openQuestion) {

-										status = Status.CANCEL_STATUS;

-									}

-								}

-							});

-

-						}

-

-						if (!status.isOK()) {

-							return status;

-						}

-

-						if (needsSave) {

-							saveAndDirtyService.doSave(monitor);

-						}

-

-						switchLibrariesForModelSet(selectedPackage, modelSet, editingDomain, activeShell, monitor);

-					} catch (ServiceException e) {

-						Activator.log.error(e);

-						return new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e);

-					}

-

-					return Status.OK_STATUS;

-				}

-			};

-

-			openDialogJob.setUser(true);

-

-			openDialogJob.schedule();

-		}

-

-		return null;

-	}

-

-	public void switchLibrariesForModelSet(final Package profiledPackage, final ModelSet modelSet, final TransactionalEditingDomain editingDomain, final Shell activeShell, final IProgressMonitor monitor) {

-		monitor.subTask("Resolve all proxies...");

-		EcoreUtil.resolveAll(modelSet);

-		monitor.subTask("Open library management dialog...");

-

-		final Set<PackageImport> allImportedPackages = LibraryHelper.getAllImportedPackages(modelSet);

-

-

-		// Go back to the UI thread and open a dialog

-		activeShell.getDisplay().asyncExec(new Runnable() {

-

-			public void run() {

-				if (allImportedPackages.isEmpty()) {

-					MessageDialog.openInformation(activeShell, "Switch Libraries", "The selected model has no Libraries.");

-					return;

-				}

-

-				try {

-					SwitchPackageImportDialog dialog = new SwitchPackageImportDialog(activeShell, modelSet, editingDomain);

-					dialog.open();

-				} catch (ServiceException e) {

-					StatusManager.getManager().handle(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Failed to open libraries switching dialog.", e), StatusManager.SHOW);

-				}

-			}

-		});

-

-	}

-

-

-}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/participants/StereotypeApplicationRepairParticipant.java b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/participants/StereotypeApplicationRepairParticipant.java
index 4e9db793a6a..80d2bd42644 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/participants/StereotypeApplicationRepairParticipant.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/participants/StereotypeApplicationRepairParticipant.java
@@ -13,8 +13,10 @@
 package org.eclipse.papyrus.uml.modelrepair.internal.participants;
 
 import java.util.Collection;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Queue;
 import java.util.regex.Pattern;
 
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -40,7 +42,6 @@ import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.xmi.XMLResource;
 import org.eclipse.emf.ecore.xml.type.AnyType;
@@ -318,7 +319,15 @@ public class StereotypeApplicationRepairParticipant extends PackageOperations im
 				// Handle case of unrecognized schema
 				if (isUnrecognizedSchema(classifier.getEPackage()) && (profile.getDefinition() != null)) {
 					// It's unrecognized content. Force look-up in the profile chosen by the user
-					EClassifier force = profile.getDefinition().getEClassifier(classifier.getName());
+					EPackage definition = profile.getDefinition();
+					EClassifier force = definition.getEClassifier(classifier.getName());
+					if (force == null) {
+						// Maybe it's in some sub-package that was generated from a nested package
+						// containing stereotypes in the profile
+						if (!definition.getESubpackages().isEmpty()) {
+							force = searchSubpackages(definition, classifier);
+						}
+					}
 					if (force != null) {
 						element = force;
 					}
@@ -340,31 +349,31 @@ public class StereotypeApplicationRepairParticipant extends PackageOperations im
 			return super.getNamedElement(element);
 		}
 
-		protected boolean isUnrecognizedSchema(EPackage ePackage) {
-			boolean result;
-
-			if (copying != null) {
-				result = getExtendedMetadata(copying).demandedPackages().contains(ePackage);
-			} else {
-				// Simple heuristic: unknown-schema packages don't have names, but profile-defined packages always do
-				result = (ePackage.getName() == null);
+		protected EClassifier searchSubpackages(EPackage ePackage, EClassifier unresolved) {
+			String nsPrefix = unresolved.getEPackage().getNsPrefix();
+			EClassifier result = null;
+			String name = unresolved.getName();
+
+			// Breadth-first search because we do a prefix match, to prefer matches higher
+			// in the package structure in case of multiple same-named stereotypes
+			Queue<EPackage> search = new LinkedList<EPackage>(ePackage.getESubpackages());
+
+			for (EPackage next = search.poll(); (next != null) && (result == null); next = search.poll()) {
+				// Match on the package's nsPrefix, accounting for possible _1, _2, etc. suffixes
+				// for differentiation of EPackages that specify the same prefix
+				if ((nsPrefix == null) ? (next.getNsPrefix() == null) : nsPrefix.startsWith(next.getNsPrefix())) {
+					result = next.getEClassifier(name);
+					if ((result == null) && !next.getESubpackages().isEmpty()) {
+						search.addAll(next.getESubpackages());
+					}
+				}
 			}
 
 			return result;
 		}
 
-		protected ExtendedMetaData getExtendedMetadata(EObject context) {
-			ExtendedMetaData result = ExtendedMetaData.INSTANCE;
-
-			Resource resource = context.eResource();
-			if (resource instanceof XMLResource) {
-				Object option = ((XMLResource) resource).getDefaultSaveOptions().get(XMLResource.OPTION_EXTENDED_META_DATA);
-				if (option instanceof ExtendedMetaData) {
-					result = (ExtendedMetaData) option;
-				}
-			}
-
-			return result;
+		protected boolean isUnrecognizedSchema(EPackage ePackage) {
+			return StereotypesUtil.isUnrecognizedSchema(ePackage, copying);
 		}
 
 		@Override
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/participants/StereotypesUtil.java b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/participants/StereotypesUtil.java
new file mode 100644
index 00000000000..1bf9307e16c
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/participants/StereotypesUtil.java
@@ -0,0 +1,72 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.modelrepair.internal.participants;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.ExtendedMetaData;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+
+/**
+ * Utilities for working with stereotypes, profiles, etc.
+ */
+public class StereotypesUtil {
+
+	/**
+	 * Not instantiable by clients.
+	 */
+	private StereotypesUtil() {
+		super();
+	}
+
+	/**
+	 * Queries whether a package, discovered in the context of some stereotype application, is a demand-created
+	 * package created by EMF to record unrecognized schema content from the XML.
+	 * 
+	 * @param ePackage
+	 *            a package (not {@code null})
+	 * @param stereotypeApplication
+	 *            the contextual stereotype application, or {@code null} if none is available
+	 * 
+	 * @return whether the package looks like an unrecognized schema
+	 */
+	public static boolean isUnrecognizedSchema(EPackage ePackage, EObject stereotypeApplication) {
+		boolean result;
+
+		if (stereotypeApplication != null) {
+			result = getExtendedMetadata(stereotypeApplication).demandedPackages().contains(ePackage);
+		} else {
+			// Simple heuristic: unknown-schema packages don't have names, but profile-defined packages always do
+			result = (ePackage.getName() == null);
+		}
+
+		return result;
+	}
+
+	private static ExtendedMetaData getExtendedMetadata(EObject context) {
+		ExtendedMetaData result = ExtendedMetaData.INSTANCE;
+
+		Resource resource = context.eResource();
+		if (resource instanceof XMLResource) {
+			Object option = ((XMLResource) resource).getDefaultSaveOptions().get(XMLResource.OPTION_EXTENDED_META_DATA);
+			if (option instanceof ExtendedMetaData) {
+				result = (ExtendedMetaData) option;
+			}
+		}
+
+		return result;
+	}
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/stereotypes/ZombieStereotypesDescriptor.java b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/stereotypes/ZombieStereotypesDescriptor.java
index 3d28991c356..73199c701f3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/stereotypes/ZombieStereotypesDescriptor.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/stereotypes/ZombieStereotypesDescriptor.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMapUtil;
 import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.papyrus.uml.modelrepair.internal.participants.StereotypesUtil;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Extension;
 import org.eclipse.uml2.uml.Package;
@@ -52,6 +53,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
+import com.google.common.collect.Sets;
 
 
 /**
@@ -80,14 +82,38 @@ public class ZombieStereotypesDescriptor {
 	public ZombieStereotypesDescriptor(Resource resource, Package root, Set<EPackage> appliedProfileDefinitions, Function<? super EPackage, Profile> dynamicProfileSupplier, LabelProviderService labelProviderService) {
 		this.resource = resource;
 		this.root = root;
-		this.appliedProfileDefinitions = appliedProfileDefinitions;
+		this.appliedProfileDefinitions = includingSubpackages(appliedProfileDefinitions);
 		this.dynamicProfileSupplier = dynamicProfileSupplier;
 		this.labelProviderService = labelProviderService;
 	}
 
+	/**
+	 * Stereotypes may be defined in regular packages within a profile. To that end, collect all
+	 * nested packages of the applied profile-definition packages as being implicitly "applied".
+	 */
+	private static Set<EPackage> includingSubpackages(Collection<? extends EPackage> profileDefinitions) {
+		final Set<EPackage> result = Sets.newHashSet();
+
+		for (EPackage next : profileDefinitions) {
+			collectPackages(next, result);
+		}
+
+		return result;
+	}
+
+	private static void collectPackages(EPackage ePackage, Collection<? super EPackage> result) {
+		if (result.add(ePackage)) { // Not exactly likely to have cycles
+			if (!ePackage.getESubpackages().isEmpty()) {
+				for (EPackage next : ePackage.getESubpackages()) {
+					collectPackages(next, result);
+				}
+			}
+		}
+	}
+
 	public void analyze(EObject stereotypeApplication) {
 		EPackage schema = getEPackage(stereotypeApplication);
-		if ((schema == null) || !appliedProfileDefinitions.contains(schema)) {
+		if ((schema == null) || (!appliedProfileDefinitions.contains(schema) && couldBeProfileDefinition(schema, stereotypeApplication))) {
 			// It's a zombie. Determine the profile-application context that covers this stereotype instance
 			ProfileContext context = getProfileContext(stereotypeApplication, schema);
 
@@ -108,6 +134,18 @@ public class ZombieStereotypesDescriptor {
 		}
 	}
 
+	protected boolean couldBeProfileDefinition(EPackage schema, EObject stereotypeApplication) {
+		// an EPackage could be a profile definition if either actually is one or
+		// it is a package demand-created by EMF for unrecognized content
+		boolean result = findProfile(schema) != null;
+
+		if (!result) {
+			result = StereotypesUtil.isUnrecognizedSchema(schema, stereotypeApplication);
+		}
+
+		return result;
+	}
+
 	public boolean hasZombies() {
 		return !zombies.isEmpty();
 	}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchLibraryContentProvider.java b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchLibraryContentProvider.java
new file mode 100644
index 00000000000..87ba9bb55bf
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchLibraryContentProvider.java
@@ -0,0 +1,148 @@
+/*****************************************************************************

+ * 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.modelrepair.ui;

+

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EReference;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.jface.viewers.IStructuredContentProvider;

+import org.eclipse.jface.viewers.Viewer;

+import org.eclipse.papyrus.infra.core.resource.AbstractBaseModel;

+import org.eclipse.papyrus.infra.core.resource.IModel;

+import org.eclipse.papyrus.infra.core.resource.ModelSet;

+

+public class SwitchLibraryContentProvider implements IStructuredContentProvider {

+

+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

+		// Nothing

+	}

+

+	public void dispose() {

+		// Nothing

+	}

+

+	protected boolean isModelResource(ModelSet modelSet, Resource resource) {

+		IModel resourceModel = modelSet.getModelFor(resource);

+		if (resourceModel == null) {

+			return false;

+		}

+

+		if (resourceModel instanceof AbstractBaseModel) {

+			AbstractBaseModel model = (AbstractBaseModel) resourceModel;

+			if (model.getResource() == resource) {

+				return true;

+			}

+

+			if (model.isControlled(resource)) {

+				return true;

+			}

+		}

+

+		return false;

+	}

+

+	public Object[] getElements(Object inputElement) {

+		if (inputElement instanceof ModelSet) {

+			ModelSet modelSet = (ModelSet) inputElement;

+

+			Set<URI> allReferencedURIs = new HashSet<URI>();

+

+			Set<Resource> allModelResources = new HashSet<Resource>();

+

+			for (Resource resource : modelSet.getResources()) {

+				if (isModelResource(modelSet, resource)) {

+					allModelResources.add(resource);

+				}

+			}

+

+			for (Resource modelResource : allModelResources) {

+

+				// Use properContents to avoid iterating twice on controlled resources

+				Iterator<EObject> allContents = EcoreUtil.getAllProperContents(modelResource, true);

+

+

+				// Iterate on the contents to find all the outgoing references. Is there a helper for that?

+				while (allContents.hasNext()) {

+					EObject next = allContents.next();

+					List<EReference> allReferences = next.eClass().getEAllReferences();

+					for (EReference reference : allReferences) {

+						if (reference.isContainer() || reference.isContainment()) {

+							continue;

+						}

+

+						if (reference.isVolatile() || reference.isTransient()) {

+							continue;

+						}

+

+						if (reference.isDerived() || !reference.isChangeable()) {

+							continue;

+						}

+

+						Object value = next.eGet(reference);

+						if (value instanceof EObject) {

+							handleReferenceValue(value, allReferencedURIs);

+						} else if (value instanceof List<?>) {

+							List<?> values = (List<?>) value;

+							for (Object objectValue : values) {

+								handleReferenceValue(objectValue, allReferencedURIs);

+							}

+						}

+					}

+				}

+			}

+

+			URI referencedURI;

+			for (Iterator<URI> iterator = allReferencedURIs.iterator(); iterator.hasNext();) {

+				referencedURI = iterator.next();

+				if (referencedURI == null) {

+					iterator.remove();

+					continue;

+				}

+

+				Resource referencedResource = modelSet.getResource(referencedURI, false);

+				if (referencedResource != null) {

+					if (allModelResources.contains(referencedResource)) {

+						iterator.remove();

+						continue;

+					}

+

+					// Fragments will be handled with their parent

+					if (referencedURI instanceof Resource) {

+						for (EObject rootElement : ((Resource) referencedURI).getContents()) {

+							if (rootElement.eContainer() != null) {

+								iterator.remove();

+							}

+						}

+					}

+				}

+			}

+

+			return allReferencedURIs.toArray();

+		}

+		return null;

+	}

+

+	protected void handleReferenceValue(Object objectValue, Set<URI> allReferencedURIs) {

+		if (objectValue instanceof EObject) {

+			EObject eObject = (EObject) objectValue;

+			allReferencedURIs.add(EcoreUtil.getURI(eObject).trimFragment());

+		}

+	}

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchPackageImportDialog.java b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchLibraryDialog.java
index bbb0b212379..321384debf1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchPackageImportDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchLibraryDialog.java
@@ -17,12 +17,10 @@ import static com.google.common.base.Strings.nullToEmpty;
 

 import java.util.Collection;

 import java.util.HashMap;

-import java.util.HashSet;

 import java.util.LinkedHashMap;

 import java.util.LinkedList;

 import java.util.Map;

 import java.util.Map.Entry;

-import java.util.Set;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.runtime.IPath;

@@ -35,7 +33,6 @@ import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.URI;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.emf.transaction.RecordingCommand;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.jface.dialogs.IDialogConstants;

@@ -46,7 +43,6 @@ import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.IStructuredContentProvider;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.LabelProvider;

 import org.eclipse.jface.viewers.SelectionChangedEvent;

@@ -71,7 +67,6 @@ import org.eclipse.papyrus.infra.widgets.providers.WorkspaceContentProvider;
 import org.eclipse.papyrus.uml.extensionpoints.Registry;

 import org.eclipse.papyrus.uml.extensionpoints.library.IRegisteredLibrary;

 import org.eclipse.papyrus.uml.modelrepair.Activator;

-import org.eclipse.papyrus.uml.tools.util.LibraryHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.DisposeEvent;

 import org.eclipse.swt.events.DisposeListener;

@@ -89,12 +84,11 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.SelectionDialog;

 import org.eclipse.ui.statushandlers.StatusManager;

 import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.PackageImport;

 

 /**

  * The dialog to switch from a Package importy of a library to another implementation of that library

  */

-public class SwitchPackageImportDialog extends SelectionDialog {

+public class SwitchLibraryDialog extends SelectionDialog {

 

 	private static final int APPLY_ID = IDialogConstants.CLIENT_ID + 1;

 

@@ -114,9 +108,9 @@ public class SwitchPackageImportDialog extends SelectionDialog {
 

 	protected LabelProviderService labelProviderService;

 

-	protected final Map<Resource, Resource> librariesToEdit = new HashMap<Resource, Resource>();

+	protected final Map<URI, URI> librariesToEdit = new HashMap<URI, URI>();

 

-	public SwitchPackageImportDialog(Shell shell, ModelSet modelSet, TransactionalEditingDomain domain) throws ServiceException {

+	public SwitchLibraryDialog(Shell shell, ModelSet modelSet, TransactionalEditingDomain domain) throws ServiceException {

 		super(shell);

 

 		this.modelSet = modelSet;

@@ -182,54 +176,31 @@ public class SwitchPackageImportDialog extends SelectionDialog {
 		newLocationColumn.setText("New Location");

 		layout.addColumnData(new ColumnWeightData(50, 500, true));

 

-		viewer.setContentProvider(new IStructuredContentProvider() {

-

-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-				// Nothing

-			}

-

-			public void dispose() {

-				// Nothing

-			}

-

-			public Object[] getElements(Object inputElement) {

-				if (inputElement instanceof ModelSet) {

-					ModelSet modelSet = (ModelSet) inputElement;

-

-					Set<PackageImport> allImportedPackages = LibraryHelper.getAllImportedPackages(modelSet);

-

-					Set<Resource> allResources = new HashSet<Resource>();

-					for (PackageImport importedLibrary : allImportedPackages) {

-						URI libraryResourceURI = EcoreUtil.getURI(importedLibrary.getImportedPackage()).trimFragment();

-						Resource resource = modelSet.getResource(libraryResourceURI, true);

-						allResources.add(resource);

-					}

-

-					return allResources.toArray();

-				}

-				return null;

-			}

-		});

+		viewer.setContentProvider(new SwitchLibraryContentProvider());

 

 		final ILabelProvider labelProvider = new LabelProvider() {

 

 			@Override

 			public String getText(Object element) {

-				if (element instanceof Resource) {

-					Resource resource = (Resource) element;

-

-					for (EObject rootElement : resource.getContents()) {

-						if (rootElement instanceof Package) {

-							return ((Package) rootElement).getName();

+				if (element instanceof URI) {

+					URI uri = (URI) element;

+					Resource resource = modelSet.getResource(uri, false);

+					if (resource != null) {

+						for (EObject rootElement : resource.getContents()) {

+							if (rootElement instanceof Package) {

+								return ((Package) rootElement).getName();

+							}

 						}

 					}

 

-					return resource.getURI().toString();

+					return uri.toString();

 				}

+

 				return super.getText(element);

 			}

 		};

-		viewer.setLabelProvider(new PackageImportsColumnsLabelProvider(labelProvider));

+

+		viewer.setLabelProvider(new LibraryColumnsLabelProvider(labelProvider));

 		viewer.setComparator(new ViewerComparator() {

 			@Override

 			public int compare(Viewer viewer, Object e1, Object e2) {

@@ -300,9 +271,9 @@ public class SwitchPackageImportDialog extends SelectionDialog {
 					public void run(IProgressMonitor monitor) {

 						SubMonitor subMonitor = SubMonitor.convert(monitor, librariesToEdit.size());

 

-						for (Entry<Resource, Resource> replacementEntry : librariesToEdit.entrySet()) {

-							URI uriToReplace = replacementEntry.getKey().getURI();

-							URI targetURI = replacementEntry.getValue().getURI();

+						for (Entry<URI, URI> replacementEntry : librariesToEdit.entrySet()) {

+							URI uriToReplace = replacementEntry.getKey();

+							URI targetURI = replacementEntry.getValue();

 

 							if (uriToReplace.equals(targetURI)) {

 								continue;

@@ -401,28 +372,28 @@ public class SwitchPackageImportDialog extends SelectionDialog {
 		return super.close();

 	}

 

-	private class PackageImportsColumnsLabelProvider extends ColumnLabelProvider {

+	private class LibraryColumnsLabelProvider extends ColumnLabelProvider {

 

 		private ILabelProvider defaultLabelProvider;

 

-		public PackageImportsColumnsLabelProvider(ILabelProvider defaultLabelProvider) {

+		public LibraryColumnsLabelProvider(ILabelProvider defaultLabelProvider) {

 			this.defaultLabelProvider = defaultLabelProvider;

 		}

 

 		@Override

 		public void update(ViewerCell cell) {

 			Object element = cell.getElement();

-			Resource resource = (element instanceof Resource) ? (Resource) element : null;

+			URI uri = (element instanceof URI) ? (URI) element : null;

 

 			switch (cell.getColumnIndex()) {

 			case 0:

 				updateName(cell);

 				break;

 			case 1:

-				updateLocation(cell, resource);

+				updateLocation(cell, uri);

 				break;

 			case 2:

-				updateNewLocation(cell, resource);

+				updateNewLocation(cell, uri);

 				break;

 			}

 

@@ -433,27 +404,20 @@ public class SwitchPackageImportDialog extends SelectionDialog {
 			cell.setText(defaultLabelProvider.getText(cell.getElement()));

 		}

 

-		public void updateLocation(ViewerCell cell, Resource resource) {

+		public void updateLocation(ViewerCell cell, URI uri) {

 			String location = "Unknown";

-			if (resource != null) {

-				URI uri = resource.getURI();

-				if (uri != null) {

-					location = uri.toString();

-				}

+			if (uri != null) {

+				location = uri.toString();

 			}

 

 			cell.setText(location);

 		}

 

-		public void updateNewLocation(ViewerCell cell, Resource resource) {

+		public void updateNewLocation(ViewerCell cell, URI uri) {

 			String location = "";

-			resource = librariesToEdit.get(resource);

-

-			if (resource != null) {

-				URI uri = resource.getURI();

-				if (uri != null) {

-					location = uri.toString();

-				}

+			uri = librariesToEdit.get(uri);

+			if (uri != null) {

+				location = uri.toString();

 			}

 

 			cell.setText(location);

@@ -461,7 +425,7 @@ public class SwitchPackageImportDialog extends SelectionDialog {
 	}

 

 	protected void browseWorkspaceLibraries() {

-		if (getSelectedResource() == null) {

+		if (getSelectedURI() == null) {

 			return;

 		}

 

@@ -496,7 +460,7 @@ public class SwitchPackageImportDialog extends SelectionDialog {
 		}

 	}

 

-	protected Resource getSelectedResource() {

+	protected URI getSelectedURI() {

 		ISelection selection = viewer.getSelection();

 		if (selection.isEmpty()) {

 			return null;

@@ -504,8 +468,8 @@ public class SwitchPackageImportDialog extends SelectionDialog {
 

 		if (selection instanceof IStructuredSelection) {

 			Object selectedElement = ((IStructuredSelection) selection).getFirstElement();

-			if (selectedElement instanceof Resource) {

-				return (Resource) selectedElement;

+			if (selectedElement instanceof URI) {

+				return (URI) selectedElement;

 			}

 		}

 

@@ -555,10 +519,8 @@ public class SwitchPackageImportDialog extends SelectionDialog {
 	}

 

 	protected void replaceSelectionWith(URI targetURI) {

-		Resource targetResource = modelSet.getResource(targetURI, true);

-

-		if (getSelectedResource() != targetResource) {

-			librariesToEdit.put(getSelectedResource(), targetResource);

+		if (!getSelectedURI().equals(targetURI)) {

+			librariesToEdit.put(getSelectedURI(), targetURI);

 			updateControls();

 		} else {

 			MessageDialog.openWarning(getShell(), "Nothing changed", "Nothing to change");

diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchResourceDialog.java b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchResourceDialog.java
deleted file mode 100644
index d72f70d3fa1..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchResourceDialog.java
+++ /dev/null
@@ -1,567 +0,0 @@
-/*****************************************************************************

- * 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

- *  Inspired from Class {@link SwitchPackageImportDialog}

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.modelrepair.ui;

-

-import static com.google.common.base.Strings.nullToEmpty;

-

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.LinkedHashMap;

-import java.util.LinkedList;

-import java.util.Map;

-import java.util.Map.Entry;

-import java.util.Set;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.core.runtime.SubMonitor;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.jface.dialogs.IDialogConstants;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.operation.IRunnableWithProgress;

-import org.eclipse.jface.viewers.ColumnLabelProvider;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.jface.viewers.ViewerCell;

-import org.eclipse.jface.viewers.ViewerComparator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.utils.TransactionHelper;

-import org.eclipse.papyrus.infra.emf.resource.DependencyManager;

-import org.eclipse.papyrus.infra.emf.resource.Replacement;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResourceSet;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.papyrus.infra.services.markerlistener.dialogs.DiagnosticDialog;

-import org.eclipse.papyrus.infra.widgets.editors.TreeSelectorDialog;

-import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.WorkspaceContentProvider;

-import org.eclipse.papyrus.uml.extensionpoints.Registry;

-import org.eclipse.papyrus.uml.extensionpoints.library.IRegisteredLibrary;

-import org.eclipse.papyrus.uml.modelrepair.Activator;

-import org.eclipse.papyrus.uml.tools.util.LibraryHelper;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.DisposeEvent;

-import org.eclipse.swt.events.DisposeListener;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.dialogs.SelectionDialog;

-import org.eclipse.ui.statushandlers.StatusManager;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.PackageImport;

-

-/**

- * The dialog to switch from a Library application to another

- */

-public class SwitchResourceDialog extends SelectionDialog {

-

-	private static final int APPLY_ID = IDialogConstants.CLIENT_ID + 1;

-

-	private static final String APPLY_LABEL = "Apply";

-

-	private static final int BROWSE_WORKSPACE_ID = IDialogConstants.CLIENT_ID + 2;

-

-	private static final int BROWSE_REGISTERED_ID = IDialogConstants.CLIENT_ID + 3;

-

-	private ModelSet modelSet;

-

-	private TransactionalEditingDomain editingDomain;

-

-	protected TableViewer viewer;

-

-	protected Table table;

-

-	protected LabelProviderService labelProviderService;

-

-	protected final Map<Resource, Resource> librariesToEdit = new HashMap<Resource, Resource>();

-

-	public SwitchResourceDialog(Shell shell, ModelSet modelSet, TransactionalEditingDomain domain) throws ServiceException {

-		super(shell);

-

-		this.modelSet = modelSet;

-		this.editingDomain = domain;

-		this.labelProviderService = ServiceUtilsForResourceSet.getInstance().getService(LabelProviderService.class, modelSet);

-	}

-

-	@Override

-	protected Control createDialogArea(Composite parent) {

-		Composite contents = (Composite) super.createDialogArea(parent);

-

-		Composite self = new Composite(contents, SWT.NONE);

-		self.setLayout(new GridLayout(1, false));

-		self.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-

-		Label descriptionLabel = new Label(self, SWT.WRAP);

-		String description = "Select an imported library, then select a new library (either from the workspace, or a registered one).\n";

-		description += "If the libraries are equivalent, the selected library will replace the imported library.\n";

-		description += "Two libraries are equivalent if one is the copy of the other or if you have deployed a workspace library in a plug-in.\n";

-		description += "If a library P' is a copy of a library P, with some modifications, they are also equivalent.";

-		descriptionLabel.setText(description);

-

-		descriptionLabel.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));

-

-		Label warningLabel = new Label(self, SWT.WRAP);

-		String warning = "Replacing an imported library with a totally different one could result in loss of information.";

-		warningLabel.setText(warning);

-		warningLabel.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_DARK_RED));

-

-		warningLabel.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));

-

-		Composite buttonsBarComposite = new Composite(self, SWT.NONE);

-

-		GridLayout buttonsLayout = new GridLayout(0, false);

-		buttonsLayout.marginWidth = 0;

-

-		buttonsBarComposite.setLayout(buttonsLayout);

-		buttonsBarComposite.setLayoutData(new GridData(SWT.END, SWT.CENTER, false, false));

-

-		Button browseWorkspace = createButton(buttonsBarComposite, BROWSE_WORKSPACE_ID, "", false);

-		browseWorkspace.setImage(org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage("icons/Add_12x12.gif"));

-		Button browseRegistered = createButton(buttonsBarComposite, BROWSE_REGISTERED_ID, "", false);

-		browseRegistered.setImage(org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage(Activator.PLUGIN_ID, "icons/AddReg.gif"));

-

-

-		viewer = new TableViewer(self, SWT.FULL_SELECTION | SWT.BORDER);

-		table = viewer.getTable();

-		TableLayout layout = new TableLayout();

-		table.setLayout(layout);

-		table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-		table.setHeaderVisible(true);

-

-

-		TableColumn nameColumn = new TableColumn(table, SWT.NONE);

-		nameColumn.setText("Resource");

-		layout.addColumnData(new ColumnWeightData(15, 150, true));

-

-		TableColumn locationColumn = new TableColumn(table, SWT.NONE);

-		locationColumn.setText("Location");

-		layout.addColumnData(new ColumnWeightData(50, 500, true));

-

-		TableColumn newLocationColumn = new TableColumn(table, SWT.NONE);

-		newLocationColumn.setText("New Location");

-		layout.addColumnData(new ColumnWeightData(50, 500, true));

-

-		viewer.setContentProvider(new IStructuredContentProvider() {

-

-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-				// Nothing

-			}

-

-			public void dispose() {

-				// Nothing

-			}

-

-			public Object[] getElements(Object inputElement) {

-				if (inputElement instanceof ModelSet) {

-					ModelSet modelSet = (ModelSet) inputElement;

-

-					Set<PackageImport> allImportedPackages = LibraryHelper.getAllImportedPackages(modelSet);

-

-					Set<Resource> allResources = new HashSet<Resource>();

-					for (PackageImport appliedLibrary : allImportedPackages) {

-						URI libraryResourceURI = EcoreUtil.getURI(appliedLibrary.getImportedPackage()).trimFragment();

-						Resource resource = modelSet.getResource(libraryResourceURI, true);

-						allResources.add(resource);

-					}

-

-					return allResources.toArray();

-				}

-				return null;

-			}

-		});

-

-		final ILabelProvider labelProvider = new LabelProvider() {

-

-			@Override

-			public String getText(Object element) {

-				if (element instanceof Resource) {

-					Resource resource = (Resource) element;

-

-					for (EObject rootElement : resource.getContents()) {

-						if (rootElement instanceof Package) {

-							return ((Package) rootElement).getName();

-						}

-					}

-

-					return resource.getURI().toString();

-				}

-				return super.getText(element);

-			}

-		};

-		viewer.setLabelProvider(new PackageImportsColumnsLabelProvider(labelProvider));

-		viewer.setComparator(new ViewerComparator() {

-			@Override

-			public int compare(Viewer viewer, Object e1, Object e2) {

-				return nullToEmpty(labelProvider.getText(e1)).compareTo(nullToEmpty(labelProvider.getText(e2)));

-			}

-		});

-

-		viewer.setInput(modelSet);

-

-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {

-

-			public void selectionChanged(SelectionChangedEvent event) {

-				updateControls();

-			}

-		});

-

-		viewer.getControl().addDisposeListener(new DisposeListener() {

-

-			public void widgetDisposed(DisposeEvent e) {

-				labelProvider.dispose();

-			}

-		});

-

-		return contents;

-	}

-

-	protected void updateControls() {

-		String newTitle = "Switch Library Locations";

-		if (!librariesToEdit.isEmpty()) {

-			newTitle += " *";

-		}

-		getShell().setText(newTitle);

-		getButton(APPLY_ID).setEnabled(!librariesToEdit.isEmpty());

-

-		boolean enableBrowse = !viewer.getSelection().isEmpty();

-

-		getButton(BROWSE_REGISTERED_ID).setEnabled(enableBrowse);

-		getButton(BROWSE_WORKSPACE_ID).setEnabled(enableBrowse);

-

-		viewer.refresh();

-	}

-

-	@Override

-	protected void setButtonLayoutData(Button button) {

-		int buttonId = ((Integer) button.getData()).intValue();

-		if (buttonId == BROWSE_REGISTERED_ID || buttonId == BROWSE_WORKSPACE_ID) {

-			return; // Don't change the layout data

-		}

-

-		super.setButtonLayoutData(button);

-	}

-

-	protected void applyPressed() {

-		if (librariesToEdit.isEmpty()) {

-			return;

-		}

-

-		editingDomain.getCommandStack().execute(new RecordingCommand(editingDomain, "Edit library applications") {

-

-			@Override

-			protected void doExecute() {

-

-				final Collection<Replacement> allReplacements = new LinkedList<Replacement>();

-				final BasicDiagnostic diagnostics = new BasicDiagnostic(Activator.PLUGIN_ID, 0, "Problems in switching library", null);

-

-				IRunnableWithProgress runnable = TransactionHelper.createPrivilegedRunnableWithProgress(editingDomain, new IRunnableWithProgress() {

-

-					public void run(IProgressMonitor monitor) {

-						SubMonitor subMonitor = SubMonitor.convert(monitor, librariesToEdit.size());

-

-						for (Entry<Resource, Resource> replacementEntry : librariesToEdit.entrySet()) {

-							URI uriToReplace = replacementEntry.getKey().getURI();

-							URI targetURI = replacementEntry.getValue().getURI();

-

-							if (uriToReplace.equals(targetURI)) {

-								continue;

-							}

-

-							Collection<Replacement> result = new DependencyManager(modelSet).updateDependencies(uriToReplace, targetURI, diagnostics, subMonitor.newChild(1));

-							allReplacements.addAll(result);

-						}

-

-						subMonitor.done();

-					}

-				});

-

-				try {

-					PlatformUI.getWorkbench().getProgressService().busyCursorWhile(runnable);

-				} catch (Exception e) {

-					StatusManager.getManager().handle(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Failed to execute library switch."), StatusManager.SHOW);

-				}

-

-				if (allReplacements.isEmpty()) {

-					MessageDialog.openWarning(getShell(), "Switch Libraries", "No library applications were found to update.");

-				} else {

-					if (diagnostics.getSeverity() > Diagnostic.OK) {

-						DiagnosticDialog dialog = new DiagnosticDialog(getShell(), "Problems in Switching Libraries",

-								"Some incompatible differences in the target library likely resulted in loss or transformation of data in stereotype applications. Please review the specific details and take any corrective action that may be required.",

-								diagnostics, Diagnostic.ERROR | Diagnostic.WARNING);

-						dialog.setBlockOnOpen(true);

-						dialog.open();

-					}

-				}

-			}

-		});

-

-		librariesToEdit.clear();

-		updateControls();

-	}

-

-	@Override

-	protected void createButtonsForButtonBar(Composite parent) {

-		createButton(parent, APPLY_ID, APPLY_LABEL, true);

-		super.createButtonsForButtonBar(parent);

-	}

-

-	@Override

-	protected void buttonPressed(int buttonId) {

-		switch (buttonId) {

-		case IDialogConstants.CANCEL_ID:

-			if (!librariesToEdit.isEmpty() && !MessageDialog.openQuestion(getShell(), "Switch Libraries", "You have not yet applied the pending library switch(es). Are you sure you want to cancel?")) {

-				// don't cancel

-				return;

-			}

-			break;

-		case APPLY_ID:

-			applyPressed();

-			return;

-		case BROWSE_REGISTERED_ID:

-			browseRegisteredLibraries();

-			return;

-		case BROWSE_WORKSPACE_ID:

-			browseWorkspaceLibraries();

-			return;

-		}

-

-		super.buttonPressed(buttonId);

-	}

-

-	@Override

-	public void create() {

-		super.create();

-		updateControls();

-		getShell().setText("Switch Library Locations");

-		getShell().setMinimumSize(600, 400);

-		getShell().pack();

-	}

-

-	@Override

-	protected boolean isResizable() {

-		return true;

-	}

-

-	@Override

-	public boolean isHelpAvailable() {

-		return false;

-	}

-

-	@Override

-	protected void okPressed() {

-		applyPressed();

-

-		super.okPressed();

-	}

-

-	@Override

-	public boolean close() {

-		librariesToEdit.clear();

-		return super.close();

-	}

-

-	private class PackageImportsColumnsLabelProvider extends ColumnLabelProvider {

-

-		private ILabelProvider defaultLabelProvider;

-

-		public PackageImportsColumnsLabelProvider(ILabelProvider defaultLabelProvider) {

-			this.defaultLabelProvider = defaultLabelProvider;

-		}

-

-		@Override

-		public void update(ViewerCell cell) {

-			Object element = cell.getElement();

-			Resource resource = (element instanceof Resource) ? (Resource) element : null;

-

-			switch (cell.getColumnIndex()) {

-			case 0:

-				updateName(cell);

-				break;

-			case 1:

-				updateLocation(cell, resource);

-				break;

-			case 2:

-				updateNewLocation(cell, resource);

-				break;

-			}

-

-		}

-

-		public void updateName(ViewerCell cell) {

-			cell.setImage(defaultLabelProvider.getImage(cell.getElement()));

-			cell.setText(defaultLabelProvider.getText(cell.getElement()));

-		}

-

-		public void updateLocation(ViewerCell cell, Resource resource) {

-			String location = "Unknown";

-			if (resource != null) {

-				URI uri = resource.getURI();

-				if (uri != null) {

-					location = uri.toString();

-				}

-			}

-

-			cell.setText(location);

-		}

-

-		public void updateNewLocation(ViewerCell cell, Resource resource) {

-			String location = "";

-			resource = librariesToEdit.get(resource);

-

-			if (resource != null) {

-				URI uri = resource.getURI();

-				if (uri != null) {

-					location = uri.toString();

-				}

-			}

-

-			cell.setText(location);

-		}

-	}

-

-	protected void browseWorkspaceLibraries() {

-		if (getSelectedResource() == null) {

-			return;

-		}

-

-		Map<String, String> extensionFilters = new LinkedHashMap<String, String>();

-		extensionFilters.put("*.uml", "UML (*.uml)");

-		extensionFilters.put("*", "All (*)");

-

-		TreeSelectorDialog dialog = new TreeSelectorDialog(getShell());

-		dialog.setTitle("Browse Workspace");

-		dialog.setDescription("Select a library in the workspace.");

-		WorkspaceContentProvider workspaceContentProvider = new WorkspaceContentProvider();

-		workspaceContentProvider.setExtensionFilters(extensionFilters);

-		dialog.setContentProvider(workspaceContentProvider);

-

-		dialog.setLabelProvider(labelProviderService.getLabelProvider());

-

-

-		if (dialog.open() == Window.OK) {

-			Object[] result = dialog.getResult();

-			if (result == null || result.length == 0) {

-				return;

-			}

-

-			Object selectedFile = result[0];

-

-			if (selectedFile instanceof IFile) {

-				IPath filePath = ((IFile) selectedFile).getFullPath();

-				URI workspaceURI = URI.createPlatformResourceURI(filePath.toString(), true);

-

-				replaceSelectionWith(workspaceURI);

-			}

-		}

-	}

-

-	protected Resource getSelectedResource() {

-		ISelection selection = viewer.getSelection();

-		if (selection.isEmpty()) {

-			return null;

-		}

-

-		if (selection instanceof IStructuredSelection) {

-			Object selectedElement = ((IStructuredSelection) selection).getFirstElement();

-			if (selectedElement instanceof Resource) {

-				return (Resource) selectedElement;

-			}

-		}

-

-		return null;

-	}

-

-	protected void browseRegisteredLibraries() {

-		TreeSelectorDialog dialog = new TreeSelectorDialog(getShell());

-		dialog.setTitle("Browse Registered Libraries");

-		dialog.setDescription("Select one of the registered libraries below.");

-		dialog.setContentProvider(new EncapsulatedContentProvider(new StaticContentProvider(Registry.getRegisteredLibraries().toArray(new IRegisteredLibrary[0]))));

-		dialog.setLabelProvider(new LabelProvider() {

-

-			@Override

-			public Image getImage(Object element) {

-				if (element instanceof IRegisteredLibrary) {

-					IRegisteredLibrary library = (IRegisteredLibrary) element;

-					return library.getImage();

-				}

-				return super.getImage(element);

-			}

-

-			@Override

-			public String getText(Object element) {

-				if (element instanceof IRegisteredLibrary) {

-					IRegisteredLibrary library = (IRegisteredLibrary) element;

-					return library.getName();

-				}

-

-				return super.getText(element);

-			}

-		});

-

-		if (dialog.open() == Window.OK) {

-			Object[] result = dialog.getResult();

-			if (result == null || result.length == 0) {

-				return;

-			}

-

-			Object selectedElement = result[0];

-			if (selectedElement instanceof IRegisteredLibrary) {

-				IRegisteredLibrary library = (IRegisteredLibrary) selectedElement;

-

-				replaceSelectionWith(library.getUri());

-			}

-		}

-	}

-

-	protected void replaceSelectionWith(URI targetURI) {

-		Resource targetResource = modelSet.getResource(targetURI, true);

-

-		if (getSelectedResource() != targetResource) {

-			librariesToEdit.put(getSelectedResource(), targetResource);

-			updateControls();

-		} else {

-			MessageDialog.openWarning(getShell(), "Nothing changed", "Nothing to change");

-		}

-	}

-}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.navigation/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.navigation/META-INF/MANIFEST.MF
index f6612f49ece..b60c1e9d0ba 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.navigation/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.navigation/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.services.navigation;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.navigation;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: UML Navigation

 Bundle-Activator: org.eclipse.papyrus.uml.navigation.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/org.eclipse.papyrus.uml.navigation/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.navigation/pom.xml
index 82b4ea01a25..4d555abac9e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.navigation/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.navigation/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.navigation</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/META-INF/MANIFEST.MF
index 8f762445bd9..3687528c432 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.commands;bundle-version="1.1.0",

  org.eclipse.ui.console;bundle-version="3.5.100",

  org.eclipse.ocl.examples.pivot;bundle-version="3.2.0",

  org.eclipse.ocl.examples.xtext.base;bundle-version="3.2.0",

  org.eclipse.uml2.uml;bundle-version="5.0.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.oclconstraintevaluation.Acti

diff --git a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/pom.xml
index d493e018d45..142cea73439 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.oclconstraintevaluation</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF
index a75b85aa086..bd878a5244f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0

 Export-Package: org.eclipse.papyrus.uml.perspective

-Require-Bundle: org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.0",

  org.eclipse.ui;bundle-version="3.7.0",

  org.eclipse.ui.ide;bundle-version="3.6.100",

  org.eclipse.core.runtime;bundle-version="3.6.100",

- org.eclipse.papyrus.views.validation;bundle-version="1.0.1"

+ org.eclipse.papyrus.views.validation;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.perspective.Activator

diff --git a/plugins/uml/org.eclipse.papyrus.uml.perspective/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.perspective/pom.xml
index e23c7cd8734..bb985973691 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.perspective/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.perspective/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.perspective</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF
index 5a0dfdaccb6..e236cd836eb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF
@@ -12,31 +12,31 @@ Export-Package: org.eclipse.papyrus.uml.profile,
  org.eclipse.papyrus.uml.profile.utils,

  org.eclipse.papyrus.uml.profile.validation,

  org.eclipse.papyrus.uml.profile.wizard

-Require-Bundle: org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.core.runtime;bundle-version="3.8.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.validation;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.validation;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

  org.eclipse.ui,

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

  org.eclipse.uml2.uml.editor;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.modelrepair;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.modelrepair;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.uml.profile.Activator

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.profile/pom.xml
index 508beb042ce..17ee040e0fb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.profile</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/META-INF/MANIFEST.MF
index f6d04dc128d..9e88b373340 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/pom.xml
index faaa1c38542..be672ea073b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.resourceloading.profile</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF
index 94e137f0b42..721c7965afa 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF
@@ -7,29 +7,29 @@ Export-Package: org.eclipse.papyrus.uml.search.ui.actions,
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.search;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.8.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

- org.eclipse.papyrus.views.search;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.onefile;bundle-version="1.0.1",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.search;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.onefile;bundle-version="1.1.0",

  org.eclipse.emf;bundle-version="2.6.0",

  org.eclipse.ui.ide;bundle-version="3.8.100",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.100",

- org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.openelement;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.openelement;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.jface,

  org.eclipse.emf.transaction,

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.ocl.examples.xtext.essentialocl;bundle-version="3.3.0",

  org.eclipse.ocl.examples.xtext.essentialocl.ui;bundle-version="3.3.0",

  org.eclipse.ocl.examples.xtext.console,

  org.eclipse.ltk.ui.refactoring;bundle-version="3.7.100"

 Bundle-Vendor: %vendorName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.search.ui.Activator

diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.search.ui/pom.xml
index 69fbe4e6b04..06996094e77 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.search.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
index a7066683865..033bb3eb14d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
@@ -8,28 +8,28 @@ Export-Package: org.eclipse.papyrus.uml.service.types,
  org.eclipse.papyrus.uml.service.types.helper.advice,

  org.eclipse.papyrus.uml.service.types.menu,

  org.eclipse.papyrus.uml.service.types.utils

-Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.core;bundle-version="1.6.0",

  org.eclipse.ui.workbench,

  org.eclipse.core.expressions,

  org.eclipse.jface,

  org.eclipse.uml2.uml.edit;bundle-version="4.0.100",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

  org.eclipse.uml2.uml.profile.standard;bundle-version="1.0.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.service.types.Activator

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.service.types/pom.xml
index 3375fc3998b..eb91506abe7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.service.types</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ActivityGroupHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ActivityGroupHelper.java
index dfd8f211ade..508d0b47e65 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ActivityGroupHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ActivityGroupHelper.java
@@ -23,8 +23,10 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.uml2.uml.UMLPackage;

 

 /**

  * this is an helper that redirect destroy request to get destroy command from uml plugin

@@ -40,6 +42,10 @@ public class ActivityGroupHelper extends ElementEditHelper {
 		return result;

 	}

 

+	protected boolean isActivityNode(IElementType type) {

+		return UMLPackage.eINSTANCE.getActivityNode().isSuperTypeOf(type.getEClass());

+	}

+	

 	/**

 	 * inner class for the destruction of element

 	 *

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ActivityPartitionEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ActivityPartitionEditHelper.java
index b9b6e5c5c4d..48c17282854 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ActivityPartitionEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ActivityPartitionEditHelper.java
@@ -5,7 +5,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.MoveElementsCommand;
 import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
@@ -20,7 +19,8 @@ public class ActivityPartitionEditHelper extends ActivityGroupHelper {
 
 	@Override
 	protected ICommand getCreateCommand(CreateElementRequest req) {
-		return super.getCreateCommand(getCreatePartitionChildRequest(req));
+		CreateElementRequest createRequest = isActivityNode(req.getElementType()) ? getCreatePartitionChildRequest(req) : req;
+		return super.getCreateCommand(createRequest);
 	}
 
 	/**
@@ -44,12 +44,16 @@ public class ActivityPartitionEditHelper extends ActivityGroupHelper {
 	protected ICommand getMoveCommand(MoveRequest req) {
 		if (req != null) {
 			if (req.getTargetContainer() instanceof ActivityPartition) {
-				ActivityPartition partition = (ActivityPartition) req.getTargetContainer();
 				CompositeCommand result = new CompositeCommand("Move elements in Partition");
-				MoveElementsCommand moveCommand = new NotContainmentMoveCommand(createMoveToPartitionRequest(req));
-				result.add(moveCommand);
-				for (Object o : req.getElementsToMove().keySet()) {
-					result.add(new SetValueCommand(new SetRequest(partition, UMLPackage.eINSTANCE.getActivityPartition_Node(), o)));
+				/**
+				 * separate moving elements containment and not
+				 */
+				for (Object movedElement: req.getElementsToMove().keySet()) {
+					if (movedElement instanceof ActivityNode) {
+						result.add(createMoveActivityNodeCommand(req, (ActivityNode) movedElement));
+					} else {
+						result.add(createDefaultMoveCommand(req, (EObject) movedElement));
+					}
 				}
 				return result;
 			}
@@ -57,31 +61,43 @@ public class ActivityPartitionEditHelper extends ActivityGroupHelper {
 		return super.getMoveCommand(req);
 	}
 
+	
 	/**
-	 * @param base
-	 *            move request in which target container is ActivityPartition
-	 * @return MoveRequest in which replaced Partition container on Activity and replaced containment features for it.
+	 * 
+	 * Create for {@link ActivityNode} {@link CompositeCommand}.
+	 * Contain {@link NotContainmentMoveCommand} to {@link Activity} and 
+	 * {@link SetValueCommand} to set not containment reference for {@link ActivityPartition}
 	 */
-	private MoveRequest createMoveToPartitionRequest(MoveRequest baseReq) {
-		if (baseReq == null) {
-			return null;
-		}
-		MoveRequest result = new MoveRequest(baseReq.getEditingDomain(), findActivity(baseReq.getTargetContainer()), baseReq.getElementsToMove());
-		for (Object o : baseReq.getElementsToMove().keySet()) {
-			if (o instanceof ActivityNode) {
-				ActivityNode node = (ActivityNode) o;
-				result.setTargetFeature(node, findActivityFeature(node.eClass()));
-			}
-		}
-		return result;
+	private ICommand createMoveActivityNodeCommand(MoveRequest baseRequest, ActivityNode node) {
+		CompositeCommand cc = new CompositeCommand("Move ActivityNode command");
+		
+		ActivityPartition partition = (ActivityPartition) baseRequest.getTargetContainer();
+		EReference containmentFeature = findActivityFeature(node.eClass());
+		Activity activity = findActivity(partition);
+		
+		MoveRequest moveActivityNodesReq = new MoveRequest(baseRequest.getEditingDomain(), activity, containmentFeature, node);
+		
+		cc.add(new NotContainmentMoveCommand(moveActivityNodesReq));
+		cc.add(new SetValueCommand(new SetRequest(partition, UMLPackage.eINSTANCE.getActivityPartition_Node(), node)));
+		return cc;
 	}
-
+	
+	/**
+	 * Create new {@link MoveRequest} for @param movedElement 
+	 * and invoke super{@link #getMoveCommand(MoveRequest)} to get default move command
+	 */
+	private ICommand createDefaultMoveCommand(MoveRequest baseRequest, EObject movedElement) {
+		EReference containmentFeature = baseRequest.getTargetFeature(movedElement);
+		MoveRequest moveRequest = new MoveRequest(baseRequest.getEditingDomain(), baseRequest.getTargetContainer(), containmentFeature, movedElement);
+		return super.getMoveCommand(moveRequest);
+	}
+	
 	/**
 	 * Find parent Activity.
 	 *
 	 * @param editElement
 	 *            ActivitiyPartition element
-	 * @return null if Activity not found.
+	 * @return <code>null</code> if Activity not found.
 	 */
 	protected Activity findActivity(EObject editElement) {
 		if (editElement instanceof ActivityPartition) {
@@ -98,15 +114,15 @@ public class ActivityPartitionEditHelper extends ActivityGroupHelper {
 	/**
 	 * Find Activity feature appropriate to ActivityPartition feature.
 	 *
-	 * @return Appropriate feature. If feature not found return partitionFeature param
+	 * @return Appropriate feature or <code>null</code> if feature not found.
 	 */
 	protected EReference findActivityFeature(EClass eClass) {
-		if (UMLPackage.eINSTANCE.getActivityPartition().isSuperTypeOf(eClass)) {
-			return UMLPackage.eINSTANCE.getActivity_StructuredNode();
-		}
 		if (UMLPackage.eINSTANCE.getStructuredActivityNode().isSuperTypeOf(eClass)) {
 			return UMLPackage.eINSTANCE.getActivity_StructuredNode();
 		}
-		return UMLPackage.eINSTANCE.getActivity_OwnedNode();
+		if (UMLPackage.eINSTANCE.getActivityNode().isSuperTypeOf(eClass)) {
+			return UMLPackage.eINSTANCE.getActivity_OwnedNode();
+		}
+		return null;
 	}
 }
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InterruptibleActivityRegionHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InterruptibleActivityRegionHelper.java
index 914eaab21f0..167c43506eb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InterruptibleActivityRegionHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InterruptibleActivityRegionHelper.java
@@ -6,7 +6,6 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.commands.MoveElementsCommand;
 import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
@@ -58,10 +57,6 @@ public class InterruptibleActivityRegionHelper extends ActivityGroupHelper {
 		return UMLPackage.eINSTANCE.getActivity_OwnedNode();
 	}
 
-	private boolean isActivityNode(IElementType type) {
-		return UMLPackage.eINSTANCE.getActivityNode().isSuperTypeOf(type.getEClass());
-	}
-
 	@Override
 	protected ICommand getMoveCommand(MoveRequest req) {
 		if (req != null) {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF
index 1e5bbeaeda4..cecab2d5f90 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF
@@ -1,17 +1,19 @@
 Manifest-Version: 1.0

 Export-Package: org.eclipse.papyrus.uml.service.validation,

- org.eclipse.papyrus.uml.service.validation.handler

+ org.eclipse.papyrus.uml.service.validation.handler,

+ org.eclipse.papyrus.uml.service.validation.oclpivot

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.services.validation;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.validation;bundle-version="1.1.0",

  org.eclipse.emf;bundle-version="2.6.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

- org.eclipse.ocl.examples.pivot;bundle-version="3.4.0"

+ org.eclipse.ocl.examples.pivot;bundle-version="3.4.0",

+ org.eclipse.ocl;bundle-version="3.4.0"

 Bundle-Vendor: %pluginProvider

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.service.validation.Activator

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.xml
index 2e18251a7a3..dcd811f74ff 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <?eclipse version="3.4"?>

 <plugin>

-

   <extension

        point="org.eclipse.ui.handlers">

 	<handler

@@ -41,4 +40,11 @@
 		</activeWhen>

 	</handler>

   </extension>

+  <extension

+         point="org.eclipse.emf.validation.constraintParsers">

+      <constraintParser

+            class="org.eclipse.papyrus.uml.service.validation.oclpivot.OCLpivotConstraintParser"

+            lang="OCLpivot">

+      </constraintParser>

+  </extension>

 </plugin>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.service.validation/pom.xml
index 2bd23951122..03d412dd190 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.service.validation</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/StereotypeUtil.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/StereotypeUtil.java
new file mode 100644
index 00000000000..ce1cfe6a7ed
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/StereotypeUtil.java
@@ -0,0 +1,63 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Ansgar Radermacher (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.service.validation;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Stereotype;
+import org.eclipse.uml2.uml.util.UMLUtil;
+
+/**
+ * Provide the possibility to check whether a stereotype application corresponds
+ * to a stereotype provided as string. It takes sub-stereotypes into account.
+ * The objective is to filter the execution of validation rules within the plugin.xml, i.e.
+ * only schedule their execution, if a suitable context object is selected.
+ *
+ * Limitation: constraint context must be a stereotype (passed objects are stereotype applications)
+ */
+public class StereotypeUtil {
+	
+	public static boolean checkStereoApplication(Object stereotypeApplicationObj, String stereoName) {
+		if(!(stereotypeApplicationObj instanceof EObject)) {
+			return false;
+		}
+
+		if(stereotypeApplicationObj instanceof Element) {
+			return false;
+		}
+
+		EObject stereotypeApplication = ((EObject)stereotypeApplicationObj);
+		Stereotype stereotype = UMLUtil.getStereotype(stereotypeApplication);
+		if(stereotype == null) {
+			return false;
+		}
+		return checkStereotype(stereotype, stereoName);
+	}
+	
+	public static boolean checkStereotype(Stereotype stereotype, String stereoName) {
+		if(stereoName.equals(stereotype.getName())) {
+			return true;
+		}
+		for (Class superStereo : stereotype.getSuperClasses()) {
+			if (superStereo instanceof Stereotype) {
+				if (checkStereotype((Stereotype) superStereo, stereoName)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}	
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/oclpivot/AbstractOCLpivotModelConstraint.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/oclpivot/AbstractOCLpivotModelConstraint.java
new file mode 100644
index 00000000000..34ec0e76510
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/oclpivot/AbstractOCLpivotModelConstraint.java
@@ -0,0 +1,193 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   IBM - Initial API and implementation
+ *   Radek Dvorak (Borland) - Bugzilla 165458
+ *   Ansgar Radermacher (CEA) - created variant for evaluation with OCL pivot element
+ *
+ * </copyright>
+ */
+
+package org.eclipse.papyrus.uml.service.validation.oclpivot;
+
+import java.lang.ref.Reference;
+import java.lang.ref.WeakReference;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.common.util.WrappedException;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.validation.IValidationContext;
+import org.eclipse.emf.validation.model.ConstraintStatus;
+import org.eclipse.emf.validation.model.IModelConstraint;
+import org.eclipse.emf.validation.service.IConstraintDescriptor;
+import org.eclipse.ocl.examples.pivot.ExpressionInOCL;
+import org.eclipse.ocl.examples.pivot.NamedElement;
+import org.eclipse.ocl.examples.pivot.OCL;
+import org.eclipse.ocl.examples.pivot.ParserException;
+import org.eclipse.ocl.examples.pivot.Type;
+import org.eclipse.ocl.examples.pivot.helper.OCLHelper;
+import org.eclipse.ocl.examples.pivot.manager.MetaModelManager;
+import org.eclipse.ocl.examples.pivot.utilities.PivotEnvironmentFactory;
+import org.eclipse.uml2.uml.Stereotype;
+import org.eclipse.uml2.uml.util.UMLUtil;
+
+/**
+ * This class is based on the AbstractOCLModelConstraint in org.eclipse.emf.validation.ocl. The main difference is that it enforces
+ * the validation with the pivot OCL variant, see bug 436296 - [Validation] DSML plugin generation is broken
+ *
+ * @link org.eclipse.emf.validation.ocl.AbstractOCLModelConstraint
+ *
+ * @author Ansgar Radermacher
+ */
+public abstract class AbstractOCLpivotModelConstraint implements IModelConstraint {
+
+	private final IConstraintDescriptor descriptor;
+
+	/**
+	 * A separate query is maintained for each EClass of model object that this
+	 * constraint handles. Maintain the values in weak references also, because
+	 * the queries reference the EClasses that are the keys!
+	 */
+	private final java.util.Map<Stereotype, Reference<?>> queries = new java.util.WeakHashMap<Stereotype, Reference<?>>();
+
+	private QueryManager queryManager;
+
+	protected static OCL oclInstance = null;
+
+	/**
+	 * Initializes me with the <code>descriptor</code> which contains my OCL
+	 * body.
+	 * 
+	 * @param descriptor
+	 *            the descriptor, which must contain an OCL expression in its
+	 *            body
+	 */
+	public AbstractOCLpivotModelConstraint(IConstraintDescriptor descriptor) {
+		this.descriptor = descriptor;
+	}
+
+	/**
+	 * Obtains the cached OCL query/constraint that implements me for the
+	 * specified element's metaclass.
+	 * 
+	 * @param target
+	 *            a model element
+	 * @return the corresponding OCL query
+	 */
+	public ExpressionInOCL getConstraintCondition(EObject target) {
+		ExpressionInOCL result = null;
+
+		Stereotype umlStereotype = UMLUtil.getStereotype(target);
+
+		if (umlStereotype == null) {
+			return null;
+		}
+
+		@SuppressWarnings("unchecked")
+		Reference<ExpressionInOCL> reference = (Reference<ExpressionInOCL>) queries.get(umlStereotype);
+		if (reference != null) {
+			result = reference.get();
+		}
+
+		if (result == null) {
+			// lazily initialize the condition.
+			if (oclInstance == null) {
+				OCL.initialize(null);
+				PivotEnvironmentFactory pef = new PivotEnvironmentFactory(null,
+						new MetaModelManager());
+				oclInstance = OCL.newInstance(pef);
+			}
+
+			OCLHelper oclHelper = oclInstance.createOCLHelper();
+
+			try {
+				NamedElement context =
+						oclInstance.getMetaModelManager().getPivotOf(NamedElement.class, umlStereotype);
+
+				oclHelper.setContext((Type) context);
+
+				String expression = getDescriptor().getBody();
+				result = oclHelper.createQuery(expression);
+			} catch (ParserException parserException) {
+				throw new WrappedException(parserException);
+			}
+
+			queries.put(umlStereotype, new WeakReference<ExpressionInOCL>(
+					result));
+		}
+
+		return result;
+	}
+
+	// implements the inherited method
+	public IStatus validate(IValidationContext ctx) {
+		EObject target = ctx.getTarget();
+
+		try {
+			if (getQueryManager().check(target)) {
+				return ctx.createSuccessStatus();
+			} else {
+				// OCL constraints only support the target object as an extraction
+				// variable and result locus, as OCL has no way to provide
+				// additional extractions. Also, there is no way for the OCL
+				// to access the context object
+				return ctx.createFailureStatus(target);
+			}
+
+		} catch (Exception e) {
+			// do not raise an exception, but create a failure status. This is consistent with
+			// the behavior of the "in-profile" OCL pivot validation.
+			String message = String.format("The '%s' constraint is invalid - %s", getDescriptor().getName(), e.getMessage());
+			return new ConstraintStatus(this, target, IStatus.ERROR, -1,
+					message, null);
+		}
+	}
+
+	private QueryManager getQueryManager() {
+		if (queryManager == null) {
+			queryManager = new QueryManager();
+		}
+
+		return queryManager;
+	}
+
+	/*
+	 * (non-Javadoc) Implements the interface method.
+	 */
+	public IConstraintDescriptor getDescriptor() {
+		return descriptor;
+	}
+
+	/**
+	 * An object that knows how to obtain and evaluate the query implementation
+	 * appropriate to the constraint's environment factory, accounting for
+	 * whether it is using the OCL 1.0 or later API.
+	 *
+	 * @author Christian W. Damus (cdamus)
+	 */
+	private final class QueryManager {
+
+		QueryManager() {
+		}
+
+		/**
+		 * Obtains and checks the appropriate parsed constraint for the
+		 * specified target element.
+		 * 
+		 * @param target
+		 *            an element to be validated
+		 * @return whether it passed the constraint
+		 */
+		boolean check(EObject target) {
+			ExpressionInOCL query = getConstraintCondition(target);
+			return (Boolean) oclInstance.evaluate(target, query);
+		}
+	}
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/oclpivot/OCLpivotConstraintParser.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/oclpivot/OCLpivotConstraintParser.java
new file mode 100644
index 00000000000..d56d55c9ffd
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/oclpivot/OCLpivotConstraintParser.java
@@ -0,0 +1,60 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   IBM - Initial API and implementation
+ *   Radek Dvorak (Borland) - Bugzilla 165458
+ *
+ * </copyright>
+ *
+ * $Id: OCLConstraintParser.java,v 1.5 2007/06/06 22:28:11 cdamus Exp $
+ */
+
+package org.eclipse.papyrus.uml.service.validation.oclpivot;
+
+import org.eclipse.emf.validation.model.IModelConstraint;
+import org.eclipse.emf.validation.service.IConstraintDescriptor;
+import org.eclipse.emf.validation.service.IParameterizedConstraintDescriptor;
+import org.eclipse.emf.validation.service.IParameterizedConstraintParser;
+
+/**
+ * Variant of the OCLConstraintParser, it enforces the use of pivot variant of OCL
+ *
+ * 
+ * @link org.eclipse.emf.validation.internal.ocl.OCLConstraintParser
+ * 
+ * @author Ansgar Radermacher
+ */
+public class OCLpivotConstraintParser implements IParameterizedConstraintParser {
+
+	/**
+	 * Initializes me.
+	 */
+	public OCLpivotConstraintParser() {
+		super();
+	}
+
+	// implements the inherited method
+	public IModelConstraint parseConstraint(
+			IParameterizedConstraintDescriptor desc) {
+		return new EcoreOCLConstraint(desc);
+	}
+
+	/**
+	 * A concrete implementation of OCL constraints for the Ecore metamodel.
+	 *
+	 * @author Christian W. Damus (cdamus)
+	 */
+	private static class EcoreOCLConstraint extends AbstractOCLpivotModelConstraint {
+
+		EcoreOCLConstraint(IConstraintDescriptor descriptor) {
+			super(descriptor);
+		}
+	}
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/META-INF/MANIFEST.MF
index 74c9b909605..8107c597810 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.services.decoration;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.decoration;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.apache.commons.lang;bundle-version="2.4.0",

  org.eclipse.emf.ecore;bundle-version="2.8.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.7.0",

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.services.decoration.Activato

diff --git a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/pom.xml
index a651c6a747d..8d712db0929 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.services.decoration</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.templaterepository/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/META-INF/MANIFEST.MF
index afe20b6bd47..51e2340bde1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.templaterepository/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.templaterepository.Activator

diff --git a/plugins/uml/org.eclipse.papyrus.uml.templaterepository/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/pom.xml
index 0844d348096..ceb0897a9df 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.templaterepository/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.templaterepository</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/META-INF/MANIFEST.MF
index bf8c55559da..63b5de791d8 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.editor.perspectiveconfiguration;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1"

+ org.eclipse.papyrus.editor.perspectiveconfiguration;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.ui.perspectiveconfiguration.

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF
index ffebe2b2002..e53fc7c4b6c 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF
@@ -7,17 +7,17 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.105.0",
  org.eclipse.gmf.runtime.common.ui.services;bundle-version="1.7.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",

  org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.7.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0",

  org.eclipse.xtext;bundle-version="2.4.2",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/pom.xml b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/pom.xml
index 0c395a6d449..cf92d9832a3 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/pom.xml
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.properties.xtext</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
index 4059beec11c..a7c8b72f71e 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
@@ -16,43 +16,43 @@ Export-Package: org.eclipse.papyrus.uml.properties.constraints,
  org.eclipse.papyrus.uml.properties.util,

  org.eclipse.papyrus.uml.properties.widgets

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

  org.eclipse.emf.databinding;bundle-version="1.2.0",

  org.eclipse.jface;bundle-version="3.6.1",

  org.eclipse.core.databinding.property;bundle-version="1.3.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.ui;bundle-version="3.6.1",

- org.eclipse.papyrus.uml.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

  org.eclipse.uml2.common.edit;bundle-version="1.6.0",

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

  org.eclipse.gef;bundle-version="3.8.1",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.uml.properties.Activator

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx
index b77682da2c6..b5ecd07ba1e 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx
@@ -1418,7 +1418,7 @@
       <properties xsi:type="constraints:ValueProperty" name="umlClassName" value="Package"/>
     </constraints>
   </views>
-  <views name="SingleElement" sections="//@tabs.2/@sections.1 //@tabs.1/@sections.0 //@tabs.1/@sections.1">
+  <views name="SingleElement" sections="//@tabs.1/@sections.0 //@tabs.1/@sections.1">
     <constraints xsi:type="constraints:SimpleConstraint" name="isSingleElement" overrideable="false">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="constraints:ValueProperty" name="umlClassName" value="Element"/>
@@ -4223,6 +4223,17 @@
       <properties xsi:type="constraints:ValueProperty" name="umlClassName" value="SignalEvent"/>
     </constraints>
   </views>
+  <views name="SingleProfiledElement" sections="//@tabs.2/@sections.1">
+    <constraints xsi:type="constraints:CompositeConstraint">
+      <constraints name="isUMLElement" overrideable="false">
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>
+        <properties xsi:type="constraints:ValueProperty" name="umlClassName" value="Element"/>
+      </constraints>
+      <constraints name="isAttached">
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi#//@constraintTypes.6"/>
+      </constraints>
+    </constraints>
+  </views>
   <dataContexts name="UML" label="UML">
     <elements name="Comment" supertypes="//@dataContexts.0/@elements.1">
       <properties name="body" description="Specifies a string that is the comment."/>
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleActivity.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleActivity.xwt
index fdc59e88620..fd1a869fb25 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleActivity.xwt
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleActivity.xwt
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt">

+	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

@@ -41,7 +42,8 @@
 			property="UML:Behavior:precondition"></ppe:MultiReference>

 		<ppe:MultiReference input="{Binding}"

 			property="UML:Behavior:postcondition"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference>

+		<ppe:MultiReference input="{Binding}"

+			property="UML:Behavior:ownedParameter"></ppe:MultiReference>

 		<ppe:MultiReference input="{Binding}" property="UML:Activity:variable"></ppe:MultiReference>

 	</Composite>

 </Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml
index 3a8b0de25af..96c67395793 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.properties</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/AppliedCommentsObservableList.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/AppliedCommentsObservableList.java
index 917779f746c..920e6b5cd90 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/AppliedCommentsObservableList.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/AppliedCommentsObservableList.java
@@ -10,6 +10,8 @@
  *  Sebastien Poissonnet (CEA LIST) sebastien.poissonnet@cea.fr
  *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 435174
  *  Gabriel Pascual (ALL4TEC)  -  Bug 441511
+ *  Christian W. Damus (CEA) - Bug 441227
+ *  
  *****************************************************************************/
 package org.eclipse.papyrus.uml.properties.databinding;
 
@@ -66,7 +68,9 @@ public class AppliedCommentsObservableList extends PapyrusObservableList {
 					// not...
 					boolean isProxy = false;
 					for (Element annotatedElement : comment.getAnnotatedElements()) {
-						if (annotatedElement.eResource() == null) {
+						// Don't check the annotated element if it's the source, because it may be a new
+						// element being created in a dialog and not yet attached to the model
+						if ((annotatedElement != source) && (annotatedElement.eResource() == null)) {
 							isProxy = true;
 						}
 					}
@@ -117,7 +121,7 @@ public class AppliedCommentsObservableList extends PapyrusObservableList {
 			addAppliedCommentCommand = new CompoundCommand("Add applied comment");
 
 			// Add the comment to source#ownedComment
-			SetRequest setRequest = new SetRequest(source, feature, value);
+			SetRequest setRequest = new SetRequest((TransactionalEditingDomain) editingDomain, source, feature, value);
 			addAppliedCommentCommand.append(getCommandFromRequests(getProvider(), Collections.singletonList(setRequest)));
 
 			// Check if source was already had to comment
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeModelElementFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeModelElementFactory.java
index 6d34ba8822b..0139de745c4 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeModelElementFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeModelElementFactory.java
@@ -9,6 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

  *  Christian W. Damus (CEA) - bug 417409

+ *  Christian W. Damus (CEA) - bug 444092

  *

  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.modelelement;

@@ -19,6 +20,7 @@ import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.uml.properties.Activator;

 import org.eclipse.papyrus.uml.tools.utils.UMLUtil;

 import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.views.properties.modelelement.AbstractEMFModelElementFactory;

 import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;

 import org.eclipse.papyrus.views.properties.modelelement.EMFModelElementFactory;

 import org.eclipse.uml2.uml.Element;

@@ -50,8 +52,9 @@ public class StereotypeModelElementFactory extends EMFModelElementFactory {
 		Element umlElement = UMLUtil.resolveUMLElement(source);

 

 		if (umlElement != null) {

-			Stereotype stereotype = UMLUtil.getAppliedStereotype(umlElement, getQualifiedName(context), false);

-			EObject stereotypeApplication = umlElement.getStereotypeApplication(stereotype);

+			Stereotype stereotype = UMLUtil.getAppliedSuperstereotype(umlElement, getQualifiedName(context));

+			Stereotype actual = (stereotype == null) ? null : UMLUtil.getAppliedSubstereotype(umlElement, stereotype);

+			EObject stereotypeApplication = (actual == null) ? null : umlElement.getStereotypeApplication(actual);

 

 			if (stereotypeApplication == null) {

 				Activator.log.warn("Stereotype " + getQualifiedName(context) + " is not applied on " + umlElement); //$NON-NLS-1$ //$NON-NLS-2$

@@ -65,6 +68,30 @@ public class StereotypeModelElementFactory extends EMFModelElementFactory {
 		return null;

 	}

 

+

+	@Override

+	protected void updateModelElement(EMFModelElement modelElement, Object newSourceElement) {

+		if (!(modelElement instanceof StereotypeModelElement)) {

+			Activator.log.warn(String.format("Not a stereotype element: %s", modelElement)); //$NON-NLS-1$

+		} else {

+			StereotypeModelElement stereotypeElement = (StereotypeModelElement) modelElement;

+			Element umlElement = UMLUtil.resolveUMLElement(newSourceElement);

+

+			if (umlElement == null) {

+				Activator.log.warn(String.format("Missing UML element in stereotype model element: %s", modelElement)); //$NON-NLS-1$

+			} else {

+				Stereotype actual = UMLUtil.getAppliedSubstereotype(umlElement, stereotypeElement.stereotype);

+				EObject stereotypeApplication = (actual == null) ? null : umlElement.getStereotypeApplication(actual);

+

+				if (stereotypeApplication == null) {

+					Activator.log.warn(String.format("Stereotype '%s' is not applied on '%s'", stereotypeElement.stereotype.getQualifiedName(), umlElement)); //$NON-NLS-1$

+				} else {

+					AbstractEMFModelElementFactory.updateEMFModelElement(modelElement, stereotypeApplication);

+				}

+			}

+		}

+	}

+

 	/**

 	 * Returns the DataContextElement's qualified name (Which should correspond

 	 * to the stereotype's qualified name)

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeApplication.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeApplication.java
index e9a6e3d811a..846a80965ee 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeApplication.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeApplication.java
@@ -9,12 +9,14 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

  *  Christian W. Damus (CEA) - bug 417409

+ *  Christian W. Damus (CEA) - bug 441227

  *

  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.widgets;

 

 import org.eclipse.core.databinding.observable.ChangeEvent;

 import org.eclipse.core.databinding.observable.IChangeListener;

+import org.eclipse.core.databinding.observable.IObservable;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;

 import org.eclipse.papyrus.uml.profile.tree.objects.StereotypedElementTreeObject;

@@ -63,11 +65,17 @@ public class StereotypeApplication extends AbstractPropertyEditor {
 		if (element instanceof StereotypeApplicationModelElement) {

 			internalDoBinding();

 

-			input.getObservable(propertyPath).addChangeListener(new IChangeListener() {

+			final IObservable property = input.getObservable(propertyPath);

+			property.addChangeListener(new IChangeListener() {

 				public void handleChange(ChangeEvent event) {

-					// re-do the injection into the stereotype composite because the

-					// underlying model element selection may have been changed

-					internalDoBinding();

+					if ((self == null) || self.isDisposed()) {

+						// Desist

+						property.removeChangeListener(this);

+					} else {

+						// re-do the injection into the stereotype composite because the

+						// underlying model element selection may have been changed

+						internalDoBinding();

+					}

 				}

 			});

 		}

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeDisplay.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeDisplay.java
index 9c078235d84..eeab430932e 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeDisplay.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeDisplay.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

+ * Copyright (c) 2011, 2014 CEA LIST and others.

  *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -8,6 +8,8 @@
  *

  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 444212

+ *  

  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.widgets;

 

@@ -20,6 +22,9 @@ import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
 import org.eclipse.papyrus.uml.profile.tree.objects.StereotypedElementTreeObject;

 import org.eclipse.papyrus.uml.properties.modelelement.UMLNotationModelElement;

 import org.eclipse.papyrus.uml.properties.profile.ui.compositeforview.AppearanceForAppliedStereotypeComposite;

+import org.eclipse.papyrus.views.properties.modelelement.DataSource;

+import org.eclipse.papyrus.views.properties.modelelement.DataSourceChangedEvent;

+import org.eclipse.papyrus.views.properties.modelelement.IDataSourceListener;

 import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

 import org.eclipse.papyrus.views.properties.widgets.AbstractPropertyEditor;

 import org.eclipse.swt.widgets.Composite;

@@ -30,6 +35,8 @@ public class StereotypeDisplay extends AbstractPropertyEditor {
 

 	private AppearanceForAppliedStereotypeComposite composite;

 

+	private IDataSourceListener dataSourceListener;

+

 	public StereotypeDisplay(Composite parent, int style) {

 		composite = new AppearanceForAppliedStereotypeComposite(parent);

 		composite.createContent(parent, AbstractEditor.factory);

@@ -53,4 +60,39 @@ public class StereotypeDisplay extends AbstractPropertyEditor {
 			composite.refresh();

 		}

 	}

+

+	@Override

+	protected void unhookDataSourceListener(DataSource oldInput) {

+		oldInput.removeDataSourceListener(getDataSourceListener());

+		super.unhookDataSourceListener(oldInput);

+	}

+

+	@Override

+	protected void hookDataSourceListener(DataSource newInput) {

+		super.hookDataSourceListener(newInput);

+		newInput.addDataSourceListener(getDataSourceListener());

+	}

+

+	private IDataSourceListener getDataSourceListener() {

+		if (dataSourceListener == null) {

+			dataSourceListener = new IDataSourceListener() {

+

+				public void dataSourceChanged(DataSourceChangedEvent event) {

+					// The data source's selection changed. Re-display our composite

+					if ((composite != null) && !composite.isDisposed()) {

+						composite.getDisplay().asyncExec(new Runnable() {

+

+							public void run() {

+								if (!composite.isDisposed()) {

+									doBinding();

+								}

+							}

+						});

+					}

+				}

+			};

+		}

+

+		return dataSourceListener;

+	}

 }

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/META-INF/MANIFEST.MF
index f5cd04f600e..4ad858b0344 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext;bundle-version="1.0.1";visibility:=reexport,

+Require-Bundle: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.xtext.ui,

  org.eclipse.ui.editors;bundle-version="3.5.0",

  org.eclipse.ui.ide;bundle-version="3.5.0",

@@ -14,22 +14,22 @@ Require-Bundle: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext;bundle-v
  org.eclipse.ui,

  org.eclipse.xtext.builder,

  org.antlr.runtime,

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="3.1.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.textedit.common.xtext.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.textedit.common.xtext.ui;bundle-version="1.1.0",

  org.apache.log4j;bundle-version="1.2.15",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.textedit.collaborationuse.xt

  ext.ui.internal.UmlCollaborationUseActivator

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/pom.xml
index 28d95b045a7..79be6e3942b 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF
index 9a24cfc9079..a271de70968 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF
@@ -24,13 +24,13 @@ Require-Bundle: org.eclipse.xtext,
  org.antlr.runtime,

  org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

  org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="1.1.0";visibility:=reexport,

  org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.alf.common;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/pom.xml
index 66e6b2eac8b..d40a314dd51 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.collaborationuse.xtext</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/META-INF/MANIFEST.MF
index bd6e86237dd..f76e26e4d5e 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="1.0.1";visibility:=reexport,

+Require-Bundle: org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.xtext.ui,

  org.eclipse.ui.editors;bundle-version="3.5.0",

  org.eclipse.ui.ide;bundle-version="3.5.0",

@@ -19,14 +19,14 @@ Require-Bundle: org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="1.
  org.eclipse.ui,

  org.eclipse.xtext.builder,

  org.antlr.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.apache.log4j;bundle-version="1.2.15",

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.textedit.common.xtext.ui.int

  ernal.UmlCommonActivator

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/pom.xml
index 57e313fbd9d..f59e89c12df 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.common.xtext.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF
index d9144eb889f..e7133e17d5d 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF
@@ -15,11 +15,11 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.jface,

  org.eclipse.ui.ide,

  org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.core.runtime;bundle-version="3.8.0",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.alf.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.textedit.common.xtext,

  org.eclipse.papyrus.uml.textedit.common.xtext.formatting,

  org.eclipse.papyrus.uml.textedit.common.xtext.generator,

@@ -34,7 +34,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.common.xtext,
  org.eclipse.papyrus.uml.textedit.common.xtext.validation

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/pom.xml
index 1f9e5e371f5..c72e0406d06 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.common.xtext</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF
index d84b5d30161..817ee044e93 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext;bundle-version="1.1.0",

  org.eclipse.xtext.ui,

  org.eclipse.ui.editors;bundle-version="3.5.0",

  org.eclipse.ui.ide;bundle-version="3.5.0",

@@ -14,19 +14,19 @@ Require-Bundle: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext;
  org.eclipse.ui,

  org.eclipse.xtext.builder,

  org.antlr.runtime,

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",

  org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.core.expressions;bundle-version="3.4.200",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.textedit.connectionpointrefe

  rence.xtext.ui.internal.UMLConnectionPointReferenceActivator

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/pom.xml
index c70466408ae..aa6729aa419 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF
index 0863e555ab6..2bda20e97e1 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.uml2.uml;bundle-version="3.1.0",

  org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

  org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.alf.common;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext,

  org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.formatting,

  org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.generator,

@@ -28,7 +28,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext,
  org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.validation

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/pom.xml
index 16e5e8e3465..3481fe839fc 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF
index b679479ac17..0e70ec8973b 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="3.2.0",

  org.eclipse.ocl.examples.xtext.essentialocl.ui;bundle-version="3.1.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.ocl.examples.xtext.console;bundle-version="3.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",

  org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.validation;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.validation;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.validation;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.validation;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.textedit.constraintwithessen

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/pom.xml
index 93105901259..52a893ee462 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/META-INF/MANIFEST.MF
index 36e40c4197c..72c289d04d7 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0

 Export-Package: org.eclipse.papyrus.uml.textedit.javaconstraint

 Require-Bundle: org.eclipse.ui,

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

  org.eclipse.jface.text,

  org.eclipse.emf.transaction,

  org.eclipse.uml2.uml,

  org.eclipse.emf.transaction,

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.textedit.javaconstraint.Acti

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/pom.xml
index 018c931b0d1..f04423f8641 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.javaconstraint</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF
index e703389d000..516388a21e7 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.uml.textedit.message.xtext;bundle-version="1.0.1";visibility:=reexport,

+Require-Bundle: org.eclipse.papyrus.uml.textedit.message.xtext;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.xtext.ui,

  org.eclipse.ui.editors;bundle-version="3.5.0",

  org.eclipse.ui.ide;bundle-version="3.5.0",

@@ -14,20 +14,20 @@ Require-Bundle: org.eclipse.papyrus.uml.textedit.message.xtext;bundle-version="1
  org.eclipse.ui,

  org.eclipse.xtext.builder,

  org.antlr.runtime,

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

  org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

  org.eclipse.uml2.uml;bundle-version="3.1.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

  org.eclipse.core.expressions;bundle-version="3.4.200",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.apache.log4j;bundle-version="1.2.15",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.textedit.message.xtext.ui.in

  ternal.UmlMessageActivator

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/pom.xml
index 480a3704d7d..e30fc0c49a9 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.message.xtext.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF
index 9d0209af9ca..4770594e198 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF
@@ -24,12 +24,12 @@ Require-Bundle: org.eclipse.xtext,
  org.antlr.runtime,

  org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

  org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.alf.common;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/pom.xml
index 4aee9e33989..a64a56aa560 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.message.xtext</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/META-INF/MANIFEST.MF
index 61a19f04110..25e069b8f4a 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.uml.textedit.parameter.xtext;bundle-version="1.0.1";visibility:=reexport,

+Require-Bundle: org.eclipse.papyrus.uml.textedit.parameter.xtext;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.xtext.ui,

  org.eclipse.ui.editors;bundle-version="3.5.0",

  org.eclipse.ui.ide;bundle-version="3.5.0",

@@ -14,20 +14,20 @@ Require-Bundle: org.eclipse.papyrus.uml.textedit.parameter.xtext;bundle-version=
  org.eclipse.ui,

  org.eclipse.xtext.builder,

  org.antlr.runtime,

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.textedit.common.xtext.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.textedit.common.xtext.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.apache.log4j;bundle-version="1.2.15",

  org.eclipse.uml2.uml,

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.

  internal.UmlParameterActivator

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/pom.xml
index d25a1ee5538..430b478947e 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.parameter.xtext.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF
index 4b4d23ae43a..4a4b0542732 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF
@@ -24,12 +24,12 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.emf.ecore,

  org.eclipse.emf.common,

  org.antlr.runtime,

- org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="1.1.0",

  org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.alf.common;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/pom.xml
index 3db5114e050..ad47df74e42 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.parameter.xtext</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF
index 1a31f460fe5..99368f065e8 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF
@@ -19,20 +19,20 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.editors,

  org.eclipse.xtext.builder,

  org.antlr.runtime,

- org.eclipse.papyrus.uml.textedit.port.xtext;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.textedit.port.xtext;bundle-version="1.1.0",

  org.eclipse.emf.transaction,

  org.eclipse.gmf.runtime.common.core,

  org.eclipse.gmf.runtime.diagram.ui,

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.textedit.port.xtext.ui.inter

  nal.UmlPortActivator

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/pom.xml
index 961622f47cf..af8aaa73ac6 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.port.xtext.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/META-INF/MANIFEST.MF
index 290bbd81065..0880a281c8c 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/META-INF/MANIFEST.MF
@@ -25,11 +25,11 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.emf.common,

  org.antlr.runtime,

  org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.alf.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/pom.xml
index 70dd8d4fdaf..1818e5c2f04 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.port.xtext</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF
index 5fdb324f7ee..eb4499aad4e 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.uml.textedit.property.xtext;bundle-version="1.0.1";visibility:=reexport,

+Require-Bundle: org.eclipse.papyrus.uml.textedit.property.xtext;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.xtext.ui,

  org.eclipse.ui.editors;bundle-version="3.5.0",

  org.eclipse.ui.ide;bundle-version="3.5.0",

@@ -20,19 +20,19 @@ Require-Bundle: org.eclipse.papyrus.uml.textedit.property.xtext;bundle-version="
  org.eclipse.ui,

  org.antlr.runtime,

  org.eclipse.xtext.builder,

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",

  org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.core.expressions;bundle-version="3.4.200",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

  org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.textedit.property.xtext.ui.i

  nternal.UmlPropertyActivator

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/pom.xml
index a0ec3012bf1..1be520c33db 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.property.xtext.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF
index 89716d0d320..aab8b2c608f 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF
@@ -13,9 +13,9 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.uml2.uml;bundle-version="3.1.0",

  org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

  org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.alf.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.textedit.property.xtext,

  org.eclipse.papyrus.uml.textedit.property.xtext.formatting,

  org.eclipse.papyrus.uml.textedit.property.xtext.generator,

@@ -30,7 +30,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.property.xtext,
  org.eclipse.papyrus.uml.textedit.property.xtext.validation

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/pom.xml
index 61883b59bbe..16ff74c0b71 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.property.xtext</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF
index b79843baae7..8eb1b2a96f9 100755
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.uml.textedit.state.xtext;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.uml.textedit.state.xtext;bundle-version="1.1.0",

  org.eclipse.xtext.ui,

  org.eclipse.ui.editors;bundle-version="3.5.0",

  org.eclipse.ui.ide;bundle-version="3.5.0",

@@ -16,16 +16,16 @@ Require-Bundle: org.eclipse.papyrus.uml.textedit.state.xtext;bundle-version="1.0
  org.eclipse.xtext.builder,

  org.eclipse.uml2.uml;bundle-version="3.1.0",

  org.eclipse.core.expressions;bundle-version="3.4.200",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.textedit.state.xtext.ui.inte

  rnal.UmlStateActivator

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/pom.xml
index edfcc547364..6618b6232be 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.state.xtext.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF
index 11d226d66c0..dc31e678f49 100755
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.uml2.uml;bundle-version="3.1.0",

  org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

  org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.alf.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.textedit.state.xtext,

  org.eclipse.papyrus.uml.textedit.state.xtext.formatting,

  org.eclipse.papyrus.uml.textedit.state.xtext.generator,

@@ -29,7 +29,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.state.xtext,
  org.eclipse.papyrus.uml.textedit.state.xtext.validation

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/pom.xml
index 1bacdc2bd79..e51f2473d31 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.state.xtext</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF
index e8fb6f87b55..214a0649004 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext;bundle-version="1.1.0",

  org.eclipse.xtext.ui,

  org.eclipse.ui.editors;bundle-version="3.5.0",

  org.eclipse.ui.ide;bundle-version="3.5.0",

@@ -20,21 +20,21 @@ Require-Bundle: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext;bundle
  org.eclipse.ui,

  org.eclipse.xtext.builder,

  org.antlr.runtime,

- org.eclipse.papyrus.uml.alf.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.alf.ui;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.uml.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.commands;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.core.expressions;bundle-version="3.4.200",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.alf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.alf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.textedit.stereotypeproperty.

  xtext.ui.internal.AppliedStereotypePropertyActivator

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/pom.xml
index aa05e16237b..4b5e0e7980d 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF
index 25c1ebca0aa..49f8a61e841 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF
@@ -27,17 +27,17 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.1.0";visibility:=reexport,
  org.eclipse.uml2.uml;bundle-version="3.1.1",

  org.eclipse.jface,

  org.eclipse.ui.ide,

- org.eclipse.papyrus.uml.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.alf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.alf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/pom.xml
index 55d480533d1..471ad8fd08f 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/META-INF/MANIFEST.MF
index 05eacc11682..083b996552a 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.uml.textedit.transition.xtext;bundle-version="1.0.1";visibility:=reexport,

+Require-Bundle: org.eclipse.papyrus.uml.textedit.transition.xtext;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.xtext.ui,

  org.eclipse.ui.editors;bundle-version="3.5.0",

  org.eclipse.ui.ide;bundle-version="3.5.0",

@@ -9,14 +9,14 @@ Require-Bundle: org.eclipse.papyrus.uml.textedit.transition.xtext;bundle-version
  org.antlr.runtime,

  org.eclipse.uml2.uml;bundle-version="3.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.core.expressions;bundle-version="3.4.200",

  org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.textedit.transition.xtext.ui,

  org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contentassist,

  org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contentassist.antlr,

@@ -29,7 +29,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.transition.xtext.ui,
  org.eclipse.papyrus.uml.textedit.transition.xtext.ui.quickfix

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.textedit.transition.xtext.ui

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/pom.xml
index f4974a4a556..8780eb7bcec 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.transition.xtext.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF
index 8364cccc7c7..9b8df32e616 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.uml2.uml;bundle-version="3.1.0",

  org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

  org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.alf.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.textedit.transition.xtext,

  org.eclipse.papyrus.uml.textedit.transition.xtext.formatting,

  org.eclipse.papyrus.uml.textedit.transition.xtext.parser.antlr,

@@ -28,7 +28,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.transition.xtext,
  org.eclipse.papyrus.uml.textedit.transition.xtext.validation

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/pom.xml
index 473ebfded40..11412a7f8b9 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.transition.xtext</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/META-INF/MANIFEST.MF
index f62a7ceea69..0854fe9ff27 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/META-INF/MANIFEST.MF
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport,

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.extendedtypes.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.extendedtypes.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

  org.eclipse.swt,

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.tools.extendedtypes,

  org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration,

  org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl,

@@ -20,7 +20,7 @@ Export-Package: org.eclipse.papyrus.uml.tools.extendedtypes,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.tools.extendedtypes.Activato

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/pom.xml b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/pom.xml
index 3572c5d419d..fc5d717a3a7 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/pom.xml
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.tools.extendedtypes</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF
index 8c5f6545cb1..77f15bdfb2f 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF
@@ -4,17 +4,17 @@ Require-Bundle: org.eclipse.uml2.uml,
  org.eclipse.jface;bundle-version="3.4.1",

  org.eclipse.emf.transaction;bundle-version="1.2.1",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.ui.workbench;bundle-version="3.105.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0"

 Bundle-Vendor: %pluginProvider

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.tools.utils.Activator

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/pom.xml b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/pom.xml
index 374d0ba2e20..700ca202204 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/pom.xml
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.tools.utils</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ProfileUtil.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ProfileUtil.java
index 4be402c5a61..9c4502715e5 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ProfileUtil.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ProfileUtil.java
@@ -56,7 +56,7 @@ public class ProfileUtil {
 	 */

 	public static boolean isDirty(Package _package, Profile _profile) {

 		boolean isDirty = false;

-		if (_profile == null || _profile.eResource() == null) {

+		if (_profile == null || _profile.eResource() == null || _package.eResource() == null) {

 			return false;

 		}

 

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/UMLUtil.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/UMLUtil.java
index 52d67f78b9a..8179e5882e3 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/UMLUtil.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/UMLUtil.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

+ * 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

@@ -8,6 +8,8 @@
  *

  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 444092

+ *  

  *****************************************************************************/

 package org.eclipse.papyrus.uml.tools.utils;

 

@@ -102,9 +104,9 @@ public class UMLUtil {
 	}

 

 	/**

-	 * Search the given stereotype (By name) on the given UML Element.

+	 * Search the given stereotype (by name) on the given UML Element.

 	 * If the search is not strict, the name may be the qualified name of a

-	 * sub-stereotype of an applied stereotype

+	 * super-stereotype of some applied stereotype

 	 *

 	 * @param umlElement

 	 *            The UML Element on which the stereotype is applied

@@ -143,6 +145,108 @@ public class UMLUtil {
 	}

 

 	/**

+	 * Obtains the possibly implicitly applied (by virtue of some sub-stereotype of it being applied) stereotype

+	 * of the specified name on a UML element.

+	 *

+	 * @param umlElement

+	 *            The UML Element on which the stereotype is (possibly pseudo-) applied

+	 * @param stereotypeName

+	 *            The qualified name of the stereotype

+	 * @return

+	 *         The stereotype of the given name that either is applied or has some substereotype that is applied to the element

+	 */

+	public static Stereotype getAppliedSuperstereotype(Element umlElement, String stereotypeName) {

+		if (umlElement == null) {

+			throw new IllegalArgumentException("umlElement"); //$NON-NLS-1$

+		}

+		if (stereotypeName == null) {

+			throw new IllegalArgumentException("stereotypeName"); //$NON-NLS-1$

+		}

+

+		// Simplest case

+		Stereotype result = umlElement.getAppliedStereotype(stereotypeName);

+		if (result == null) {

+			for (Stereotype sub : findSubstereotypes(umlElement, stereotypeName)) {

+				if (umlElement.isStereotypeApplied(sub)) {

+					result = getSuperstereotype(sub, stereotypeName);

+					break;

+				}

+			}

+		}

+

+		return result;

+	}

+

+	/**

+	 * Search the given stereotype (by name) that is applicable to the given UML Element.

+	 * If the search is not strict, the name may be the qualified name of a

+	 * sub-stereotype of an applied stereotype

+	 *

+	 * @param umlElement

+	 *            The UML Element on which the stereotype could be applied. Must not be {@code null}

+	 * @param stereotypeName

+	 *            The qualified name of the stereotype. Must not be {@code null}

+	 * @param strict

+	 *            If set to true, only a stereotype matching the exact qualified name

+	 *            will be returned. Otherwise, any subtype of the given stereotype may be

+	 *            returned. Note that if more than one stereotype is a subtype of the

+	 *            given stereotype, the first matching stereotype is returned.

+	 * @return

+	 *         The first matching applicable stereotype, or null if none was found

+	 */

+	public static Stereotype getApplicableStereotype(Element umlElement, String stereotypeName, boolean strict) {

+		if (umlElement == null) {

+			throw new IllegalArgumentException("umlElement"); //$NON-NLS-1$

+		}

+		if (stereotypeName == null) {

+			throw new IllegalArgumentException("stereotypeName"); //$NON-NLS-1$

+		}

+

+		Stereotype result = umlElement.getApplicableStereotype(stereotypeName);

+		if ((result == null) && !strict) {

+			List<Stereotype> subStereotypes = findSubstereotypes(umlElement, stereotypeName);

+

+			for (Stereotype subStereotype : subStereotypes) {

+				if (umlElement.isStereotypeApplicable(subStereotype)) {

+					result = subStereotype;

+					break;

+				}

+			}

+		}

+

+		return result;

+	}

+

+	/**

+	 * Gets the first stereotype conforming to the given {@code stereotype} that is applied to the specified UML element.

+	 * 

+	 * @param umlElement

+	 *            an UML element. Must not be {@code null}

+	 * @param stereotype

+	 *            a stereotype that may or may not be applied to the element. Must not be {@code null}

+	 * 

+	 * @return the {@code stereotype} if it is applied to the element, or some subtype of it that is applied,

+	 *         if any sub-type of the {@code stereotype} is applied to the element

+	 */

+	public static Stereotype getAppliedSubstereotype(Element umlElement, Stereotype stereotype) {

+		if (umlElement == null) {

+			throw new IllegalArgumentException("umlElement"); //$NON-NLS-1$

+		}

+		if (stereotype == null) {

+			throw new IllegalArgumentException("stereotype"); //$NON-NLS-1$

+		}

+

+		Stereotype result = null;

+		if (umlElement.isStereotypeApplied(stereotype)) {

+			result = stereotype;

+		} else {

+			result = getAppliedStereotype(umlElement, stereotype.getQualifiedName(), false);

+		}

+

+		return result;

+	}

+

+	/**

 	 * Finds the Stereotype matching the given name.

 	 * The search is done in the context of the given UML Element

 	 * (i.e. the Profiles applied on the Element's nearest package)

@@ -210,6 +314,23 @@ public class UMLUtil {
 		return new LinkedList<Stereotype>(stereotypes);

 	}

 

+	private static Stereotype getSuperstereotype(Stereotype substereotype, String qualifiedName) {

+		Stereotype result = null;

+

+		if (qualifiedName.equals(substereotype.getQualifiedName())) {

+			result = substereotype;

+		} else {

+			for (Stereotype next : getAllSuperStereotypes(substereotype)) {

+				if (qualifiedName.equals(next.getQualifiedName())) {

+					result = next;

+					break;

+				}

+			}

+		}

+

+		return result;

+	}

+

 	/**

 	 * Returns a collection of all super stereotypes of the given stereotype

 	 * (Including itself)

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
index 3c77fe0785b..59520fad531 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
@@ -14,31 +14,31 @@ Export-Package: org.eclipse.papyrus.uml.tools,
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.uml2.uml;bundle-version="4.1.0";visibility:=reexport,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.core.databinding;bundle-version="1.4.1",

  org.eclipse.emf.databinding;bundle-version="1.2.0",

  org.eclipse.core.databinding.property;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.uml2.common.edit;bundle-version="1.6.0",

  org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.services.validation;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.validation;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.core.expressions;bundle-version="3.4.0",

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

  org.eclipse.uml2.uml.validation;bundle-version="5.0.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: UML Tools

 Bundle-Activator: org.eclipse.papyrus.uml.tools.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/pom.xml b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/pom.xml
index 26ab471418d..303601764f9 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/pom.xml
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.tools</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/adapters/PortTypeAdapter.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/adapters/PortTypeAdapter.java
index 719f3f7a827..a132acb2e20 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/adapters/PortTypeAdapter.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/adapters/PortTypeAdapter.java
@@ -97,9 +97,6 @@ public class PortTypeAdapter extends AdapterImpl {
 				break;
 			}
 		}
-
-
-
 	}
 
 	/**
@@ -110,9 +107,11 @@ public class PortTypeAdapter extends AdapterImpl {
 	 *
 	 */
 	private void detachAdapter(Type type) {
+		if (type == null) {
+			return;
+		}
 		EObject source = determineSource(type);
 		source.eAdapters().remove(adapter);
-
 	}
 
 	/**
@@ -123,7 +122,6 @@ public class PortTypeAdapter extends AdapterImpl {
 	 */
 	private void attachAdapter(Type oldType, Type newType) {
 
-
 		EObject newSource = determineSource(newType);
 		if (newSource != null) {
 
@@ -136,7 +134,6 @@ public class PortTypeAdapter extends AdapterImpl {
 				}
 			}
 
-
 			// Attach adapter for new type
 			if (adapter == null || !newSource.eAdapters().contains(adapter)) {
 
@@ -150,17 +147,10 @@ public class PortTypeAdapter extends AdapterImpl {
 						} else if (Notification.REMOVE == notification.getEventType()) {
 							port.eNotify(new ENotificationImpl((InternalEObject) port, notification.getEventType(), derivedFeature, notification.getOldValue(), notification.getNewValue()));
 						}
-
 					};
-
 				};
-
 			}
 		}
-
-
-
-
 	}
 
 	/**
@@ -200,7 +190,5 @@ public class PortTypeAdapter extends AdapterImpl {
 
 		// Notify observers
 		port.eNotify(new ENotificationImpl((InternalEObject) port, Notification.SET, derivedFeature, null, port.eGet(derivedFeature), true));
-
-
 	}
 }
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF
index e3c9437d8d4..b3dcd04bf7d 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.uml.xtext.integration.core

 Require-Bundle: org.eclipse.xtext;bundle-version="2.4.2"

 Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: XText integration Core

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.core

diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/pom.xml b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/pom.xml
index 9cfc43c25fc..a7b5cb3d709 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/pom.xml
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.xtext.integration.core</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/META-INF/MANIFEST.MF b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/META-INF/MANIFEST.MF
index f14f0b3ad98..bc56e6071ad 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/META-INF/MANIFEST.MF
@@ -7,18 +7,18 @@ Require-Bundle: org.eclipse.gef;bundle-version="3.9.0",
  org.eclipse.xtext;bundle-version="2.4.2",

  org.eclipse.xtext.ui;bundle-version="2.4.2",

  org.eclipse.ui.ide;bundle-version="3.9.0",

- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.validation;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.validation;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: GMF Xtext Integration

 Bundle-Activator: org.eclipse.papyrus.uml.xtext.integration.ui.Activat

  or

diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/pom.xml b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/pom.xml
index 59c680c34a7..793d58c5f42 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/pom.xml
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.xtext.integration.ui</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/DirectEditManagerEx.java b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/DirectEditManagerEx.java
index 00e0c9ff8c0..67a8b5d86bc 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/DirectEditManagerEx.java
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/DirectEditManagerEx.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2010 IBM Corporation, CEA LIST and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation of DirectEditManager
+ *     CEA LIST - Initial API and implementation of DirectEditManagerEx
+ *******************************************************************************/
+
 package org.eclipse.papyrus.uml.xtext.integration;
 
 import java.lang.reflect.Constructor;
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextDirectEditManager.java b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextDirectEditManager.java
index 9ffdb930299..681569d9ac4 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextDirectEditManager.java
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextDirectEditManager.java
@@ -1,796 +1,803 @@
-/******************************************************************************

- * Copyright (c) 2002, 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    IBM Corporation - initial API and implementation

- *    Dmitry Stadnik (Borland) - contribution for bugzilla 135694

- ****************************************************************************/

-

-package org.eclipse.papyrus.uml.xtext.integration;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.draw2d.AncestorListener;

-import org.eclipse.draw2d.CompoundBorder;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.MarginBorder;

-import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.TextUtilities;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Insets;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gef.editparts.ZoomManager;

-import org.eclipse.gef.tools.CellEditorLocator;

-import org.eclipse.gmf.runtime.common.core.util.Log;

-import org.eclipse.gmf.runtime.common.core.util.Trace;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;

-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;

-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;

-import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;

-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;

-import org.eclipse.gmf.runtime.gef.ui.internal.parts.TextCellEditorEx;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.resource.DeviceResourceException;

-import org.eclipse.jface.resource.FontDescriptor;

-import org.eclipse.jface.resource.JFaceResources;

-import org.eclipse.jface.resource.ResourceManager;

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.uml.xtext.integration.core.ContextElementAdapter.IContextElementProvider;

-import org.eclipse.papyrus.uml.xtext.integration.core.IXtextFakeContextResourcesProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.StyledText;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.Font;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-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.Shell;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.actions.ActionFactory;

-import org.eclipse.ui.part.CellEditorActionHandler;

-

-import com.google.inject.Injector;

-

-/**

- * Full copy of the TextDirectEditManager for a StyledText

- *

- */

-@SuppressWarnings("restriction")

-public class XtextDirectEditManager extends DirectEditManagerEx {

-

-	/**

-	 * content assist background color

-	 */

-	private Color proposalPopupBackgroundColor = null;

-

-	/**

-	 * content assist foreground color

-	 */

-	private Color proposalPopupForegroundColor = null;

-

-	private boolean committed = false;

-

-	/**

-	 * flag used to avoid unhooking listeners twice if the UI thread is blocked

-	 */

-	private boolean listenersAttached = true;

-

-	/** String buffer to hold initial characters * */

-	private StringBuffer initialString = new StringBuffer();

-

-	/**

-	 * Cache the font descriptor when a font is created so that it can be

-	 * disposed later.

-	 */

-	private List<FontDescriptor> cachedFontDescriptors = new ArrayList<FontDescriptor>();

-

-	private IActionBars actionBars;

-

-	private CellEditorActionHandler actionHandler;

-

-	private IAction copy, cut, paste, undo, redo, find, selectAll, delete;

-

-	private Font zoomLevelFont = null;

-

-	/**

-	 * store used parser to enable activation, if required

-	 * */

-	protected IParser parser;

-

-	/**

-	 * The superclass only relocates the cell editor when the location of the

-	 * editpart's figure moves, but we need to also relocate the cell editor

-	 * when the text figure's location changes.

-	 */

-	private AncestorListener textFigureListener;

-

-	/**

-	 * Cache locally so we can check if the user specified an editorType.

-	 */

-	private Class<?> editorType;

-

-	private final Injector injector;

-	private final int style;

-

-	private IXtextFakeContextResourcesProvider fakeProvider;

-

-	private static final int LABEL_MIN_WIDTH = 75;

-

-	private IContextElementProvider contextProvider;

-

-	/**

-	 * constructor

-	 *

-	 * @param source

-	 *            <code>GraphicalEditPart</code> to support direct edit of. The

-	 *            figure of the <code>source</code> edit part must be of type <code>WrapLabel</code>.

-	 */

-	public XtextDirectEditManager(ITextAwareEditPart source, Injector injector,

-			int style) {

-		this(source, null, getTextCellEditorLocator(source), injector, style);

-	}

-

-	public XtextDirectEditManager(ITextAwareEditPart source, Injector injector,

-			int style, IXtextFakeContextResourcesProvider provider) {

-		this(source, null, getTextCellEditorLocator(source), injector, style);

-		this.fakeProvider = provider;

-	}

-

-	public XtextDirectEditManager(ITextAwareEditPart source, Injector injector,

-			int style, DefaultXtextDirectEditorConfiguration configuration) {

-		this(source, null, getTextCellEditorLocator(source), injector, style);

-		this.contextProvider = configuration.getContextProvider();

-		this.parser = configuration.createParser(((IGraphicalEditPart) source).resolveSemanticElement());

-		installCustomParser();

-	}

-

-	public XtextDirectEditManager(ITextAwareEditPart source, Injector injector,

-			int style, IContextElementProvider provider) {

-		this(source, null, getTextCellEditorLocator(source), injector, style);

-		this.contextProvider = provider;

-	}

-

-	/**

-	 * @param source

-	 * @param editorType

-	 * @param locator

-	 */

-	public XtextDirectEditManager(GraphicalEditPart source,

-			Class<?> editorType, CellEditorLocator locator, Injector injector,

-			int style) {

-		super(source, editorType, locator);

-		this.editorType = editorType;

-		this.injector = injector;

-		this.style = style;

-	}

-

-	/**

-	 * @param source

-	 *            the <code>ITextAwareEditPart</code> to determine the cell

-	 *            editor for

-	 * @return the <code>CellEditorLocator</code> that is appropriate for the

-	 *         source <code>EditPart</code>

-	 */

-	public static CellEditorLocator getTextCellEditorLocator(

-			final ITextAwareEditPart source) {

-

-		final ILabelDelegate label = (ILabelDelegate) source

-				.getAdapter(ILabelDelegate.class);

-		if (label != null) {

-			return new CellEditorLocator() {

-

-				public void relocate(CellEditor celleditor) {

-					StyledText text = (StyledText) celleditor.getControl();

-

-					Rectangle rect = label.getTextBounds().getCopy();

-					if (label.getText().length() <= 0) {

-						// if there is no text, let's assume a default size

-						// of one character because it looks silly when the cell

-						// editor is tiny.

-						rect.setSize(TextUtilities.INSTANCE.getTextExtents("a", text.getFont())); //$NON-NLS-1$

-

-						if (label.isTextWrapOn()) {

-							// adjust the location of the cell editor based on

-							// text

-							// justification (i.e. where the cursor will be

-							if (label.getTextJustification() == PositionConstants.RIGHT) {

-								rect.translate(-rect.width, 0);

-							} else if (label.getTextJustification() == PositionConstants.CENTER) {

-								rect.translate(-rect.width / 2, 0);

-							}

-						}

-					}

-

-					if (!text.getFont().isDisposed()) {

-						// Font may be disposed if the locator is called while

-						// this manager is being brought down in which case the

-						// calls below that use the font will result in an

-						// exception.

-						if (label.isTextWrapOn()) {

-							// When zoomed in, the height of this rectangle is

-							// not

-							// sufficient because the text is shifted downwards

-							// a

-							// little bit. Add some to the height to compensate

-							// for

-							// this. I'm not sure why this is happening, but I

-							// can

-							// see the text shifting down even in a label on a

-							// GEF

-							// logic diagram when zoomed into 400%.

-							int charHeight = org.eclipse.draw2d.FigureUtilities.getFontMetrics(

-									text.getFont()).getHeight();

-							rect.resize(0, charHeight / 2);

-						} else {

-

-							rect.setSize(new Dimension(text.computeSize(

-									SWT.DEFAULT, SWT.DEFAULT)));

-

-							// If SWT.WRAP is not passed in as a style of the

-							// TextCellEditor, then for some reason the first

-							// character disappears upon entering the second

-							// character. This should be investigated and an

-							// SWT bug logged.

-							int avr = org.eclipse.draw2d.FigureUtilities.getFontMetrics(

-									text.getFont()).getAverageCharWidth();

-							rect.setSize(new Dimension(text.computeSize(

-									SWT.DEFAULT, SWT.DEFAULT)).expand(avr * 2,

-									0));

-						}

-					}

-

-					org.eclipse.swt.graphics.Rectangle newRect = text

-							.computeTrim(rect.x, rect.y, rect.width,

-									rect.height);

-					if (!newRect.equals(text.getBounds())) {

-						text.setBounds(newRect.x, newRect.y, newRect.width,

-								newRect.height);

-					}

-				}

-			};

-		}

-

-		// return a default figure locator

-		return new CellEditorLocator() {

-			public void relocate(CellEditor celleditor) {

-				StyledText text = (StyledText) celleditor.getControl();

-				Rectangle rect = source.getFigure().getBounds().getCopy();

-				// Added min width because it looks silly if the label has a

-				// width of 0

-				rect.width = Math.max(rect.width, LABEL_MIN_WIDTH);

-				if (!text.isDisposed() && text.getFont() != null && !text.getFont().isDisposed()) {

-					Dimension fontMetrics = TextUtilities.INSTANCE.getTextExtents("a", text.getFont()).getCopy();

-					source.getFigure().translateToRelative(fontMetrics);

-					rect.height = Math.max(rect.height, fontMetrics.height);

-				}

-				source.getFigure().translateToAbsolute(rect);

-				if (!rect.equals(new Rectangle(text.getBounds()))) {

-					text.setBounds(rect.x, rect.y, rect.width, rect.height);

-				}

-			}

-		};

-	}

-

-	/**

-	 * This method is overridden so that the editor class can have a style as

-	 * the style needs to be passed into the editor class when it is created. It

-	 * will default to the super behavior if an <code>editorType</code> was

-	 * passed into the constructor.

-	 *

-	 * @since 2.1

-	 */

-	@Override

-	protected CellEditor createCellEditorOn(Composite composite) {

-

-		// ((ICleanupAfterDirectEdit) getEditPart()).setParser(parser);

-

-		Composite parent = new Composite(composite, SWT.None);

-		FillLayout fillLayout = new FillLayout();

-		fillLayout.marginWidth = 10;

-		parent.setLayout(fillLayout);

-

-		// if the client has overridden this class and provided their own editor

-		// type, then we should use that

-		if (editorType != null) {

-			return super.createCellEditorOn(parent);

-		}

-		XtextStyledTextCellEditorEx editor;

-		if (fakeProvider != null) {

-			editor = new XtextStyledTextCellEditorEx(style, injector,

-					fakeProvider);

-			editor.create(composite);

-		} else if (contextProvider != null) {

-			editor = new XtextStyledTextCellEditorEx(style, injector,

-					contextProvider);

-			editor.create(composite);

-		} else {

-			editor = new XtextStyledTextCellEditorEx(style, injector);

-			editor.create(composite);

-		}

-		return editor;

-	}

-

-	/**

-	 * Given a label figure object, this will calculate the correct Font needed

-	 * to display into screen coordinates, taking into account the current

-	 * mapmode. This will typically be used by direct edit cell editors that

-	 * need to display independent of the zoom or any coordinate mapping that is

-	 * taking place on the drawing surface.

-	 *

-	 * @param label

-	 *            the label to use for the font calculation

-	 * @return the <code>Font</code> that is scaled to the screen coordinates.

-	 *         Note: the returned <code>Font</code> should not be disposed since

-	 *         it is cached by a common resource manager.

-	 */

-	protected Font getScaledFont(IFigure label) {

-		Font scaledFont = label.getFont();

-		FontData data = scaledFont.getFontData()[0];

-		Dimension fontSize = new Dimension(0, MapModeUtil.getMapMode(label)

-				.DPtoLP(data.getHeight()));

-		label.translateToAbsolute(fontSize);

-

-		if (Math.abs(data.getHeight() - fontSize.height) < 2) {

-			fontSize.height = data.getHeight();

-		}

-

-		try {

-			FontDescriptor fontDescriptor = FontDescriptor.createFrom(data);

-			cachedFontDescriptors.add(fontDescriptor);

-			return getResourceManager().createFont(fontDescriptor);

-		} catch (DeviceResourceException e) {

-			Trace.catching(DiagramUIPlugin.getInstance(),

-					DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(), "getScaledFont", e); //$NON-NLS-1$

-			Log.error(DiagramUIPlugin.getInstance(),

-					DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING, "getScaledFont", e); //$NON-NLS-1$

-		}

-		return JFaceResources.getDefaultFont();

-	}

-

-	@Override

-	protected void initCellEditor() {

-		committed = false;

-

-		// Get the Text Compartments Edit Part

-		setEditText(getEditPart().getEditText());

-

-		IFigure label = getEditPart().getFigure();

-		Assert.isNotNull(label);

-		StyledText text = (StyledText) getCellEditor().getControl();

-		// scale the font accordingly to the zoom level

-		text.setFont(getScaledFont(label));

-

-		// Hook the cell editor's copy/paste actions to the actionBars so that

-		// they can

-		// be invoked via keyboard shortcuts.

-		actionBars = PlatformUI.getWorkbench().getActiveWorkbenchWindow()

-				.getActivePage().getActiveEditor().getEditorSite()

-				.getActionBars();

-		saveCurrentActions(actionBars);

-		actionHandler = new CellEditorActionHandler(actionBars);

-		actionHandler.addCellEditor(getCellEditor());

-		actionBars.updateActionBars();

-		resetDefaultParser();

-	}

-

-	/**

-	 * @see org.eclipse.gef.tools.DirectEditManager#commit()

-	 */

-	@Override

-	protected void commit() {

-		Shell activeShell = Display.getCurrent().getActiveShell();

-		if (activeShell != null

-				&& getCellEditor().getControl().getShell()

-						.equals(activeShell.getParent())) {

-			Control[] children = activeShell.getChildren();

-			if (children.length == 1 && children[0] instanceof Table) {

-				/*

-				 * CONTENT ASSIST: focus is lost to the content assist pop up -

-				 * stay in focus

-				 */

-				getCellEditor().getControl().setVisible(true);

-				((XtextStyledTextCellEditorEx) getCellEditor())

-						.setDeactivationLock(true);

-				return;

-			}

-		}

-

-		// content assist hacks

-		if (committed) {

-			bringDown();

-			return;

-		}

-		committed = true;

-		// installCustomParser();

-		// already call eraseFeedback here, to assure that a refresh is done with the default parser

-		eraseFeedback();

-		// now install the custom parser before committing

-		installCustomParser();

-		super.commit();

-		resetDefaultParser();

-		getEditPart().refresh();

-

-	}

-

-	/**

-	 * install the custom parser for the editor

-	 */

-	protected void installCustomParser() {

-		if ((parser != null) && getEditPart() instanceof IControlParserForDirectEdit) {

-			((IControlParserForDirectEdit) getEditPart()).setParser(parser);

-		}

-	}

-

-	/**

-	 * reset to default parser

-	 */

-	protected void resetDefaultParser() {

-		if (getEditPart() instanceof IControlParserForDirectEdit) {

-			((IControlParserForDirectEdit) getEditPart()).setParser(null);

-		}

-	}

-

-	/**

-	 * @see org.eclipse.gef.tools.DirectEditManager#bringDown()

-	 */

-	@Override

-	protected void bringDown() {

-		if (proposalPopupForegroundColor != null) {

-			proposalPopupForegroundColor.dispose();

-			proposalPopupForegroundColor = null;

-		}

-		if (proposalPopupBackgroundColor != null) {

-			proposalPopupBackgroundColor.dispose();

-			proposalPopupBackgroundColor = null;

-		}

-

-		// myee - RATLC00523014: crashes when queued in asyncExec()

-		eraseFeedback();

-

-		initialString = new StringBuffer();

-

-		Display.getCurrent().asyncExec(new Runnable() {

-

-			public void run() {

-				// Content Assist hack - allow proper cleanup on children

-				// controls

-				XtextDirectEditManager.super.bringDown();

-			}

-		});

-

-		for (Iterator<FontDescriptor> iter = cachedFontDescriptors.iterator(); iter

-				.hasNext();) {

-			getResourceManager().destroyFont(iter.next());

-		}

-		cachedFontDescriptors.clear();

-

-		if (actionHandler != null) {

-			actionHandler.dispose();

-			actionHandler = null;

-		}

-		if (actionBars != null) {

-			restoreSavedActions(actionBars);

-			actionBars.updateActionBars();

-			actionBars = null;

-		}

-	}

-

-	/**

-	 * This method is used to set the cell editors text

-	 *

-	 * @param toEdit

-	 *            String to be set in the cell editor

-	 */

-	public void setEditText(String toEdit) {

-

-		// Get the cell editor

-		CellEditor cellEditor = getCellEditor();

-

-		// IF the cell editor doesn't exist yet...

-		if (cellEditor == null) {

-			// Do nothing

-			return;

-		}

-

-		// Get the Text Compartment Edit Part

-		ITextAwareEditPart textEP = getEditPart();

-

-		// Get the Text control

-		StyledText textControl = (StyledText) cellEditor.getControl();

-

-		// Set the Figures text

-		textEP.setLabelText(toEdit);

-

-		// See RATLC00522324

-		if (cellEditor instanceof TextCellEditorEx) {

-			((TextCellEditorEx) cellEditor)

-					.setValueAndProcessEditOccured(toEdit);

-		} else {

-			cellEditor.setValue(toEdit);

-		}

-

-		// Set the controls text and position the caret at the end of the text

-		textControl.setSelection(toEdit.length());

-	}

-

-	/**

-	 * Performs show and sets the edit string to be the initial character or

-	 * string

-	 *

-	 * @param initialChar

-	 */

-	public void show(char initialChar) {

-		initialString = initialString.append(initialChar);

-

-		((IControlParserForDirectEdit) getEditPart()).setParser(parser);

-		show();

-		if (SWT.getPlatform() != "carbon") { //$NON-NLS-1$

-			// Set the cell editor text to the initial character

-			setEditText(initialString.toString());

-		}

-		((IControlParserForDirectEdit) getEditPart()).setParser(null);

-

-	}

-

-	/**

-	 * This method obtains the fonts that are being used by the figure at its

-	 * zoom level.

-	 *

-	 * @param gep

-	 *            the associated <code>GraphicalEditPart</code> of the figure

-	 * @param actualFont

-	 *            font being used by the figure

-	 * @param display

-	 * @return <code>actualFont</code> if zoom level is 1.0 (or when there's an

-	 *         error), new Font otherwise.

-	 */

-	private Font getZoomLevelFont(Font actualFont, Display display) {

-		Object zoom = getEditPart().getViewer().getProperty(

-				ZoomManager.class.toString());

-

-		if (zoom != null) {

-			double zoomLevel = ((ZoomManager) zoom).getZoom();

-

-			if (zoomLevel == 1.0f) {

-				return actualFont;

-			}

-

-			FontData[] fd = new FontData[actualFont.getFontData().length];

-			FontData tempFD = null;

-

-			for (int i = 0; i < fd.length; i++) {

-				tempFD = actualFont.getFontData()[i];

-

-				fd[i] = new FontData(tempFD.getName(),

-						(int) (zoomLevel * tempFD.getHeight()),

-						tempFD.getStyle());

-			}

-

-			try {

-				FontDescriptor fontDescriptor = FontDescriptor.createFrom(fd);

-				cachedFontDescriptors.add(fontDescriptor);

-				return getResourceManager().createFont(fontDescriptor);

-			} catch (DeviceResourceException e) {

-				Trace.catching(DiagramUIPlugin.getInstance(),

-						DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(), "getZoomLevelFonts", e); //$NON-NLS-1$

-				Log.error(DiagramUIPlugin.getInstance(),

-						DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING, "getZoomLevelFonts", e); //$NON-NLS-1$

-

-				return actualFont;

-			}

-		} else {

-			return actualFont;

-		}

-	}

-

-	@Override

-	public void show() {

-		super.show();

-

-		IFigure fig = getEditPart().getFigure();

-

-		Control control = getCellEditor().getControl();

-		this.zoomLevelFont = getZoomLevelFont(fig.getFont(),

-				control.getDisplay());

-

-		control.setFont(this.zoomLevelFont);

-

-		// since the font's have been resized, we need to resize the Text

-		// control...

-		getLocator().relocate(getCellEditor());

-

-	}

-

-	/**

-	 *

-	 * Performs show and sends an extra mouse click to the point location so

-	 * that cursor appears at the mouse click point

-	 *

-	 * The Text control does not allow for the cursor to appear at point

-	 * location but at a character location

-	 *

-	 * @param location

-	 */

-	public void show(Point location) {

-		show();

-		sendClickToCellEditor(location);

-	}

-

-	private void sendClickToCellEditor(final Point location) {

-		// make sure the diagram doesn't receive the click event..

-		getCellEditor().getControl().setCapture(true);

-

-		if (getCellEditor() != null

-				&& getCellEditor().getControl().getBounds().contains(location)) {

-			sendMouseClick(location);

-		}

-	}

-

-	/**

-	 *

-	 * Sends a SWT MouseUp and MouseDown event to the point location to the

-	 * current Display

-	 *

-	 * @param location

-	 */

-	private void sendMouseClick(final Point location) {

-

-		final Display currDisplay = Display.getCurrent();

-		currDisplay.asyncExec(new Runnable() {

-			public void run() {

-				Event event;

-				event = new Event();

-				event.type = SWT.MouseDown;

-				event.button = 1;

-				event.x = location.x;

-				event.y = location.y;

-				currDisplay.post(event);

-				event.type = SWT.MouseUp;

-				currDisplay.post(event);

-			}

-		});

-	}

-

-	@Override

-	protected void hookListeners() {

-		super.hookListeners();

-

-		// TODO: This gets around the problem of the cell editor not growing big

-		// enough when in autosize mode because it doesn't listen to textflow

-		// size changes. The superclass should be modified to not assume we want

-		// to listen to the editpart's figure.

-		ILabelDelegate label = (ILabelDelegate) getEditPart().getAdapter(

-				ILabelDelegate.class);

-		if (label != null && getEditPart().getFigure() instanceof WrappingLabel) {

-

-			textFigureListener = new AncestorListener.Stub() {

-

-				@Override

-				public void ancestorMoved(IFigure ancestor) {

-					getLocator().relocate(getCellEditor());

-				}

-			};

-			((IFigure) ((WrappingLabel) getEditPart().getFigure())

-					.getTextFigure().getChildren().get(0))

-					.addAncestorListener(textFigureListener);

-		}

-	}

-

-	/*

-	 * Overrides super unhookListeners to set listeners attached flag This

-	 * method prevents unhooking listeners twice if the UI thread is blocked.

-	 * For example, a validation dialog may block the thread

-	 */

-	@Override

-	protected void unhookListeners() {

-		if (listenersAttached) {

-			listenersAttached = false;

-			super.unhookListeners();

-

-			ILabelDelegate label = (ILabelDelegate) getEditPart().getAdapter(

-					ILabelDelegate.class);

-			if (label != null && textFigureListener != null) {

-				((IFigure) ((WrappingLabel) getEditPart().getFigure())

-						.getTextFigure().getChildren().get(0))

-						.removeAncestorListener(textFigureListener);

-				textFigureListener = null;

-			}

-		}

-	}

-

-	/*

-	 * Sets the listeners attached flag if the cell editor exists

-	 */

-	@Override

-	protected void setCellEditor(CellEditor editor) {

-		super.setCellEditor(editor);

-		if (editor != null) {

-			listenersAttached = true;

-		}

-	}

-

-	@Override

-	public void showFeedback() {

-		try {

-			getEditPart().getRoot();

-			super.showFeedback();

-		} catch (Exception e) {

-			// TODO: handle exception

-		}

-	}

-

-	/**

-	 * Overridden to enlarge the cell editor frame for a control decorator

-	 */

-	@Override

-	protected IFigure getCellEditorFrame() {

-		IFigure cellEditorFrame = super.getCellEditorFrame();

-		cellEditorFrame.setBorder(new CompoundBorder(new MarginBorder(

-				new Insets(0, 10, 0, 0)), BORDER_FRAME));

-		return cellEditorFrame;

-	}

-

-	@Override

-	protected ITextAwareEditPart getEditPart() {

-		return (ITextAwareEditPart) super.getEditPart();

-	}

-

-	/**

-	 * Gets the resource manager to remember the resources allocated for this

-	 * graphical viewer. All resources will be disposed when the graphical

-	 * viewer is closed if they have not already been disposed.

-	 *

-	 * @return

-	 */

-	protected ResourceManager getResourceManager() {

-		return ((DiagramGraphicalViewer) getEditPart().getViewer())

-				.getResourceManager();

-	}

-

-	private void saveCurrentActions(IActionBars _actionBars) {

-		copy = _actionBars.getGlobalActionHandler(ActionFactory.COPY.getId());

-		paste = _actionBars.getGlobalActionHandler(ActionFactory.PASTE.getId());

-		delete = _actionBars.getGlobalActionHandler(ActionFactory.DELETE

-				.getId());

-		selectAll = _actionBars.getGlobalActionHandler(ActionFactory.SELECT_ALL

-				.getId());

-		cut = _actionBars.getGlobalActionHandler(ActionFactory.CUT.getId());

-		find = _actionBars.getGlobalActionHandler(ActionFactory.FIND.getId());

-		undo = _actionBars.getGlobalActionHandler(ActionFactory.UNDO.getId());

-		redo = _actionBars.getGlobalActionHandler(ActionFactory.REDO.getId());

-	}

-

-	private void restoreSavedActions(IActionBars _actionBars) {

-		_actionBars.setGlobalActionHandler(ActionFactory.COPY.getId(), copy);

-		_actionBars.setGlobalActionHandler(ActionFactory.PASTE.getId(), paste);

-		_actionBars

-				.setGlobalActionHandler(ActionFactory.DELETE.getId(), delete);

-		_actionBars.setGlobalActionHandler(ActionFactory.SELECT_ALL.getId(),

-				selectAll);

-		_actionBars.setGlobalActionHandler(ActionFactory.CUT.getId(), cut);

-		_actionBars.setGlobalActionHandler(ActionFactory.FIND.getId(), find);

-		_actionBars.setGlobalActionHandler(ActionFactory.UNDO.getId(), undo);

-		_actionBars.setGlobalActionHandler(ActionFactory.REDO.getId(), redo);

-	}

-

+/******************************************************************************
+ * Copyright (c) 2002, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    IBM Corporation - initial API and implementation
+ *    Dmitry Stadnik (Borland) - contribution for bugzilla 135694
+ *    Benoit Maggi (CEA LIST) - contribution for Bug 444063
+ ****************************************************************************/
+
+package org.eclipse.papyrus.uml.xtext.integration;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.draw2d.AncestorListener;
+import org.eclipse.draw2d.CompoundBorder;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.MarginBorder;
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.TextUtilities;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Insets;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gef.editparts.ZoomManager;
+import org.eclipse.gef.tools.CellEditorLocator;
+import org.eclipse.gmf.runtime.common.core.util.Log;
+import org.eclipse.gmf.runtime.common.core.util.Trace;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
+import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
+import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
+import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;
+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
+import org.eclipse.gmf.runtime.gef.ui.internal.parts.TextCellEditorEx;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.resource.DeviceResourceException;
+import org.eclipse.jface.resource.FontDescriptor;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.uml.xtext.integration.core.ContextElementAdapter.IContextElementProvider;
+import org.eclipse.papyrus.uml.xtext.integration.core.IXtextFakeContextResourcesProvider;
+import org.eclipse.papyrus.uml.xtext.integration.ui.Activator;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+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.Shell;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.actions.ActionFactory;
+import org.eclipse.ui.part.CellEditorActionHandler;
+
+import com.google.inject.Injector;
+
+/**
+ * Full copy of the TextDirectEditManager for a StyledText
+ *
+ */
+@SuppressWarnings("restriction")
+public class XtextDirectEditManager extends DirectEditManagerEx {
+
+	/**
+	 * content assist background color
+	 */
+	private Color proposalPopupBackgroundColor = null;
+
+	/**
+	 * content assist foreground color
+	 */
+	private Color proposalPopupForegroundColor = null;
+
+	private boolean committed = false;
+
+	/**
+	 * flag used to avoid unhooking listeners twice if the UI thread is blocked
+	 */
+	private boolean listenersAttached = true;
+
+	/** String buffer to hold initial characters * */
+	private StringBuffer initialString = new StringBuffer();
+
+	/**
+	 * Cache the font descriptor when a font is created so that it can be
+	 * disposed later.
+	 */
+	private List<FontDescriptor> cachedFontDescriptors = new ArrayList<FontDescriptor>();
+
+	private static IActionBars actionBars;
+
+	private CellEditorActionHandler actionHandler;
+
+	private static IAction copy, cut, paste, undo, redo, find, selectAll, delete;
+
+	private Font zoomLevelFont = null;
+
+	/**
+	 * store used parser to enable activation, if required
+	 * */
+	protected IParser parser;
+
+	/**
+	 * The superclass only relocates the cell editor when the location of the
+	 * editpart's figure moves, but we need to also relocate the cell editor
+	 * when the text figure's location changes.
+	 */
+	private AncestorListener textFigureListener;
+
+	/**
+	 * Cache locally so we can check if the user specified an editorType.
+	 */
+	private Class<?> editorType;
+
+	private final Injector injector;
+	private final int style;
+
+	private IXtextFakeContextResourcesProvider fakeProvider;
+
+	private static final int LABEL_MIN_WIDTH = 75;
+
+	private IContextElementProvider contextProvider;
+
+	/**
+	 * constructor
+	 *
+	 * @param source
+	 *            <code>GraphicalEditPart</code> to support direct edit of. The
+	 *            figure of the <code>source</code> edit part must be of type <code>WrapLabel</code>.
+	 */
+	public XtextDirectEditManager(ITextAwareEditPart source, Injector injector,
+			int style) {
+		this(source, null, getTextCellEditorLocator(source), injector, style);
+	}
+
+	public XtextDirectEditManager(ITextAwareEditPart source, Injector injector,
+			int style, IXtextFakeContextResourcesProvider provider) {
+		this(source, null, getTextCellEditorLocator(source), injector, style);
+		this.fakeProvider = provider;
+	}
+
+	public XtextDirectEditManager(ITextAwareEditPart source, Injector injector,
+			int style, DefaultXtextDirectEditorConfiguration configuration) {
+		this(source, null, getTextCellEditorLocator(source), injector, style);
+		this.contextProvider = configuration.getContextProvider();
+		this.parser = configuration.createParser(((IGraphicalEditPart) source).resolveSemanticElement());
+		installCustomParser();
+	}
+
+	public XtextDirectEditManager(ITextAwareEditPart source, Injector injector,
+			int style, IContextElementProvider provider) {
+		this(source, null, getTextCellEditorLocator(source), injector, style);
+		this.contextProvider = provider;
+	}
+
+	/**
+	 * @param source
+	 * @param editorType
+	 * @param locator
+	 */
+	public XtextDirectEditManager(GraphicalEditPart source,
+			Class<?> editorType, CellEditorLocator locator, Injector injector,
+			int style) {
+		super(source, editorType, locator);
+		this.editorType = editorType;
+		this.injector = injector;
+		this.style = style;
+	}
+
+	/**
+	 * @param source
+	 *            the <code>ITextAwareEditPart</code> to determine the cell
+	 *            editor for
+	 * @return the <code>CellEditorLocator</code> that is appropriate for the
+	 *         source <code>EditPart</code>
+	 */
+	public static CellEditorLocator getTextCellEditorLocator(
+			final ITextAwareEditPart source) {
+
+		final ILabelDelegate label = (ILabelDelegate) source
+				.getAdapter(ILabelDelegate.class);
+		if (label != null) {
+			return new CellEditorLocator() {
+
+				public void relocate(CellEditor celleditor) {
+					StyledText text = (StyledText) celleditor.getControl();
+
+					Rectangle rect = label.getTextBounds().getCopy();
+					if (label.getText().length() <= 0) {
+						// if there is no text, let's assume a default size
+						// of one character because it looks silly when the cell
+						// editor is tiny.
+						rect.setSize(TextUtilities.INSTANCE.getTextExtents("a", text.getFont())); //$NON-NLS-1$
+
+						if (label.isTextWrapOn()) {
+							// adjust the location of the cell editor based on
+							// text
+							// justification (i.e. where the cursor will be
+							if (label.getTextJustification() == PositionConstants.RIGHT) {
+								rect.translate(-rect.width, 0);
+							} else if (label.getTextJustification() == PositionConstants.CENTER) {
+								rect.translate(-rect.width / 2, 0);
+							}
+						}
+					}
+
+					if (!text.getFont().isDisposed()) {
+						// Font may be disposed if the locator is called while
+						// this manager is being brought down in which case the
+						// calls below that use the font will result in an
+						// exception.
+						if (label.isTextWrapOn()) {
+							// When zoomed in, the height of this rectangle is
+							// not
+							// sufficient because the text is shifted downwards
+							// a
+							// little bit. Add some to the height to compensate
+							// for
+							// this. I'm not sure why this is happening, but I
+							// can
+							// see the text shifting down even in a label on a
+							// GEF
+							// logic diagram when zoomed into 400%.
+							int charHeight = org.eclipse.draw2d.FigureUtilities.getFontMetrics(
+									text.getFont()).getHeight();
+							rect.resize(0, charHeight / 2);
+						} else {
+
+							rect.setSize(new Dimension(text.computeSize(
+									SWT.DEFAULT, SWT.DEFAULT)));
+
+							// If SWT.WRAP is not passed in as a style of the
+							// TextCellEditor, then for some reason the first
+							// character disappears upon entering the second
+							// character. This should be investigated and an
+							// SWT bug logged.
+							int avr = org.eclipse.draw2d.FigureUtilities.getFontMetrics(
+									text.getFont()).getAverageCharWidth();
+							rect.setSize(new Dimension(text.computeSize(
+									SWT.DEFAULT, SWT.DEFAULT)).expand(avr * 2,
+									0));
+						}
+					}
+
+					org.eclipse.swt.graphics.Rectangle newRect = text
+							.computeTrim(rect.x, rect.y, rect.width,
+									rect.height);
+					if (!newRect.equals(text.getBounds())) {
+						text.setBounds(newRect.x, newRect.y, newRect.width,
+								newRect.height);
+					}
+				}
+			};
+		}
+
+		// return a default figure locator
+		return new CellEditorLocator() {
+			public void relocate(CellEditor celleditor) {
+				StyledText text = (StyledText) celleditor.getControl();
+				Rectangle rect = source.getFigure().getBounds().getCopy();
+				// Added min width because it looks silly if the label has a
+				// width of 0
+				rect.width = Math.max(rect.width, LABEL_MIN_WIDTH);
+				if (!text.isDisposed() && text.getFont() != null && !text.getFont().isDisposed()) {
+					Dimension fontMetrics = TextUtilities.INSTANCE.getTextExtents("a", text.getFont()).getCopy();
+					source.getFigure().translateToRelative(fontMetrics);
+					rect.height = Math.max(rect.height, fontMetrics.height);
+				}
+				source.getFigure().translateToAbsolute(rect);
+				if (!rect.equals(new Rectangle(text.getBounds()))) {
+					text.setBounds(rect.x, rect.y, rect.width, rect.height);
+				}
+			}
+		};
+	}
+
+	/**
+	 * This method is overridden so that the editor class can have a style as
+	 * the style needs to be passed into the editor class when it is created. It
+	 * will default to the super behavior if an <code>editorType</code> was
+	 * passed into the constructor.
+	 *
+	 * @since 2.1
+	 */
+	@Override
+	protected CellEditor createCellEditorOn(Composite composite) {
+
+		// ((ICleanupAfterDirectEdit) getEditPart()).setParser(parser);
+
+		Composite parent = new Composite(composite, SWT.None);
+		FillLayout fillLayout = new FillLayout();
+		fillLayout.marginWidth = 10;
+		parent.setLayout(fillLayout);
+
+		// if the client has overridden this class and provided their own editor
+		// type, then we should use that
+		if (editorType != null) {
+			return super.createCellEditorOn(parent);
+		}
+		XtextStyledTextCellEditorEx editor;
+		if (fakeProvider != null) {
+			editor = new XtextStyledTextCellEditorEx(style, injector,
+					fakeProvider);
+			editor.create(composite);
+		} else if (contextProvider != null) {
+			editor = new XtextStyledTextCellEditorEx(style, injector,
+					contextProvider);
+			editor.create(composite);
+		} else {
+			editor = new XtextStyledTextCellEditorEx(style, injector);
+			editor.create(composite);
+		}
+		return editor;
+	}
+
+	/**
+	 * Given a label figure object, this will calculate the correct Font needed
+	 * to display into screen coordinates, taking into account the current
+	 * mapmode. This will typically be used by direct edit cell editors that
+	 * need to display independent of the zoom or any coordinate mapping that is
+	 * taking place on the drawing surface.
+	 *
+	 * @param label
+	 *            the label to use for the font calculation
+	 * @return the <code>Font</code> that is scaled to the screen coordinates.
+	 *         Note: the returned <code>Font</code> should not be disposed since
+	 *         it is cached by a common resource manager.
+	 */
+	protected Font getScaledFont(IFigure label) {
+		Font scaledFont = label.getFont();
+		FontData data = scaledFont.getFontData()[0];
+		Dimension fontSize = new Dimension(0, MapModeUtil.getMapMode(label)
+				.DPtoLP(data.getHeight()));
+		label.translateToAbsolute(fontSize);
+
+		if (Math.abs(data.getHeight() - fontSize.height) < 2) {
+			fontSize.height = data.getHeight();
+		}
+
+		try {
+			FontDescriptor fontDescriptor = FontDescriptor.createFrom(data);
+			cachedFontDescriptors.add(fontDescriptor);
+			return getResourceManager().createFont(fontDescriptor);
+		} catch (DeviceResourceException e) {
+			Trace.catching(DiagramUIPlugin.getInstance(),
+					DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(), "getScaledFont", e); //$NON-NLS-1$
+			Log.error(DiagramUIPlugin.getInstance(),
+					DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING, "getScaledFont", e); //$NON-NLS-1$
+		}
+		return JFaceResources.getDefaultFont();
+	}
+
+	@Override
+	protected void initCellEditor() {
+		committed = false;
+
+		// Get the Text Compartments Edit Part
+		setEditText(getEditPart().getEditText());
+
+		IFigure label = getEditPart().getFigure();
+		Assert.isNotNull(label);
+		StyledText text = (StyledText) getCellEditor().getControl();
+		// scale the font accordingly to the zoom level
+		text.setFont(getScaledFont(label));
+
+		// Hook the cell editor's copy/paste actions to the actionBars so that
+		// they can
+		// be invoked via keyboard shortcuts.
+		IActionBars editorActionBars = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+				.getActivePage().getActiveEditor().getEditorSite()
+				.getActionBars();
+		if (actionBars != null){
+			restoreSavedActions(editorActionBars);
+		}
+		saveCurrentActions(editorActionBars);
+		actionBars = editorActionBars;
+		actionHandler = new CellEditorActionHandler(actionBars);
+		actionHandler.addCellEditor(getCellEditor());
+		actionBars.updateActionBars();
+		resetDefaultParser();
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.DirectEditManager#commit()
+	 */
+	@Override
+	protected void commit() {
+		Shell activeShell = Display.getCurrent().getActiveShell();
+		if (activeShell != null
+				&& getCellEditor().getControl().getShell()
+						.equals(activeShell.getParent())) {
+			Control[] children = activeShell.getChildren();
+			if (children.length == 1 && children[0] instanceof Table) {
+				/*
+				 * CONTENT ASSIST: focus is lost to the content assist pop up -
+				 * stay in focus
+				 */
+				getCellEditor().getControl().setVisible(true);
+				((XtextStyledTextCellEditorEx) getCellEditor())
+						.setDeactivationLock(true);
+				return;
+			}
+		}
+
+		// content assist hacks
+		if (committed) {
+			bringDown();
+			return;
+		}
+		committed = true;
+		// installCustomParser();
+		// already call eraseFeedback here, to assure that a refresh is done with the default parser
+		eraseFeedback();
+		// now install the custom parser before committing
+		installCustomParser();
+		super.commit();
+		resetDefaultParser();
+		getEditPart().refresh();
+
+	}
+
+	/**
+	 * install the custom parser for the editor
+	 */
+	protected void installCustomParser() {
+		if ((parser != null) && getEditPart() instanceof IControlParserForDirectEdit) {
+			((IControlParserForDirectEdit) getEditPart()).setParser(parser);
+		}
+	}
+
+	/**
+	 * reset to default parser
+	 */
+	protected void resetDefaultParser() {
+		if (getEditPart() instanceof IControlParserForDirectEdit) {
+			((IControlParserForDirectEdit) getEditPart()).setParser(null);
+		}
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.DirectEditManager#bringDown()
+	 */
+	@Override
+	protected void bringDown() {
+		if (proposalPopupForegroundColor != null) {
+			proposalPopupForegroundColor.dispose();
+			proposalPopupForegroundColor = null;
+		}
+		if (proposalPopupBackgroundColor != null) {
+			proposalPopupBackgroundColor.dispose();
+			proposalPopupBackgroundColor = null;
+		}
+
+		// myee - RATLC00523014: crashes when queued in asyncExec()
+		eraseFeedback();
+
+		initialString = new StringBuffer();
+
+		Display.getCurrent().asyncExec(new Runnable() {
+
+			public void run() {
+				// Content Assist hack - allow proper cleanup on children
+				// controls
+				XtextDirectEditManager.super.bringDown();
+			}
+		});
+
+		for (Iterator<FontDescriptor> iter = cachedFontDescriptors.iterator(); iter
+				.hasNext();) {
+			getResourceManager().destroyFont(iter.next());
+		}
+		cachedFontDescriptors.clear();
+
+		if (actionHandler != null) {
+			actionHandler.dispose();
+			actionHandler = null;
+		}
+		if (actionBars != null) {
+			restoreSavedActions(actionBars);
+			actionBars.updateActionBars();
+			actionBars = null;
+		}
+	}
+
+	/**
+	 * This method is used to set the cell editors text
+	 *
+	 * @param toEdit
+	 *            String to be set in the cell editor
+	 */
+	public void setEditText(String toEdit) {
+
+		// Get the cell editor
+		CellEditor cellEditor = getCellEditor();
+
+		// IF the cell editor doesn't exist yet...
+		if (cellEditor == null) {
+			// Do nothing
+			return;
+		}
+
+		// Get the Text Compartment Edit Part
+		ITextAwareEditPart textEP = getEditPart();
+
+		// Get the Text control
+		StyledText textControl = (StyledText) cellEditor.getControl();
+
+		// Set the Figures text
+		textEP.setLabelText(toEdit);
+
+		// See RATLC00522324
+		if (cellEditor instanceof TextCellEditorEx) {
+			((TextCellEditorEx) cellEditor)
+					.setValueAndProcessEditOccured(toEdit);
+		} else {
+			cellEditor.setValue(toEdit);
+		}
+
+		// Set the controls text and position the caret at the end of the text
+		textControl.setSelection(toEdit.length());
+	}
+
+	/**
+	 * Performs show and sets the edit string to be the initial character or
+	 * string
+	 *
+	 * @param initialChar
+	 */
+	public void show(char initialChar) {
+		initialString = initialString.append(initialChar);
+
+		((IControlParserForDirectEdit) getEditPart()).setParser(parser);
+		show();
+		if (SWT.getPlatform() != "carbon") { //$NON-NLS-1$
+			// Set the cell editor text to the initial character
+			setEditText(initialString.toString());
+		}
+		((IControlParserForDirectEdit) getEditPart()).setParser(null);
+
+	}
+
+	/**
+	 * This method obtains the fonts that are being used by the figure at its
+	 * zoom level.
+	 *
+	 * @param gep
+	 *            the associated <code>GraphicalEditPart</code> of the figure
+	 * @param actualFont
+	 *            font being used by the figure
+	 * @param display
+	 * @return <code>actualFont</code> if zoom level is 1.0 (or when there's an
+	 *         error), new Font otherwise.
+	 */
+	private Font getZoomLevelFont(Font actualFont, Display display) {
+		Object zoom = getEditPart().getViewer().getProperty(
+				ZoomManager.class.toString());
+
+		if (zoom != null) {
+			double zoomLevel = ((ZoomManager) zoom).getZoom();
+
+			if (zoomLevel == 1.0f) {
+				return actualFont;
+			}
+
+			FontData[] fd = new FontData[actualFont.getFontData().length];
+			FontData tempFD = null;
+
+			for (int i = 0; i < fd.length; i++) {
+				tempFD = actualFont.getFontData()[i];
+
+				fd[i] = new FontData(tempFD.getName(),
+						(int) (zoomLevel * tempFD.getHeight()),
+						tempFD.getStyle());
+			}
+
+			try {
+				FontDescriptor fontDescriptor = FontDescriptor.createFrom(fd);
+				cachedFontDescriptors.add(fontDescriptor);
+				return getResourceManager().createFont(fontDescriptor);
+			} catch (DeviceResourceException e) {
+				Trace.catching(DiagramUIPlugin.getInstance(),
+						DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(), "getZoomLevelFonts", e); //$NON-NLS-1$
+				Log.error(DiagramUIPlugin.getInstance(),
+						DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING, "getZoomLevelFonts", e); //$NON-NLS-1$
+
+				return actualFont;
+			}
+		} else {
+			return actualFont;
+		}
+	}
+
+	@Override
+	public void show() {
+		super.show();
+
+		IFigure fig = getEditPart().getFigure();
+
+		Control control = getCellEditor().getControl();
+		this.zoomLevelFont = getZoomLevelFont(fig.getFont(),
+				control.getDisplay());
+
+		control.setFont(this.zoomLevelFont);
+
+		// since the font's have been resized, we need to resize the Text
+		// control...
+		getLocator().relocate(getCellEditor());
+
+	}
+
+	/**
+	 *
+	 * Performs show and sends an extra mouse click to the point location so
+	 * that cursor appears at the mouse click point
+	 *
+	 * The Text control does not allow for the cursor to appear at point
+	 * location but at a character location
+	 *
+	 * @param location
+	 */
+	public void show(Point location) {
+		show();
+		sendClickToCellEditor(location);
+	}
+
+	private void sendClickToCellEditor(final Point location) {
+		// make sure the diagram doesn't receive the click event..
+		getCellEditor().getControl().setCapture(true);
+
+		if (getCellEditor() != null
+				&& getCellEditor().getControl().getBounds().contains(location)) {
+			sendMouseClick(location);
+		}
+	}
+
+	/**
+	 *
+	 * Sends a SWT MouseUp and MouseDown event to the point location to the
+	 * current Display
+	 *
+	 * @param location
+	 */
+	private void sendMouseClick(final Point location) {
+
+		final Display currDisplay = Display.getCurrent();
+		currDisplay.asyncExec(new Runnable() {
+			public void run() {
+				Event event;
+				event = new Event();
+				event.type = SWT.MouseDown;
+				event.button = 1;
+				event.x = location.x;
+				event.y = location.y;
+				currDisplay.post(event);
+				event.type = SWT.MouseUp;
+				currDisplay.post(event);
+			}
+		});
+	}
+
+	@Override
+	protected void hookListeners() {
+		super.hookListeners();
+
+		// TODO: This gets around the problem of the cell editor not growing big
+		// enough when in autosize mode because it doesn't listen to textflow
+		// size changes. The superclass should be modified to not assume we want
+		// to listen to the editpart's figure.
+		ILabelDelegate label = (ILabelDelegate) getEditPart().getAdapter(
+				ILabelDelegate.class);
+		if (label != null && getEditPart().getFigure() instanceof WrappingLabel) {
+
+			textFigureListener = new AncestorListener.Stub() {
+
+				@Override
+				public void ancestorMoved(IFigure ancestor) {
+					getLocator().relocate(getCellEditor());
+				}
+			};
+			((IFigure) ((WrappingLabel) getEditPart().getFigure())
+					.getTextFigure().getChildren().get(0))
+					.addAncestorListener(textFigureListener);
+		}
+	}
+
+	/*
+	 * Overrides super unhookListeners to set listeners attached flag This
+	 * method prevents unhooking listeners twice if the UI thread is blocked.
+	 * For example, a validation dialog may block the thread
+	 */
+	@Override
+	protected void unhookListeners() {
+		if (listenersAttached) {
+			listenersAttached = false;
+			super.unhookListeners();
+
+			ILabelDelegate label = (ILabelDelegate) getEditPart().getAdapter(
+					ILabelDelegate.class);
+			if (label != null && textFigureListener != null) {
+				((IFigure) ((WrappingLabel) getEditPart().getFigure())
+						.getTextFigure().getChildren().get(0))
+						.removeAncestorListener(textFigureListener);
+				textFigureListener = null;
+			}
+		}
+	}
+
+	/*
+	 * Sets the listeners attached flag if the cell editor exists
+	 */
+	@Override
+	protected void setCellEditor(CellEditor editor) {
+		super.setCellEditor(editor);
+		if (editor != null) {
+			listenersAttached = true;
+		}
+	}
+
+	@Override
+	public void showFeedback() {
+		try {
+			getEditPart().getRoot();
+			super.showFeedback();
+		} catch (Exception e) {
+			// TODO: handle exception
+			Activator.log.error(e);
+		}
+	}
+
+	/**
+	 * Overridden to enlarge the cell editor frame for a control decorator
+	 */
+	@Override
+	protected IFigure getCellEditorFrame() {
+		IFigure cellEditorFrame = super.getCellEditorFrame();
+		cellEditorFrame.setBorder(new CompoundBorder(new MarginBorder(
+				new Insets(0, 10, 0, 0)), BORDER_FRAME));
+		return cellEditorFrame;
+	}
+
+	@Override
+	protected ITextAwareEditPart getEditPart() {
+		return (ITextAwareEditPart) super.getEditPart();
+	}
+
+	/**
+	 * Gets the resource manager to remember the resources allocated for this
+	 * graphical viewer. All resources will be disposed when the graphical
+	 * viewer is closed if they have not already been disposed.
+	 *
+	 * @return
+	 */
+	protected ResourceManager getResourceManager() {
+		return ((DiagramGraphicalViewer) getEditPart().getViewer())
+				.getResourceManager();
+	}
+
+	private void saveCurrentActions(IActionBars _actionBars) {
+		copy = _actionBars.getGlobalActionHandler(ActionFactory.COPY.getId());
+		paste = _actionBars.getGlobalActionHandler(ActionFactory.PASTE.getId());
+		delete = _actionBars.getGlobalActionHandler(ActionFactory.DELETE
+				.getId());
+		selectAll = _actionBars.getGlobalActionHandler(ActionFactory.SELECT_ALL
+				.getId());
+		cut = _actionBars.getGlobalActionHandler(ActionFactory.CUT.getId());
+		find = _actionBars.getGlobalActionHandler(ActionFactory.FIND.getId());
+		undo = _actionBars.getGlobalActionHandler(ActionFactory.UNDO.getId());
+		redo = _actionBars.getGlobalActionHandler(ActionFactory.REDO.getId());
+	}
+
+	private void restoreSavedActions(IActionBars _actionBars) {
+		_actionBars.setGlobalActionHandler(ActionFactory.COPY.getId(), copy);
+		_actionBars.setGlobalActionHandler(ActionFactory.PASTE.getId(), paste);
+		_actionBars
+				.setGlobalActionHandler(ActionFactory.DELETE.getId(), delete);
+		_actionBars.setGlobalActionHandler(ActionFactory.SELECT_ALL.getId(),
+				selectAll);
+		_actionBars.setGlobalActionHandler(ActionFactory.CUT.getId(), cut);
+		_actionBars.setGlobalActionHandler(ActionFactory.FIND.getId(), find);
+		_actionBars.setGlobalActionHandler(ActionFactory.UNDO.getId(), undo);
+		_actionBars.setGlobalActionHandler(ActionFactory.REDO.getId(), redo);
+	}
+
 }
\ No newline at end of file
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF
index cda73829189..6ca2a27d99b 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF
@@ -4,13 +4,13 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.emf.ecore;bundle-version="2.9.0",

  org.eclipse.emf.validation;bundle-version="1.7.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0",

  org.eclipse.xtext;bundle-version="2.5.1",

  org.eclipse.jface;bundle-version="3.10.0",

  org.eclipse.ui;bundle-version="3.106.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: GMF Xtext Integration Validation

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.validat

diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/pom.xml b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/pom.xml
index 824f025fea6..4691294b477 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/pom.xml
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.xtext.integration.validation</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF
index 562ca6e900d..75ecc7e0c7b 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.emf.transaction,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.common.core,

  org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.newchild;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.newchild;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.newchild.Act

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/pom.xml b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/pom.xml
index aef71fff95a..81ccb0da311 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/pom.xml
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.modelexplorer.newchild</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF
index 4afd19d9be3..e9fab0c74d6 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF
@@ -4,17 +4,17 @@ Export-Package: org.eclipse.papyrus.views.modelexplorer.resourceloadin
 Require-Bundle: org.eclipse.emf.converter;bundle-version="2.5.0",

  org.eclipse.emf.ecore.editor;bundle-version="2.6.0",

  org.eclipse.emf.workspace.ui;bundle-version="1.3.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.resourceload

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/pom.xml b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/pom.xml
index b3c7cdb341d..49f752c3891 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/pom.xml
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.modelexplorer.resourceloading</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF
index d32567f63e3..8c7753452fa 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.views.modelexplorer.widgets

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.gmf.runtime.emf.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.widgets.Acti

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/pom.xml b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/pom.xml
index 93bf7cf85e0..ec9e5fcf483 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/pom.xml
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.modelexplorer.widgets</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
index e20d2df20d2..fd1307382a6 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
@@ -18,47 +18,47 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.ui.navigator;bundle-version="3.4.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.emf.converter;bundle-version="2.5.0",

- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.1.0",

  org.eclipse.emf.ecore.editor;bundle-version="2.6.0",

  org.eclipse.emf.workspace.ui;bundle-version="1.3.0",

  org.eclipse.core.expressions;bundle-version="3.4.200",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.decoration;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.decoration;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.semantic;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.semantic;bundle-version="1.1.0",

  org.eclipse.emf.ecore,

- org.eclipse.papyrus.infra.services.navigation;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.navigation;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.Activator

 Bundle-ManifestVersion: 2

 Import-Package: org.eclipse.papyrus.emf.facet.custom.core

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml
index 7d3bb26614f..9ed53a8ed7f 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.modelexplorer</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/views/org.eclipse.papyrus.views.search/META-INF/MANIFEST.MF b/plugins/views/org.eclipse.papyrus.views.search/META-INF/MANIFEST.MF
index 3b56922a6bf..649e1315d13 100644
--- a/plugins/views/org.eclipse.papyrus.views.search/META-INF/MANIFEST.MF
+++ b/plugins/views/org.eclipse.papyrus.views.search/META-INF/MANIFEST.MF
@@ -9,20 +9,20 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Require-Bundle: org.eclipse.ui;bundle-version="3.105.0",

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.emf;bundle-version="2.6.0",

  org.eclipse.core.resources;bundle-version="3.8.100",

  org.eclipse.emf.common;bundle-version="2.9.0",

  org.eclipse.emf.ecore;bundle-version="2.9.0",

  org.eclipse.search;bundle-version="3.8.100",

- org.eclipse.papyrus.infra.onefile;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.onefile;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.ui.ide,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.openelement;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.openelement;bundle-version="1.1.0"

 Bundle-Vendor: %vendorName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.views.search.Activator

 Import-Package: org.eclipse.uml2.uml

diff --git a/plugins/views/org.eclipse.papyrus.views.search/pom.xml b/plugins/views/org.eclipse.papyrus.views.search/pom.xml
index 1ab5d915a19..1e40aa9e55f 100644
--- a/plugins/views/org.eclipse.papyrus.views.search/pom.xml
+++ b/plugins/views/org.eclipse.papyrus.views.search/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.search</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.edit/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.edit/META-INF/MANIFEST.MF
index 77af9c200d7..efe394bd138 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.edit/META-INF/MANIFEST.MF
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.edit/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.edit;visibility:=reexport,

  org.eclipse.emf.ecore.edit;bundle-version="2.7.0",

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.constraints.edit;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.constraints.edit;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.views.properties.contexts.provider,

  org.eclipse.papyrus.views.properties.environment.provider,

  org.eclipse.papyrus.views.properties.ui.provider

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.views.properties.environment.pro

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.edit/pom.xml b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.edit/pom.xml
index 142bbbc91e5..a83acb0e6dc 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.edit/pom.xml
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.edit/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.properties.model.edit</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/META-INF/MANIFEST.MF
index 57acae607f6..7197928cc94 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/META-INF/MANIFEST.MF
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.core.resources,

- org.eclipse.papyrus.views.properties.model.edit;bundle-version="1.0.1";visibility:=reexport,

+ org.eclipse.papyrus.views.properties.model.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport,

  org.eclipse.emf.edit.ui;visibility:=reexport,

  org.eclipse.ui.ide;visibility:=reexport,

  org.eclipse.emf.ecore.editor;bundle-version="2.7.0",

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.constraints.editor;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.constraints.editor;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.views.properties.contexts.presentation,

  org.eclipse.papyrus.views.properties.environment.presentation,

  org.eclipse.papyrus.views.properties.ui.presentation

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.views.properties.environment.pre

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/pom.xml b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/pom.xml
index 72f034cc9cd..22a7ecaf183 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/pom.xml
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.properties.model.editor</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/META-INF/MANIFEST.MF
index 3d5e02dd493..631c0c75611 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/META-INF/MANIFEST.MF
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/META-INF/MANIFEST.MF
@@ -10,11 +10,11 @@ Export-Package: org.eclipse.papyrus.views.properties.contexts,
  org.eclipse.papyrus.views.properties.ui.util

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;bundle-version="2.7.0";visibility:=reexport,

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/pom.xml b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/pom.xml
index d06bb3000b4..bb72de6a7a7 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/pom.xml
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.properties.model</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF
index 7a7e287c668..0111899b6f8 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF
@@ -29,24 +29,24 @@ Require-Bundle: org.eclipse.emf;bundle-version="2.6.0",
  org.eclipse.jface.databinding,

  org.eclipse.core.databinding,

  org.eclipse.core.databinding.property;bundle-version="1.3.0",

- org.eclipse.papyrus.xwt;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.views.modelexplorer.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.constraints;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.xwt;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.modelexplorer.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.emf.edit;bundle-version="2.8.0",

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Eclipse-BuddyPolicy: dependent

 Bundle-Activator: org.eclipse.papyrus.views.properties.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/pom.xml b/plugins/views/properties/org.eclipse.papyrus.views.properties/pom.xml
index b83663cb6ad..fedcaaead55 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/pom.xml
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.properties</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/EcorePropertyEditorFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/EcorePropertyEditorFactory.java
index 39adb30f9ba..730c42263b6 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/EcorePropertyEditorFactory.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/EcorePropertyEditorFactory.java
@@ -10,6 +10,7 @@
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

  *  Christian W. Damus (CEA) - bug 402525

  *  Christian W. Damus (CEA) - bug 430077

+ *  Christian W. Damus (CEA) - bug 443497

  *

  *****************************************************************************/

 package org.eclipse.papyrus.views.properties.creation;

@@ -244,6 +245,9 @@ public class EcorePropertyEditorFactory extends PropertyEditorFactory {
 				// Propagate to the caller if not in a nested edit dialog

 				throw e;

 			}

+

+			// Let the client think that there's nothing needing to be done, that the referenced object

+			// was edited "in place" instead of being replaced by some other object

 			result = null;

 		}

 

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/DefaultDisplayEngine.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/DefaultDisplayEngine.java
index c7698d07407..7c8293417b7 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/DefaultDisplayEngine.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/DefaultDisplayEngine.java
@@ -10,6 +10,7 @@
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

  *  Christian W. Damus (CEA) - Use URIs to support non-URL-compatible storage (CDO)

  *  Christian W. Damus (CEA) - bug 417409

+ *  Christian W. Damus (CEA) - bug 444227

  *

  *****************************************************************************/

 package org.eclipse.papyrus.views.properties.runtime;

@@ -193,7 +194,7 @@ public class DefaultDisplayEngine implements DisplayEngine {
 	}

 

 	protected DataSource getDataSource(Section section) {

-		return displayedSections.get(section.getTab().getId(), section.getName());

+		return displayedSections.get(section);

 	}

 

 	/**

@@ -202,21 +203,18 @@ public class DefaultDisplayEngine implements DisplayEngine {
 	 * @return the previously-recorded data source, if any, for this {@code section} which has now been displaced

 	 */

 	protected DataSource addDataSource(Section section, DataSource dataSource) {

-		return displayedSections.put(section.getTab().getId(), section.getName(), dataSource);

+		return displayedSections.put(section, dataSource);

 	}

 

-	protected void addControl(Section section, Control control) {

-		final String tabID = section.getTab().getId();

-		final String sectionID = section.getName();

-

-		controls.put(tabID, sectionID, control);

+	protected void addControl(final Section section, Control control) {

+		controls.put(section, control);

 

 		control.addDisposeListener(new DisposeListener() {

 

 			public void widgetDisposed(DisposeEvent e) {

 				// Perhaps the tabbed properties view is disposing a tab that is not shown by the new selection

-				displayedSections.remove(tabID, sectionID);

-				controls.remove(tabID, sectionID);

+				displayedSections.remove(section);

+				controls.remove(section);

 			}

 		});

 	}

@@ -307,4 +305,44 @@ public class DefaultDisplayEngine implements DisplayEngine {
 		}

 		layout(parent);

 	}

+

+	/**

+	 * Creates a proxy for a {@code section} that makes it distinct from other occurrences of the same section, according to some

+	 * arbitrary {@code disciminator}.

+	 * 

+	 * @param section

+	 *            a section to be repeated with unique discriminators

+	 * @param discriminator

+	 *            this {@code section}'s discriminator value

+	 * 

+	 * @return the proxy instance combining the identity of the {@code section} with its unique {@code discriminator}

+	 */

+	public static Section discriminate(Section section, Object discriminator) {

+		if (section == null) {

+			throw new IllegalArgumentException("null section");

+		}

+		if (discriminator == null) {

+			throw new IllegalArgumentException("null discriminator");

+		}

+		if (SectionDiscriminator.isDiscriminated(section)) {

+			throw new IllegalArgumentException("section already has a discriminator");

+		}

+

+		return SectionDiscriminator.discriminate(section, discriminator);

+	}

+

+	/**

+	 * Obtains the discriminator for a {@code section} proxy, if it is a proxy.

+	 * 

+	 * @param section

+	 *            a section that is repeated with unique discriminators

+	 * @return this {@code section}'s discriminator value, or {@code null} if it is a singleton (non-proxy) section

+	 */

+	public static Object getDiscriminator(Section section) {

+		if (section == null) {

+			throw new IllegalArgumentException("null section");

+		}

+

+		return SectionDiscriminator.getDiscriminator(section);

+	}

 }

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/SectionDiscriminator.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/SectionDiscriminator.java
new file mode 100644
index 00000000000..07dba74905e
--- /dev/null
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/SectionDiscriminator.java
@@ -0,0 +1,108 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.views.properties.runtime;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.papyrus.views.properties.contexts.Section;
+
+/**
+ * A proxy for {@link Section}s that distinguishes multiple occurrences of the same instance via an arbitrary discriminator.
+ */
+class SectionDiscriminator implements InvocationHandler {
+	private static final Class<?>[] PROXY_INTERFACES = { Section.class, EObject.class, InternalEObject.class };
+
+	private final Section section;
+	private final Object discriminator;
+
+	SectionDiscriminator(Section section, Object discriminator) {
+		this.section = section;
+		this.discriminator = discriminator;
+	}
+
+	static Section discriminate(Section section, Object discriminator) {
+		return (Section) Proxy.newProxyInstance(section.getClass().getClassLoader(), PROXY_INTERFACES, new SectionDiscriminator(section, discriminator));
+	}
+
+	static Object getDiscriminator(Section section) {
+		Object result = null;
+
+		if (Proxy.isProxyClass(section.getClass())) {
+			InvocationHandler handler = Proxy.getInvocationHandler(section);
+			if (handler instanceof SectionDiscriminator) {
+				result = ((SectionDiscriminator) handler).discriminator;
+			}
+		}
+
+		return result;
+	}
+
+	static boolean isDiscriminated(Section section) {
+		boolean result = false;
+
+		if ((section != null) && Proxy.isProxyClass(section.getClass())) {
+			InvocationHandler handler = Proxy.getInvocationHandler(section);
+			result = handler instanceof SectionDiscriminator;
+		}
+
+		return result;
+	}
+
+	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+		Object result = null;
+
+		if (method.getDeclaringClass() == Object.class) {
+			// Don't delegate equals(), hashCode(), and monitor protocol
+			if (method.getName().equals("equals")) { //$NON-NLS-1$
+				if ((args[0] != null) && Proxy.isProxyClass(args[0].getClass())) {
+					result = this.equals(Proxy.getInvocationHandler(args[0]));
+				} else {
+					result = proxy == args[0];
+				}
+			} else if (method.getName().equals("hashCode")) { //$NON-NLS-1$
+				result = this.hashCode();
+			} else {
+				result = method.invoke(this, args);
+			}
+		} else {
+			result = method.invoke(section, args);
+		}
+
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		boolean result = obj == this;
+		if (!result && (obj instanceof SectionDiscriminator)) {
+			SectionDiscriminator other = (SectionDiscriminator) obj;
+			result = other.section == this.section && other.discriminator.equals(this.discriminator);
+		}
+		return result;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + discriminator.hashCode();
+		result = prime * result + section.hashCode();
+		return result;
+	}
+
+}
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/TabModel.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/TabModel.java
index 678993b3e3f..4159a28e7e6 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/TabModel.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/TabModel.java
@@ -21,9 +21,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.eclipse.papyrus.views.properties.contexts.Section;
+
 
 /**
  * An encapsulation of the hierarchical tab structure of the property sheets managed by a {@link DisplayEngine}.
+ * It supports distinction of repeated {@code Section}s via proxies that combine section instances with
+ * arbitrary {@linkplain SectionDiscriminator discriminators}.
  */
 class TabModel<V> {
 
@@ -43,6 +47,10 @@ class TabModel<V> {
 		return Collections.unmodifiableSet(result);
 	}
 
+	public V get(Section section) {
+		return model.get(new Path(section));
+	}
+
 	public V get(String tabID, String sectionID) {
 		return model.get(new Path(tabID, sectionID));
 	}
@@ -60,10 +68,18 @@ class TabModel<V> {
 		return Collections.unmodifiableList(result);
 	}
 
+	public V put(Section section, V value) {
+		return model.put(new Path(section), value);
+	}
+
 	public V put(String tabID, String sectionID, V value) {
 		return model.put(new Path(tabID, sectionID), value);
 	}
 
+	public V remove(Section section) {
+		return model.remove(new Path(section));
+	}
+
 	public V remove(String tabID, String sectionID) {
 		return model.remove(new Path(tabID, sectionID));
 	}
@@ -105,12 +121,19 @@ class TabModel<V> {
 
 		final String sectionID;
 
-		Path(String tabID, String sectionID) {
+		final Object discriminator;
+
+		Path(String tabID, String sectionID, Object discriminator) {
 			checkWildcard(tabID);
 			checkWildcard(sectionID);
 
 			this.tabID = tabID;
 			this.sectionID = sectionID;
+			this.discriminator = (discriminator == null) ? WILDCARD : discriminator;
+		}
+
+		Path(String tabID, String sectionID) {
+			this(tabID, sectionID, WILDCARD);
 		}
 
 		/**
@@ -121,6 +144,14 @@ class TabModel<V> {
 
 			this.tabID = tabID;
 			this.sectionID = WILDCARD;
+			this.discriminator = WILDCARD;
+		}
+
+		/**
+		 * Create a path for a specific section.
+		 */
+		Path(Section section) {
+			this(section.getTab().getId(), section.getName(), SectionDiscriminator.getDiscriminator(section));
 		}
 
 		static void checkWildcard(String id) {
@@ -152,10 +183,10 @@ class TabModel<V> {
 			}
 
 			Path other = (Path) obj;
-			return equals(tabID, other.tabID) && equals(sectionID, other.sectionID);
+			return equals(tabID, other.tabID) && equals(sectionID, other.sectionID) && equals(discriminator, other.discriminator);
 		}
 
-		private static boolean equals(String anID, String anotherID) {
+		private static boolean equals(Object anID, Object anotherID) {
 			// Deliberately testing for identity of non-interned string
 			return (anID == WILDCARD) || (anotherID == WILDCARD) || anID.equals(anotherID);
 		}
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/AbstractPropertyEditor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/AbstractPropertyEditor.java
index e9992ebc3a7..d6f0fa7a712 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/AbstractPropertyEditor.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/AbstractPropertyEditor.java
@@ -10,6 +10,8 @@
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

  *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation

  *  Christian W. Damus (CEA) - bug 417409

+ *  Christian W. Damus (CEA) - bug 443417

+ *  Christian W. Damus (CEA) - bug 444227

  *

  *****************************************************************************/

 package org.eclipse.papyrus.views.properties.widgets;

@@ -234,7 +236,7 @@ public abstract class AbstractPropertyEditor implements IChangeListener, Customi
 	 */

 	protected void applyReadOnly(boolean readOnly) {

 		AbstractEditor editor = getEditor();

-		if (editor != null) {

+		if ((editor != null) && !editor.isDisposed()) {

 			editor.setReadOnly(readOnly);

 		}

 	}

@@ -309,13 +311,13 @@ public abstract class AbstractPropertyEditor implements IChangeListener, Customi
 		final DataSource oldInput = this.input;

 		if (input != oldInput) {

 			if (oldInput != null) {

-				oldInput.removeDataSourceListener(getDataSourceListener());

+				unhookDataSourceListener(oldInput);

 			}

 

 			this.input = input;

 

 			if (input != null) {

-				input.addDataSourceListener(getDataSourceListener());

+				hookDataSourceListener(input);

 			}

 

 			// Only do this after attaching our listener so that it will be ahead of

@@ -324,6 +326,14 @@ public abstract class AbstractPropertyEditor implements IChangeListener, Customi
 		}

 	}

 

+	protected void unhookDataSourceListener(DataSource oldInput) {

+		oldInput.removeDataSourceListener(getDataSourceListener());

+	}

+

+	protected void hookDataSourceListener(DataSource newInput) {

+		newInput.addDataSourceListener(getDataSourceListener());

+	}

+

 	/**

 	 * @return the input DataSource for this Property editor

 	 */

@@ -593,23 +603,36 @@ public abstract class AbstractPropertyEditor implements IChangeListener, Customi
 					// The data source's selection changed. Update my validator or clear it if now there is none

 					IObservableValue observable = AbstractPropertyEditor.this.observableValue;

 

-					if ((observable != null) && (modelValidator != null) && (valueEditor != null) && !valueEditor.isDisposed()) {

-						modelValidator = null;

+					if (observable != null) {

+						if ((modelValidator != null) && (valueEditor != null) && !valueEditor.isDisposed()) {

+							modelValidator = null;

+

+							// First, clear the validator to disable validation

+							valueEditor.setStrategies();

+							valueEditor.setModelValidator(null);

 

-						// First, clear the validator to disable validation

-						valueEditor.setStrategies();

-						valueEditor.setModelValidator(null);

+							// Then re-enable to later when ready for user input

+							observable.getRealm().asyncExec(new Runnable() {

+

+								public void run() {

+									if ((valueEditor != null) && !valueEditor.isDisposed()) {

+										valueEditor.setStrategies();

+										valueEditor.setModelValidator(getValidator());

+									}

+								}

+							});

+						}

 

-						// Then re-enable to later when ready for user input

-						observable.getRealm().asyncExec(new Runnable() {

+						// And refresh the read-only state

+						if ((propertyPath != null) && (input != null)) {

+							observable.getRealm().asyncExec(new Runnable() {

 

-							public void run() {

-								if ((valueEditor != null) && !valueEditor.isDisposed()) {

-									valueEditor.setStrategies();

-									valueEditor.setModelValidator(getValidator());

+								public void run() {

+									isEditable = input.isEditable(propertyPath);

+									applyReadOnly(getReadOnly());

 								}

-							}

-						});

+							});

+						}

 					}

 				}

 			};

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/ViewEditor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/ViewEditor.java
index f7b12dcca3b..c61609a6501 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/ViewEditor.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/ViewEditor.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

+ * 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

@@ -8,33 +8,46 @@
  *

  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 443417

+ *  Christian W. Damus (CEA) - bug 444227

+ *  

  *****************************************************************************/

 package org.eclipse.papyrus.views.properties.widgets;

 

-import java.util.Collection;

 import java.util.Collections;

-import java.util.LinkedList;

+import java.util.HashMap;

+import java.util.Iterator;

 import java.util.List;

+import java.util.Map;

 

 import org.eclipse.core.databinding.observable.IObservable;

 import org.eclipse.core.databinding.observable.list.IObservableList;

 import org.eclipse.core.databinding.observable.value.IObservableValue;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.infra.tools.databinding.MultipleObservableValue;

+import org.eclipse.papyrus.infra.tools.databinding.IMultipleObservableValue;

 import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;

 import org.eclipse.papyrus.views.properties.Activator;

 import org.eclipse.papyrus.views.properties.contexts.Context;

 import org.eclipse.papyrus.views.properties.contexts.Section;

 import org.eclipse.papyrus.views.properties.contexts.View;

+import org.eclipse.papyrus.views.properties.modelelement.DataSource;

+import org.eclipse.papyrus.views.properties.modelelement.DataSourceChangedEvent;

+import org.eclipse.papyrus.views.properties.modelelement.IDataSourceListener;

 import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;

 import org.eclipse.papyrus.views.properties.runtime.DefaultDisplayEngine;

 import org.eclipse.papyrus.views.properties.runtime.DisplayEngine;

 import org.eclipse.papyrus.views.properties.widgets.layout.PropertiesLayout;

 import org.eclipse.papyrus.views.properties.xwt.XWTSection;

 import org.eclipse.swt.SWT;

+import org.eclipse.swt.custom.ScrolledComposite;

+import org.eclipse.swt.events.DisposeEvent;

+import org.eclipse.swt.events.DisposeListener;

+import org.eclipse.swt.graphics.Point;

+import org.eclipse.swt.graphics.Rectangle;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Control;

+import org.eclipse.swt.widgets.ScrollBar;

 

 /**

  * An Editor for displaying a whole property {@link View} on a sub-object.

@@ -49,7 +62,11 @@ public class ViewEditor extends AbstractPropertyEditor {
 

 	private Composite self;

 

-	private Collection<XWTSection> sections;

+	private Map<Section, EditorSection> sections = new HashMap<Section, EditorSection>();

+

+	private DisplayEngine displayEngine;

+

+	private IDataSourceListener dataSourceListener;

 

 	/**

 	 * Constructor.

@@ -65,6 +82,25 @@ public class ViewEditor extends AbstractPropertyEditor {
 		layout.horizontalSpacing = 0;

 		layout.marginWidth = 0;

 		self.setLayout(layout);

+

+		addDisposeListener(self);

+	}

+

+	private void addDisposeListener(Control control) {

+		control.addDisposeListener(new DisposeListener() {

+

+			public void widgetDisposed(DisposeEvent e) {

+				disposeDisplayEngine();

+			}

+		});

+	}

+

+	private void disposeDisplayEngine() {

+		if (displayEngine != null) {

+			displayEngine.dispose();

+			displayEngine = null;

+			sections.clear();

+		}

 	}

 

 	@Override

@@ -74,6 +110,41 @@ public class ViewEditor extends AbstractPropertyEditor {
 		}

 	}

 

+	@Override

+	protected void unhookDataSourceListener(DataSource oldInput) {

+		oldInput.removeDataSourceListener(getDataSourceListener());

+		super.unhookDataSourceListener(oldInput);

+	}

+

+	@Override

+	protected void hookDataSourceListener(DataSource newInput) {

+		super.hookDataSourceListener(newInput);

+		newInput.addDataSourceListener(getDataSourceListener());

+	}

+

+	private IDataSourceListener getDataSourceListener() {

+		if (dataSourceListener == null) {

+			dataSourceListener = new IDataSourceListener() {

+

+				public void dataSourceChanged(DataSourceChangedEvent event) {

+					// The data source's selection changed. Re-display our nested sections, if appropriate

+					if ((self != null) && !self.isDisposed()) {

+						self.getDisplay().asyncExec(new Runnable() {

+

+							public void run() {

+								if (!self.isDisposed()) {

+									checkInput();

+								}

+							}

+						});

+					}

+				}

+			};

+		}

+

+		return dataSourceListener;

+	}

+

 	/**

 	 * Sets the number of columns for this editor. If the property is a list,

 	 * there will be one view per element in the list : these views will be

@@ -138,29 +209,86 @@ public class ViewEditor extends AbstractPropertyEditor {
 			return;

 		}

 

-		DisplayEngine display = new DefaultDisplayEngine(true);

-

-		sections = new LinkedList<XWTSection>();

+		if (displayEngine == null) {

+			displayEngine = new DefaultDisplayEngine(false);

+		}

 

+		// We need to be able to repeat sections, so use an arbitrary discriminator to

+		// present the same section multiple times as distinct sections

+		int index = 0;

 		if (observable instanceof IObservableValue) {

 			IObservableValue observableValue = (IObservableValue) observable;

-			if (observableValue instanceof MultipleObservableValue) {

-				MultipleObservableValue multipleObservable = (MultipleObservableValue) observableValue;

-				display(display, multipleObservable.getObservedValues(), view);

+			if (observableValue instanceof IMultipleObservableValue) {

+				IMultipleObservableValue multipleObservable = (IMultipleObservableValue) observableValue;

+				display(displayEngine, multipleObservable.getObservedValues(), view, index++);

 			} else {

 				Object value = observableValue.getValue();

-				display(display, value, view);

+				display(displayEngine, value, view, index++);

 			}

 		} else if (observable instanceof IObservableList) {

 			IObservableList observableList = (IObservableList) observable;

 			for (Object value : observableList) {

-				display(display, value, view);

+				display(displayEngine, value, view, index++);

+			}

+		}

+

+		// Any repeated sections that we had created for a previous selection and no longer need must be destroyed

+		purgeUnusedSections(index);

+

+		// A hack to force the containing scroll pane, if any (we expect to have one in the property sheet), to

+		// recompute its client area and scrollbars

+		for (Composite next = self; (next != null); next = next.getParent()) {

+			if (next.getParent() instanceof ScrolledComposite) {

+				final ScrolledComposite scrolled = (ScrolledComposite) next.getParent();

+				next.layout();

+				scrolled.layout();

+				scrolled.getDisplay().asyncExec(new Runnable() {

+

+					public void run() {

+						resizeScrolledComposite(scrolled);

+					}

+				});

 			}

 		}

 

 		updateControls();

 	}

 

+	private void purgeUnusedSections(int maxDiscriminator) {

+		for (Iterator<Section> iter = sections.keySet().iterator(); iter.hasNext();) {

+			Section section = iter.next();

+			Object discriminator = DefaultDisplayEngine.getDiscriminator(section);

+			if ((discriminator instanceof Number) && (((Number) discriminator).intValue() >= maxDiscriminator)) {

+				sections.get(section).dispose();

+				iter.remove();

+			}

+		}

+	}

+

+	/**

+	 * Recompute the size of a {@code scrolled} composite's client area and adjust its scroll bars accordingly.

+	 * 

+	 * @param scrolled

+	 *            a scrolled composite to force to adapt to a new layout

+	 */

+	private void resizeScrolledComposite(ScrolledComposite scrolled) {

+		Point sizeConstraint = scrolled.getContent().getSize();

+		sizeConstraint = scrolled.getContent().computeSize(SWT.DEFAULT, SWT.DEFAULT);

+		scrolled.setMinSize(sizeConstraint);

+

+		Rectangle clientArea = scrolled.getClientArea();

+

+		ScrollBar vbar = scrolled.getVerticalBar();

+		if (vbar != null) {

+			vbar.setPageIncrement(clientArea.height - 5);

+		}

+

+		ScrollBar hbar = scrolled.getHorizontalBar();

+		if (hbar != null) {

+			hbar.setPageIncrement(clientArea.width - 5);

+		}

+	}

+

 	/**

 	 * Displays the given view in the display engine, with the given object.

 	 *

@@ -173,8 +301,8 @@ public class ViewEditor extends AbstractPropertyEditor {
 	 * @param view

 	 *            The view to display

 	 */

-	protected void display(DisplayEngine display, Object data, View view) {

-		display(display, Collections.singletonList(data), view);

+	protected void display(DisplayEngine display, Object data, View view, Object discriminator) {

+		display(display, Collections.singletonList(data), view, discriminator);

 	}

 

 	/**

@@ -189,16 +317,20 @@ public class ViewEditor extends AbstractPropertyEditor {
 	 * @param view

 	 *            The view to display

 	 */

-	protected void display(DisplayEngine display, List<Object> selectedElements, View view) {

+	protected void display(DisplayEngine display, List<Object> selectedElements, View view, Object discriminator) {

 		for (Section section : view.getSections()) {

-			XWTSection xwtSection = new XWTSection(section, view, display);

-			sections.add(xwtSection);

+			// Distinguish this occurrence of the section

+			section = DefaultDisplayEngine.discriminate(section, discriminator);

+

+			EditorSection editorSection = sections.get(section);

+			if (editorSection == null) {

+				editorSection = new EditorSection(new XWTSection(section, view, display));

+				sections.put(section, editorSection);

+			}

 

 			ISelection selection = new StructuredSelection(selectedElements);

 

-			xwtSection.createControls(new Composite(self, SWT.NONE), null);

-			xwtSection.setInput(null, selection);

-			xwtSection.refresh();

+			editorSection.setInput(selection);

 		}

 	}

 

@@ -242,4 +374,35 @@ public class ViewEditor extends AbstractPropertyEditor {
 	public Control getControl() {

 		return self;

 	}

+

+	//

+	// Nested types

+	//

+

+	/**

+	 * An encapsulation of an XWT section with the composite that contains it within the {@link ViewEditor}'s parent composite.

+	 */

+	private class EditorSection {

+		private final XWTSection xwt;

+		private final Composite sectionComposite;

+

+		EditorSection(XWTSection xwt) {

+			this.xwt = xwt;

+			this.sectionComposite = new Composite(self, SWT.NONE);

+

+			xwt.createControls(sectionComposite, null);

+		}

+

+		void dispose() {

+			if (!sectionComposite.isDisposed()) {

+				xwt.dispose();

+				sectionComposite.dispose();

+			}

+		}

+

+		void setInput(ISelection selection) {

+			xwt.setInput(null, selection);

+			xwt.refresh();

+		}

+	}

 }

diff --git a/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF b/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF
index 56618bb33bb..cdbe1f58827 100644
--- a/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF
+++ b/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.views.validation.internal

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.ui,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.1.0",

  org.eclipse.emf.ecore;bundle-version="2.8.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.emf.edit.ui;bundle-version="2.8.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/plugins/views/validation/org.eclipse.papyrus.views.validation/pom.xml b/plugins/views/validation/org.eclipse.papyrus.views.validation/pom.xml
index 7d5667ce815..f4f5d1216e1 100644
--- a/plugins/views/validation/org.eclipse.papyrus.views.validation/pom.xml
+++ b/plugins/views/validation/org.eclipse.papyrus.views.validation/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.validation</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/xwt/org.eclipse.papyrus.xwt/META-INF/MANIFEST.MF b/plugins/xwt/org.eclipse.papyrus.xwt/META-INF/MANIFEST.MF
index dce2828e4b8..e2b63564f7a 100644
--- a/plugins/xwt/org.eclipse.papyrus.xwt/META-INF/MANIFEST.MF
+++ b/plugins/xwt/org.eclipse.papyrus.xwt/META-INF/MANIFEST.MF
@@ -32,7 +32,7 @@ Export-Package: org.eclipse.papyrus.xwt,
 Bundle-Vendor: %Bundle-Vendor.0

 DynamicImport-Package: *

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %Bundle-Name.0

 Bundle-Activator: org.eclipse.papyrus.xwt.internal.Activator

diff --git a/plugins/xwt/org.eclipse.papyrus.xwt/pom.xml b/plugins/xwt/org.eclipse.papyrus.xwt/pom.xml
index 72f7c6fcbf5..d783f3a4bb5 100644
--- a/plugins/xwt/org.eclipse.papyrus.xwt/pom.xml
+++ b/plugins/xwt/org.eclipse.papyrus.xwt/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../releng/top-pom-main.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.xwt</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/releng/dev/category.xml b/releng/dev/category.xml
index 8ad1de8ddc1..0087f860431 100755
--- a/releng/dev/category.xml
+++ b/releng/dev/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-	<feature id="org.eclipse.papyrus.dev.feature" url="features/org.eclipse.papyrus.dev.feature_1.0.1.qualifier.jar" version="1.0.1.qualifier">
+	<feature id="org.eclipse.papyrus.dev.feature" url="features/org.eclipse.papyrus.dev.feature_1.1.0.qualifier.jar" version="1.1.0.qualifier">
 		<category name="org.eclipse.papyrus.category"/>
 	</feature>
-	<feature id="org.eclipse.papyrus.dev.feature.source" url="features/org.eclipse.papyrus.dev.feature.source_1.0.1.qualifier.jar" version="1.0.1.qualifier">
+	<feature id="org.eclipse.papyrus.dev.feature.source" url="features/org.eclipse.papyrus.dev.feature.source_1.1.0.qualifier.jar" version="1.1.0.qualifier">
 		<category name="org.eclipse.papyrus.category"/>
 	</feature>
 	<category-def label="Papyrus Category" name="org.eclipse.papyrus.category">
diff --git a/releng/dev/pom.xml b/releng/dev/pom.xml
index 9cda4102b87..48ac34f4160 100755
--- a/releng/dev/pom.xml
+++ b/releng/dev/pom.xml
@@ -5,13 +5,13 @@
 	<parent>

 		<artifactId>org.eclipse.papyrus</artifactId>

 		<groupId>org.eclipse.papyrus</groupId>

-		<version>1.0.1-SNAPSHOT</version>

+		<version>1.1.0-SNAPSHOT</version>

 		<relativePath>../top-pom-dev.xml</relativePath>

 	</parent>

 

 	<artifactId>org.eclipse.papyrus.p2.dev</artifactId>

 	<groupId>org.eclipse.papyrus</groupId>

-	<version>1.0.1-SNAPSHOT</version>

+	<version>1.1.0-SNAPSHOT</version>

 	<packaging>eclipse-repository</packaging>

 

 	<build>

diff --git a/releng/extras/category.xml b/releng/extras/category.xml
index 158cc1d4660..7cde2e87cbe 100755
--- a/releng/extras/category.xml
+++ b/releng/extras/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-	<feature id="org.eclipse.papyrus.extra.feature" url="features/org.eclipse.papyrus.extra.feature_1.0.1.qualifier.jar" version="1.0.1.qualifier">
+	<feature id="org.eclipse.papyrus.extra.feature" url="features/org.eclipse.papyrus.extra.feature_1.1.0.qualifier.jar" version="1.1.0.qualifier">
 		<category name="org.eclipse.papyrus.category"/>
 	</feature>
-	<feature id="org.eclipse.papyrus.extra.feature.source" url="features/org.eclipse.papyrus.extra.feature.source_1.0.1.qualifier.jar" version="1.0.1.qualifier">
+	<feature id="org.eclipse.papyrus.extra.feature.source" url="features/org.eclipse.papyrus.extra.feature.source_1.1.0.qualifier.jar" version="1.1.0.qualifier">
 		<category name="org.eclipse.papyrus.category"/>
 	</feature>
 	<category-def label="Papyrus Category" name="org.eclipse.papyrus.category">
diff --git a/releng/extras/pom.xml b/releng/extras/pom.xml
index 8af387fcf5e..9de5d9ceca7 100755
--- a/releng/extras/pom.xml
+++ b/releng/extras/pom.xml
@@ -5,13 +5,13 @@
 	<parent>

 		<artifactId>org.eclipse.papyrus</artifactId>

 		<groupId>org.eclipse.papyrus</groupId>

-		<version>1.0.1-SNAPSHOT</version>

+		<version>1.1.0-SNAPSHOT</version>

 		<relativePath>../top-pom-extras.xml</relativePath>

 	</parent>

 

 	<artifactId>org.eclipse.papyrus.p2.extras</artifactId>

 	<groupId>org.eclipse.papyrus</groupId>

-	<version>1.0.1-SNAPSHOT</version>

+	<version>1.1.0-SNAPSHOT</version>

 	<packaging>eclipse-repository</packaging>

 

 	<build>

diff --git a/releng/main/category.xml b/releng/main/category.xml
index f0b7e0b293f..caf817db337 100755
--- a/releng/main/category.xml
+++ b/releng/main/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-	<feature id="org.eclipse.papyrus.sdk.feature" url="features/org.eclipse.papyrus.sdk.feature_1.0.1.qualifier.jar" version="1.0.1.qualifier">
+	<feature id="org.eclipse.papyrus.sdk.feature" url="features/org.eclipse.papyrus.sdk.feature_1.1.0.qualifier.jar" version="1.1.0.qualifier">
 		<category name="org.eclipse.papyrus.category"/>
 	</feature>
-	<feature id="org.eclipse.papyrus.sdk.feature.source" url="features/org.eclipse.papyrus.sdk.feature.source_1.0.1.qualifier.jar" version="1.0.1.qualifier">
+	<feature id="org.eclipse.papyrus.sdk.feature.source" url="features/org.eclipse.papyrus.sdk.feature.source_1.1.0.qualifier.jar" version="1.1.0.qualifier">
 		<category name="org.eclipse.papyrus.category"/>
 	</feature>
 	<category-def label="Papyrus Category" name="org.eclipse.papyrus.category">
diff --git a/releng/main/pom.xml b/releng/main/pom.xml
index 34e15014c8b..ade4ca4f193 100755
--- a/releng/main/pom.xml
+++ b/releng/main/pom.xml
@@ -5,13 +5,13 @@
 	<parent>

 		<artifactId>org.eclipse.papyrus</artifactId>

 		<groupId>org.eclipse.papyrus</groupId>

-		<version>1.0.1-SNAPSHOT</version>

+		<version>1.1.0-SNAPSHOT</version>

 		<relativePath>../top-pom-main.xml</relativePath>

 	</parent>

 

 	<artifactId>org.eclipse.papyrus.p2.main</artifactId>

 	<groupId>org.eclipse.papyrus</groupId>

-	<version>1.0.1-SNAPSHOT</version>

+	<version>1.1.0-SNAPSHOT</version>

 	<packaging>eclipse-repository</packaging>

 

 	<build>

diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap
index 7932f414c73..8490eab878f 100644
--- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap
+++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap
@@ -155,7 +155,7 @@
     <!-- Birt -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("BIRT",0) -->

-      <rm:uri format="{0}/birt/update-site/4.4/">

+      <rm:uri format="{0}/birt/update-site/luna-interim/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -179,7 +179,7 @@
     <!-- EMFT MWE -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMFT MWE",0) -->

-      <rm:uri format="{0}/modeling/emft/mwe/updates/milestones/S201408190419/mwe">

+      <rm:uri format="{0}/modeling/emft/mwe/updates/releases/R201409021027/mwe">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -195,7 +195,7 @@
     <!-- M2T Acceleo -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("M2T ACCELEO",0) -->

-      <rm:uri format="{0}/acceleo/updates/milestones/3.5/S201406101309">

+      <rm:uri format="{0}/acceleo/updates/milestones/3.5/S201409021433">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -203,7 +203,7 @@
     <!-- MDT OCL -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("MDT OCL 5.0",0) -->

-      <rm:uri format="{0}/modeling/mdt/ocl/updates/maintenance/5.0.2/S201408191529">

+      <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.2/S201409011459">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -243,7 +243,7 @@
     <!-- Xtext, Xtend -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("Xtext, Xtend",0) -->

-      <rm:uri format="{0}/modeling/tmf/xtext/updates/milestones/head/S201408190707">

+      <rm:uri format="{0}/modeling/tmf/xtext/updates/releases/head/R201409090713">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -322,7 +322,7 @@
     <!-- WST -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("WebTools",0) -->

-      <rm:uri format="{0}/webtools/downloads/drops/R3.6.0/R-3.6.0-20140602160322/repository/">

+      <rm:uri format="{0}/webtools/downloads/drops/R3.6.1/M-3.6.1RC3-20140908000031/repository/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -338,7 +338,7 @@
     <!-- Eclipse Platform Milestones -->

 	<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

 		<!-- updateFrom("Eclipse",0) -->

-		<rm:uri format="{0}/eclipse/updates/4.4milestones/M-4.4.1RC1-201408130800/">

+		<rm:uri format="{0}/eclipse/updates/4.4milestones/M-4.4.1RC3-201409031600/">

 			<bc:propertyRef key="eclipse.downloads"/>

 		</rm:uri>

 	</rm:provider>

diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap
index 479a1402ce9..8e0a7c0f74d 100644
--- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap
+++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap
@@ -255,7 +255,7 @@
     <!-- Birt -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("BIRT",0) -->

-      <rm:uri format="{0}/birt/update-site/4.4/">

+      <rm:uri format="{0}/birt/update-site/luna-interim/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -279,7 +279,7 @@
     <!-- EMFT MWE -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMFT MWE",0) -->

-      <rm:uri format="{0}/modeling/emft/mwe/updates/milestones/S201408190419/mwe">

+      <rm:uri format="{0}/modeling/emft/mwe/updates/releases/R201409021027/mwe">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -302,7 +302,7 @@
     <!-- M2T Acceleo -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("M2T ACCELEO",0) -->

-      <rm:uri format="{0}/acceleo/updates/milestones/3.5/S201406101309">

+      <rm:uri format="{0}/acceleo/updates/milestones/3.5/S201409021433">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -310,7 +310,7 @@
     <!-- MDT OCL -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("MDT OCL 5.0",0) -->

-      <rm:uri format="{0}/modeling/mdt/ocl/updates/maintenance/5.0.2/S201408191529">

+      <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.2/S201409011459">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -350,7 +350,7 @@
     <!-- Xtext, Xtend -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("Xtext, Xtend",0) -->

-      <rm:uri format="{0}/modeling/tmf/xtext/updates/milestones/head/S201408190707">

+      <rm:uri format="{0}/modeling/tmf/xtext/updates/releases/head/R201409090713">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -440,7 +440,7 @@
     <!-- WST -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("WebTools",0) -->

-      <rm:uri format="{0}/webtools/downloads/drops/R3.6.0/R-3.6.0-20140602160322/repository/">

+      <rm:uri format="{0}/webtools/downloads/drops/R3.6.1/M-3.6.1RC3-20140908000031/repository/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -448,7 +448,7 @@
     <!-- Eclipse Platform Milestones -->

 	<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

 		<!-- updateFrom("Eclipse",0) -->

-		<rm:uri format="{0}/eclipse/updates/4.4milestones/M-4.4.1RC1-201408130800/">

+		<rm:uri format="{0}/eclipse/updates/4.4milestones/M-4.4.1RC3-201409031600/">

 			<bc:propertyRef key="eclipse.downloads"/>

 		</rm:uri>

 	</rm:provider>

diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap
index 9e876ddaa6c..07e9e9eb8cc 100644
--- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap
+++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap
@@ -198,7 +198,7 @@
     <!-- Birt -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("BIRT",0) -->

-      <rm:uri format="{0}/birt/update-site/4.4/">

+      <rm:uri format="{0}/birt/update-site/luna-interim/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -222,7 +222,7 @@
     <!-- EMFT MWE -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMFT MWE",0) -->

-      <rm:uri format="{0}/modeling/emft/mwe/updates/milestones/S201408190419/mwe">

+      <rm:uri format="{0}/modeling/emft/mwe/updates/releases/R201409021027/mwe">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -246,7 +246,7 @@
     <!-- M2T Acceleo -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("M2T ACCELEO",0) -->

-      <rm:uri format="{0}/acceleo/updates/milestones/3.5/S201406101309">

+      <rm:uri format="{0}/acceleo/updates/milestones/3.5/S201409021433">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -254,7 +254,7 @@
     <!-- MDT OCL -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("MDT OCL 5.0",0) -->

-      <rm:uri format="{0}/modeling/mdt/ocl/updates/maintenance/5.0.2/S201408191529">

+      <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.2/S201409011459">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -286,7 +286,7 @@
     <!-- Xtext, Xtend -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("Xtext, Xtend",0) -->

-      <rm:uri format="{0}/modeling/tmf/xtext/updates/milestones/head/S201408190707">

+      <rm:uri format="{0}/modeling/tmf/xtext/updates/releases/head/R201409090713">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -366,7 +366,7 @@
     <!-- WST -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("WebTools",0) -->

-      <rm:uri format="{0}/webtools/downloads/drops/R3.6.0/R-3.6.0-20140602160322/repository/">

+      <rm:uri format="{0}/webtools/downloads/drops/R3.6.1/M-3.6.1RC3-20140908000031/repository/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -374,7 +374,7 @@
     <!-- Eclipse Platform Milestones -->

 	<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

 		<!-- updateFrom("Eclipse",0) -->

-		<rm:uri format="{0}/eclipse/updates/4.4milestones/M-4.4.1RC1-201408130800/">

+		<rm:uri format="{0}/eclipse/updates/4.4milestones/M-4.4.1RC3-201409031600/">

 			<bc:propertyRef key="eclipse.downloads"/>

 		</rm:uri>

 	</rm:provider>

diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap
index 803cc5bcd41..9d9705afe6b 100644
--- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap
+++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap
@@ -401,7 +401,7 @@
     <!-- Birt -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("BIRT",0) -->

-      <rm:uri format="{0}/birt/update-site/4.4/">

+      <rm:uri format="{0}/birt/update-site/luna-interim/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -425,7 +425,7 @@
     <!-- EMFT MWE -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMFT MWE",0) -->

-      <rm:uri format="{0}/modeling/emft/mwe/updates/milestones/S201408190419/mwe">

+      <rm:uri format="{0}/modeling/emft/mwe/updates/releases/R201409021027/mwe">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -449,7 +449,7 @@
     <!-- M2T Acceleo -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("M2T ACCELEO",0) -->

-      <rm:uri format="{0}/acceleo/updates/milestones/3.5/S201406101309">

+      <rm:uri format="{0}/acceleo/updates/milestones/3.5/S201409021433">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -457,7 +457,7 @@
     <!-- MDT OCL -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("MDT OCL 5.0",0) -->

-      <rm:uri format="{0}/modeling/mdt/ocl/updates/maintenance/5.0.2/S201408191529">

+      <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.2/S201409011459">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>    

@@ -489,7 +489,7 @@
     <!-- Xtext, Xtend -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("Xtext, Xtend",0) -->

-      <rm:uri format="{0}/modeling/tmf/xtext/updates/milestones/head/S201408190707">

+      <rm:uri format="{0}/modeling/tmf/xtext/updates/releases/head/R201409090713">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -569,7 +569,7 @@
     <!-- WST -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("WebTools",0) -->

-      <rm:uri format="{0}/webtools/downloads/drops/R3.6.0/R-3.6.0-20140602160322/repository/">

+      <rm:uri format="{0}/webtools/downloads/drops/R3.6.1/M-3.6.1RC3-20140908000031/repository/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -577,7 +577,7 @@
     <!-- Eclipse Platform Milestones -->

 	<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

 		<!-- updateFrom("Eclipse",0) -->

-		<rm:uri format="{0}/eclipse/updates/4.4milestones/M-4.4.1RC1-201408130800/">

+		<rm:uri format="{0}/eclipse/updates/4.4milestones/M-4.4.1RC3-201409031600/">

 			<bc:propertyRef key="eclipse.downloads"/>

 		</rm:uri>

 	</rm:provider>

diff --git a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
index e64cfb7a0fa..4ee467cd2e6 100644
--- a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
+++ b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
@@ -34,9 +34,6 @@
     <requirement
         name="org.eclipse.pde.api.tools.ee.feature.feature.group"/>
     <requirement
-        name="org.eclipse.emf.ecoretools.sdk.feature.group"
-        versionRange="[1.0.0,2.0.0)"/>
-    <requirement
         name="org.eclipse.mylyn.ide_feature.feature.group"/>
     <requirement
         name="org.eclipse.mylyn.java_feature.feature.group"/>
@@ -73,8 +70,6 @@
     <repository
         url="http://download.eclipse.org/tools/buckminster/updates-4.4"/>
     <repository
-        url="http://download.eclipse.org/modeling/emft/ecoretools/updates/1.2/201306071421"/>
-    <repository
         url="http://download.eclipse.org/technology/swtbot/snapshots"/>
   </setupTask>
   <setupTask
@@ -96,10 +91,15 @@
     <requirement
         name="net.sf.eclipsecs.feature.group"
         optional="true"/>
+    <requirement
+        name="edu.umd.cs.findbugs.plugin.eclipse.feature.group"
+        optional="true"/>
     <repository
         url="http://update.eclemma.org/"/>
     <repository
         url="http://eclipse-cs.sourceforge.net/update/"/>
+    <repository
+        url="http://findbugs.cs.umd.edu/eclipse/"/>
   </setupTask>
   <setupTask
       xsi:type="setup:EclipseIniTask"
@@ -107,12 +107,6 @@
       value="2048m"
       vm="true"/>
   <setupTask
-      xsi:type="setup:EclipseIniTask"
-      id=""
-      option="-Doomph.redirection.papyrussetups"
-      value="=http://git.eclipse.org/c/papyrus/org.eclipse.papyrus.git/plain/releng/org.eclipse.papyrus.oomph/setups/->${papyrus.git.clone.location|uri}/releng/org.eclipse.papyrus.oomph/setups/"
-      vm="true"/>
-  <setupTask
       xsi:type="setup:ResourceCreationTask"
       excludedTriggers="STARTUP MANUAL"
       content="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;section name=&quot;Workbench&quot;>&#xD;&#xA;&#x9;&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>&#xD;&#xA;&#x9;&lt;/section>&#xD;&#xA;&lt;/section>&#xD;&#xA;"
@@ -135,78 +129,6 @@
         value="2"/>
     <setupTask
         xsi:type="setup:CompoundTask"
-        name="org.eclipse.jdt.core">
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance"
-          value="1.6"/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.fieldSuffixes"
-          value=""/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.localPrefixes"
-          value=""/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFieldPrefixes"
-          value=""/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes"
-          value=""/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.argumentSuffixes"
-          value=""/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes"
-          value=""/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform"
-          value="1.6"/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFieldSuffixes"
-          value=""/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.argumentPrefixes"
-          value=""/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.localSuffixes"
-          value=""/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.fieldPrefixes"
-          value=""/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source"
-          value="1.6"/>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:CompoundTask"
-        name="org.eclipse.jdt.ui">
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.overrideannotation"
-          value="true"/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.gettersetter.use.is"
-          value="true"/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.exception.name"
-          value="e"/>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:CompoundTask"
         name="org.eclipse.pde.api.tools">
       <setupTask
           xsi:type="setup:PreferenceTask"
@@ -255,11 +177,212 @@
       xsi:type="setup.targlets:TargletTask">
     <targlet
         name="Papyrus Main Dependencies"
-        activeRepositoryList="">
+        activeRepositoryList="${eclipse.target.platform}">
       <requirement
           name="org.eclipse.sdk.feature.group"/>
       <requirement
           name="org.eclipse.acceleo.feature.group"/>
+      <requirement
+          name="org.eclipse.uml2.sdk.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.sdk.feature.group"/>
+      <repositoryList
+          name="Mars">
+        <repository
+            url="http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M1-201408062000/">
+          <annotation
+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+            <detail
+                key="updateFrom">
+              <value>Eclipse</value>
+            </detail>
+          </annotation>
+        </repository>
+        <repository
+            url="${base.downloads.url}/tools/orbit/downloads/drops/R20140525021250/repository"/>
+        <repository
+            url="http://download.eclipse.org/modeling/emf/emf/updates/milestones/">
+          <annotation
+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+            <detail
+                key="updateFrom">
+              <value>EMF (Core)</value>
+            </detail>
+          </annotation>
+        </repository>
+        <repository
+            url="http://download.eclipse.org/modeling/emf/transaction/updates/milestones/S201408201707">
+          <annotation
+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+            <detail
+                key="updateFrom">
+              <value>EMF TRANSACTION</value>
+            </detail>
+          </annotation>
+        </repository>
+        <repository
+            url="http://download.eclipse.org/modeling/emf/validation/updates/milestones/S201408201628">
+          <annotation
+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+            <detail
+                key="updateFrom">
+              <value>EMF VALIDATION</value>
+            </detail>
+          </annotation>
+        </repository>
+        <repository
+            url="http://download.eclipse.org/modeling/emf/query/updates/milestones/S201408201604/">
+          <annotation
+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+            <detail
+                key="updateFrom">
+              <value>EMF QUERY</value>
+            </detail>
+          </annotation>
+        </repository>
+        <repository
+            url="http://download.eclipse.org/tools/gef/updates/milestones">
+          <annotation
+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+            <detail
+                key="updateFrom">
+              <value>GEF</value>
+            </detail>
+          </annotation>
+        </repository>
+        <repository
+            url="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201408201749">
+          <annotation
+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+            <detail
+                key="updateFrom">
+              <value>GMF Runtime</value>
+            </detail>
+          </annotation>
+        </repository>
+        <repository
+            url="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201408201631">
+          <annotation
+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+            <detail
+                key="updateFrom">
+              <value>GMF Notation</value>
+            </detail>
+          </annotation>
+        </repository>
+        <repository
+            url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.2.RC4a">
+          <annotation
+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+            <detail
+                key="updateFrom">
+              <value>GMF Tooling</value>
+            </detail>
+          </annotation>
+        </repository>
+        <repository
+            url="http://download.eclipse.org/modeling/emft/mwe/updates/releases/R201406110919/mwe">
+          <annotation
+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+            <detail
+                key="updateFrom">
+              <value>EMFT MWE</value>
+            </detail>
+          </annotation>
+        </repository>
+        <repository
+            url="http://download.eclipse.org/modeling/emft/mwe/updates/releases/R201406120758/mwe2lang">
+          <annotation
+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+            <detail
+                key="updateFrom">
+              <value>EMFT MWE:1</value>
+            </detail>
+          </annotation>
+        </repository>
+        <repository
+            url="http://download.eclipse.org/mmt/qvto/updates/milestones/3.4.0/S201406101621">
+          <annotation
+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+            <detail
+                key="updateFrom">
+              <value>QVT Operational</value>
+            </detail>
+          </annotation>
+        </repository>
+        <repository
+            url="http://download.eclipse.org/acceleo/updates/milestones/3.6/S201408190816">
+          <annotation
+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+            <detail
+                key="updateFrom">
+              <value>M2T ACCELEO</value>
+            </detail>
+          </annotation>
+        </repository>
+        <repository
+            url="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/5.1.0/S201408191307">
+          <annotation
+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+            <detail
+                key="updateFrom">
+              <value>MDT OCL 5.1</value>
+            </detail>
+          </annotation>
+        </repository>
+        <repository
+            url="http://download.eclipse.org/modeling/mdt/uml2/updates/5.0">
+          <annotation
+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+            <detail
+                key="updateFrom">
+              <value>MDT UML2</value>
+            </detail>
+          </annotation>
+        </repository>
+        <repository
+            url="http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201406030414/">
+          <annotation
+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+            <detail
+                key="updateFrom">
+              <value>M2T XPAND</value>
+            </detail>
+          </annotation>
+        </repository>
+        <repository
+            url="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/maintenance/R201407030533/">
+          <annotation
+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+            <detail
+                key="updateFrom">
+              <value>Xtext, Xtend</value>
+            </detail>
+          </annotation>
+        </repository>
+        <repository
+            url="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.1/S201408190703">
+          <annotation
+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+            <detail
+                key="updateFrom">
+              <value>EMF COMPARE</value>
+            </detail>
+          </annotation>
+        </repository>
+        <repository
+            url="http://download.eclipse.org/webtools/downloads/drops/R3.7.0/I-3.7.0-20140902101238/repository/">
+          <annotation
+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+            <detail
+                key="updateFrom">
+              <value>WebTools</value>
+            </detail>
+          </annotation>
+        </repository>
+        <repository
+            url="${base.downloads.url}/nattable/releases/1.1.0/repository/"/>
+      </repositoryList>
       <repositoryList
           name="Luna">
         <repository
@@ -283,10 +406,6 @@
         <repository
             url="${base.downloads.url}/modeling/gmp/gmf-tooling/updates/releases"/>
         <repository
-            url="${base.downloads.url}/birt/update-site/4.4/"/>
-        <repository
-            url="${base.downloads.url}/mmt/atl/updates/releases/3.5/"/>
-        <repository
             url="${base.downloads.url}/modeling/emft/mwe/updates/releases/R201405200714/mwe"/>
         <repository
             url="${base.downloads.url}/mmt/qvto/updates/releases/3.4.0"/>
@@ -297,8 +416,6 @@
         <repository
             url="${base.downloads.url}/modeling/mdt/uml2/updates/5.0"/>
         <repository
-            url="${base.downloads.url}/mylyn/releases/3.12"/>
-        <repository
             url="${base.downloads.url}/modeling/m2t/xpand/updates/releases/R201406030414/"/>
         <repository
             url="${base.downloads.url}/modeling/tmf/xtext/updates/releases/head/R201405210727/"/>
@@ -311,11 +428,38 @@
       </repositoryList>
     </targlet>
     <targlet
+        name="Papyrus Test Dependencies"
+        activeRepositoryList="${eclipse.target.platform}">
+      <requirement
+          name="org.eclipse.swtbot.feature.group"/>
+      <requirement
+          name="org.eclipse.swtbot.eclipse.feature.group"/>
+      <requirement
+          name="org.eclipse.swtbot.eclipse.gef.feature.group"/>
+      <requirement
+          name="org.eclipse.swtbot.forms.feature.group"/>
+      <repositoryList
+          name="Mars">
+        <repository
+            url="${base.downloads.url}/technology/swtbot/snapshots"/>
+      </repositoryList>
+      <repositoryList
+          name="Luna">
+        <repository
+            url="${base.downloads.url}/technology/swtbot/snapshots"/>
+      </repositoryList>
+    </targlet>
+    <targlet
         name="Papyrus Main Plug-ins"
-        activeRepositoryList="">
+        activeRepositoryList="${eclipse.target.platform}">
       <requirement
           name="org.eclipse.papyrus.sdk.feature.feature.group"/>
       <repositoryList
+          name="Mars">
+        <repository
+            url="https://hudson.eclipse.org/papyrus/job/Papyrus-Master/lastSuccessfulBuild/artifact/releng/main/target/repository/"/>
+      </repositoryList>
+      <repositoryList
           name="Luna">
         <repository
             url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/luna"/>
@@ -323,12 +467,17 @@
     </targlet>
     <targlet
         name="Diagnostic/Debug Tools"
-        activeRepositoryList=""
+        activeRepositoryList="${eclipse.target.platform}"
         includeSources="false">
       <requirement
           name="org.eclipse.swt.tools"
           optional="true"/>
       <repositoryList
+          name="Mars">
+        <repository
+            url="http://www.eclipse.org/swt/updates/4.4"/>
+      </repositoryList>
+      <repositoryList
           name="Luna">
         <repository
             url="http://www.eclipse.org/swt/updates/4.4"/>
@@ -387,17 +536,21 @@
     </setupTask>
     <setupTask
         xsi:type="mylyn:MylynBuildsTask"
-        serverURL="https://hudson.eclipse.org/hudson/"
+        serverURL="https://hudson.eclipse.org/papyrus/"
         userID="${bugzilla.id}"
         password="${eclipse.user.password}">
       <buildPlan
-          name="papyrus-trunk-nightly"/>
+          name="Papyrus-Master"/>
+      <buildPlan
+          name="Papyrus-Master-Tests"/>
+      <buildPlan
+          name="Papyrus-Master-Extra"/>
       <buildPlan
-          name="papyrus-trunk-nightly-tests"/>
+          name="Papyrus-Master-Extra-Tests"/>
       <buildPlan
-          name="papyrus-trunk-extra-nightly"/>
+          name="Papyrus-Luna"/>
       <buildPlan
-          name="papyrus-trunk-extra-nightly-tests"/>
+          name="Papyrus-Luna-Tests"/>
     </setupTask>
   </setupTask>
   <setupTask
@@ -417,26 +570,6 @@
   </setupTask>
   <project name="main"
       label="Main">
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Papyrus Test Dependencies"
-          activeRepositoryList="">
-        <requirement
-            name="org.eclipse.swtbot.feature.group"/>
-        <requirement
-            name="org.eclipse.swtbot.eclipse.feature.group"/>
-        <requirement
-            name="org.eclipse.swtbot.eclipse.gef.feature.group"/>
-        <requirement
-            name="org.eclipse.swtbot.forms.feature.group"/>
-        <repositoryList
-            name="Luna">
-          <repository
-              url="${base.downloads.url}/technology/swtbot/snapshots"/>
-        </repositoryList>
-      </targlet>
-    </setupTask>
     <project
         name="infra"
         label="Infra">
@@ -477,7 +610,20 @@
         <sourceLocator
             rootFolder="${papyrus.git.clone.location/tests/junit/plugins/infra}"/>
         <sourceLocator
-            rootFolder="${papyrus.git.clone.location/tests/junit/plugins/core}"/>
+            rootFolder="${papyrus.git.clone.location/tests/junit/plugins/core}">
+          <predicate
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.tests"/>
+          </predicate>
+        </sourceLocator>
+        <sourceLocator
+            rootFolder="${papyrus.git.clone.location/features}">
+          <predicate
+              xsi:type="predicates:NamePredicate"
+              pattern="org\.eclipse\.papyrus\.(tests\.)?infra($|\..+)"/>
+        </sourceLocator>
       </setupTask>
       <setupTask
           xsi:type="setup.workingsets:WorkingSetTask">
@@ -487,14 +633,11 @@
           <predicate
               xsi:type="predicates:AndPredicate">
             <operand
-                xsi:type="predicates:OrPredicate">
-              <operand
-                  xsi:type="predicates:LocationPredicate"
-                  pattern="${papyrus.git.clone.location/plugins/infra/.*}"/>
-              <operand
-                  xsi:type="predicates:LocationPredicate"
-                  pattern="${papyrus.git.clone.location/plugins/editor/.*}"/>
-            </operand>
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.infra.core"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
             <operand
                 xsi:type="predicates:OrPredicate">
               <operand
@@ -509,7 +652,7 @@
             </operand>
             <operand
                 xsi:type="workingsets:ExclusionPredicate"
-                excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.1 //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.2 //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.3 //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.4"/>
+                excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.1 //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.2 //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.3 //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.5 //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.4"/>
           </predicate>
         </workingSet>
         <workingSet
@@ -518,14 +661,17 @@
           <predicate
               xsi:type="predicates:AndPredicate">
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/plugins/infra/.*}"/>
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.infra.gmfdiag.common"/>
             <operand
-                xsi:type="predicates:OrPredicate">
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.infra\.gmfdiag($|\..+)"/>
-            </operand>
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.infra\.gmfdiag($|\..+)"/>
+            <operand
+                xsi:type="workingsets:ExclusionPredicate"
+                excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.5"/>
           </predicate>
         </workingSet>
         <workingSet
@@ -534,14 +680,17 @@
           <predicate
               xsi:type="predicates:AndPredicate">
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/plugins/infra/.*}"/>
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.infra.nattable"/>
             <operand
-                xsi:type="predicates:OrPredicate">
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.infra\.(?:emf\.)?nattable($|\..+)"/>
-            </operand>
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.infra\.(?:emf\.)?nattable($|\..+)"/>
+            <operand
+                xsi:type="workingsets:ExclusionPredicate"
+                excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.5"/>
           </predicate>
         </workingSet>
         <workingSet
@@ -550,14 +699,17 @@
           <predicate
               xsi:type="predicates:AndPredicate">
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/plugins/infra/.*}"/>
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.infra.services.labelprovider"/>
             <operand
-                xsi:type="predicates:OrPredicate">
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.infra\.services($|\..+)"/>
-            </operand>
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.infra\.services($|\..+)"/>
+            <operand
+                xsi:type="workingsets:ExclusionPredicate"
+                excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.5"/>
           </predicate>
         </workingSet>
         <workingSet
@@ -566,37 +718,73 @@
           <predicate
               xsi:type="predicates:AndPredicate">
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/plugins/infra/.*}"/>
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.infra.viewpoints.policy"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.infra\.viewpoints($|\..+)"/>
+            <operand
+                xsi:type="workingsets:ExclusionPredicate"
+                excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.5"/>
+          </predicate>
+        </workingSet>
+        <workingSet
+            name="Papyrus Infra Tests"
+            id="papyrus-infra-tests">
+          <predicate
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.infra.core.tests"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
             <operand
                 xsi:type="predicates:OrPredicate">
               <operand
                   xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.infra\.viewpoints($|\..+)"/>
+                  pattern="org\.eclipse\.papyrus\.infra(\..+)?\.tests"/>
+              <operand
+                  xsi:type="predicates:NamePredicate"
+                  pattern="org\.eclipse\.papyrus\.editor\.integration\.tests"/>
             </operand>
           </predicate>
         </workingSet>
         <workingSet
-            name="Papyrus Infra Tests"
-            id="papyrus-infra-tests">
+            name="Papyrus Infra Features"
+            id="papyrus-infra-features">
           <predicate
-              xsi:type="predicates:OrPredicate">
+              xsi:type="predicates:AndPredicate">
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/tests/junit/plugins/core/.*}"/>
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.infra.core.feature"/>
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/tests/junit/plugins/infra/.*}"/>
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.FeatureNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus(\.tests)?\.infra($|\..+)"/>
           </predicate>
         </workingSet>
       </setupTask>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
     </project>
     <project
@@ -610,6 +798,12 @@
             rootFolder="${papyrus.git.clone.location/plugins/xwt}"/>
         <sourceLocator
             rootFolder="${papyrus.git.clone.location/tests/junit/plugins/views}"/>
+        <sourceLocator
+            rootFolder="${papyrus.git.clone.location/features}">
+          <predicate
+              xsi:type="predicates:NamePredicate"
+              pattern="org\.eclipse\.papyrus\.(tests\.)?(views|xwt)($|\..+)"/>
+        </sourceLocator>
       </setupTask>
       <setupTask
           xsi:type="setup.workingsets:WorkingSetTask">
@@ -617,26 +811,69 @@
             name="Papyrus Views"
             id="papyrus-views">
           <predicate
-              xsi:type="predicates:OrPredicate">
+              xsi:type="predicates:AndPredicate">
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/plugins/views/.*}"/>
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.views.properties"/>
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/plugins/xwt/.*}"/>
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/tests/junit/plugins/views/.*}"/>
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.(views|xwt)($|\..+)"/>
+            <operand
+                xsi:type="workingsets:ExclusionPredicate"
+                excludedWorkingSet="//@projects[name='main']/@projects[name='views']/@setupTasks.1/@workingSets.1"/>
+          </predicate>
+        </workingSet>
+        <workingSet
+            name="Papyrus Views Tests"
+            id="papyrus-views-tests">
+          <predicate
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.views.modelexplorer.tests"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.views(\..+)?\.tests"/>
+          </predicate>
+        </workingSet>
+        <workingSet
+            name="Papyrus Views Features"
+            id="papyrus-views-features">
+          <predicate
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.views.properties.feature"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.FeatureNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.(tests\.)?(views|xwt)($|\..+)"/>
           </predicate>
         </workingSet>
       </setupTask>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
     </project>
     <project
@@ -649,14 +886,8 @@
           <predicate
               xsi:type="predicates:NotPredicate">
             <operand
-                xsi:type="predicates:OrPredicate">
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)"/>
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.uml\.textedit($|\..+)"/>
-            </operand>
+                xsi:type="predicates:NamePredicate"
+                pattern=".*\.(alf|textedit|xtext)($|\..+)"/>
           </predicate>
         </sourceLocator>
         <sourceLocator
@@ -664,13 +895,22 @@
           <predicate
               xsi:type="predicates:NotPredicate">
             <operand
-                xsi:type="predicates:OrPredicate">
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)"/>
+                xsi:type="predicates:NamePredicate"
+                pattern=".*\.(alf|textedit|xtext)($|\..+)"/>
+          </predicate>
+        </sourceLocator>
+        <sourceLocator
+            rootFolder="${papyrus.git.clone.location/features}">
+          <predicate
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.(tests\.)?uml($|\..+)"/>
+            <operand
+                xsi:type="predicates:NotPredicate">
               <operand
                   xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.uml\.textedit($|\..+)"/>
+                  pattern=".*\.(alf|textedit|xtext)($|\..+)"/>
             </operand>
           </predicate>
         </sourceLocator>
@@ -683,8 +923,20 @@
           <predicate
               xsi:type="predicates:AndPredicate">
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/plugins/uml/.*}"/>
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.uml.commands"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.uml($|\..+)"/>
+            <operand
+                xsi:type="predicates:NotPredicate">
+              <operand
+                  xsi:type="predicates:NamePredicate"
+                  pattern=".*\.(alf|textedit|xtext)($|\..+)"/>
+            </operand>
             <operand
                 xsi:type="workingsets:ExclusionPredicate"
                 excludedWorkingSet="//@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets.1 //@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets.2 //@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets.3"/>
@@ -696,11 +948,23 @@
           <predicate
               xsi:type="predicates:AndPredicate">
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/plugins/uml/.*}"/>
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.uml.diagram.common"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
             <operand
                 xsi:type="predicates:NamePredicate"
                 pattern="org\.eclipse\.papyrus\.uml\.diagram.*"/>
+            <operand
+                xsi:type="predicates:NotPredicate">
+              <operand
+                  xsi:type="predicates:NamePredicate"
+                  pattern=".*\.(alf|textedit|xtext)($|\..+)"/>
+            </operand>
+            <operand
+                xsi:type="workingsets:ExclusionPredicate"
+                excludedWorkingSet="//@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets.3"/>
           </predicate>
         </workingSet>
         <workingSet
@@ -709,28 +973,85 @@
           <predicate
               xsi:type="predicates:AndPredicate">
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/plugins/uml/.*}"/>
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.uml.nattable"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
             <operand
                 xsi:type="predicates:NamePredicate"
                 pattern="org\.eclipse\.papyrus\.uml\.nattable.*"/>
+            <operand
+                xsi:type="predicates:NotPredicate">
+              <operand
+                  xsi:type="predicates:NamePredicate"
+                  pattern=".*\.(alf|textedit|xtext)($|\..+)"/>
+            </operand>
+            <operand
+                xsi:type="workingsets:ExclusionPredicate"
+                excludedWorkingSet="//@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets.3"/>
           </predicate>
         </workingSet>
         <workingSet
             name="Papyrus UML Tests"
             id="papyrus-uml-tests">
           <predicate
-              xsi:type="predicates:LocationPredicate"
-              pattern="${papyrus.git.clone.location/tests/junit/plugins/uml/.*}"/>
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.uml.diagram.common.tests"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.uml(\..+)?\.tests"/>
+            <operand
+                xsi:type="predicates:NotPredicate">
+              <operand
+                  xsi:type="predicates:NamePredicate"
+                  pattern=".*\.alf.*|.*\.uml\.textedit.*"/>
+            </operand>
+          </predicate>
+        </workingSet>
+        <workingSet
+            name="Papyrus UML Features"
+            id="papyrus-uml-features">
+          <predicate
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.uml.feature"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.FeatureNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus(\.tests)?\.uml($|\..+)"/>
+            <operand
+                xsi:type="predicates:NotPredicate">
+              <operand
+                  xsi:type="predicates:NamePredicate"
+                  pattern=".*\.(alf|textedit|xtext)($|\..+)"/>
+            </operand>
+          </predicate>
         </workingSet>
       </setupTask>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
     </project>
     <project
@@ -750,6 +1071,12 @@
               xsi:type="predicates:NamePredicate"
               pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)"/>
         </sourceLocator>
+        <sourceLocator
+            rootFolder="${papyrus.git.clone.location/features}">
+          <predicate
+              xsi:type="predicates:NamePredicate"
+              pattern="org\.eclipse\.papyrus\.(tests\.)?uml\.alf($|\..+)"/>
+        </sourceLocator>
       </setupTask>
       <setupTask
           xsi:type="setup.workingsets:WorkingSetTask">
@@ -759,8 +1086,27 @@
           <predicate
               xsi:type="predicates:AndPredicate">
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/plugins/uml/.*}"/>
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.uml.alf.common"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)"/>
+          </predicate>
+        </workingSet>
+        <workingSet
+            name="Papyrus UML ALF Features"
+            id="papyrus-uml-alf-features">
+          <predicate
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.uml.alf.feature"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.FeatureNature"/>
             <operand
                 xsi:type="predicates:NamePredicate"
                 pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)"/>
@@ -769,11 +1115,19 @@
       </setupTask>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
     </project>
     <project
@@ -785,13 +1139,19 @@
             rootFolder="${papyrus.git.clone.location/plugins/uml}">
           <predicate
               xsi:type="predicates:NamePredicate"
-              pattern="org\.eclipse\.papyrus\.uml\.textedit($|\..+)"/>
+              pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)($|\..+)"/>
         </sourceLocator>
         <sourceLocator
             rootFolder="${papyrus.git.clone.location/tests/junit/plugins/uml}">
           <predicate
               xsi:type="predicates:NamePredicate"
-              pattern="org\.eclipse\.papyrus\.uml\.textedit($|\..+)"/>
+              pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)($|\..+)"/>
+        </sourceLocator>
+        <sourceLocator
+            rootFolder="${papyrus.git.clone.location/features}">
+          <predicate
+              xsi:type="predicates:NamePredicate"
+              pattern="org\.eclipse\.papyrus\.(tests\.)?uml\.(textedit|xtext)($|\..+)"/>
         </sourceLocator>
       </setupTask>
       <setupTask
@@ -802,21 +1162,48 @@
           <predicate
               xsi:type="predicates:AndPredicate">
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/plugins/uml/.*}"/>
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.uml.textedit.common.xtext"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
             <operand
                 xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.uml\.textedit($|\..+)"/>
+                pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)($|\..+)"/>
+          </predicate>
+        </workingSet>
+        <workingSet
+            name="Papyrus UML Text Editors Features"
+            id="papyrus-uml-text-features">
+          <predicate
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.uml.textedit.feature"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.FeatureNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)($|\..+)"/>
           </predicate>
         </workingSet>
       </setupTask>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
     </project>
     <project
@@ -828,6 +1215,15 @@
             rootFolder="${papyrus.git.clone.location/plugins/sysml}"/>
         <sourceLocator
             rootFolder="${papyrus.git.clone.location/tests/junit/plugins/sysml}"/>
+        <sourceLocator
+            rootFolder="${papyrus.git.clone.location/features}">
+          <predicate
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.(tests\.)?sysml($|\..+)"/>
+          </predicate>
+        </sourceLocator>
       </setupTask>
       <setupTask
           xsi:type="setup.workingsets:WorkingSetTask">
@@ -837,8 +1233,14 @@
           <predicate
               xsi:type="predicates:AndPredicate">
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/plugins/sysml/.*}"/>
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.sysml"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.sysml($|\..+)"/>
             <operand
                 xsi:type="workingsets:ExclusionPredicate"
                 excludedWorkingSet="//@projects[name='main']/@projects[name='sysml']/@setupTasks.1/@workingSets.1 //@projects[name='main']/@projects[name='sysml']/@setupTasks.1/@workingSets.2 //@projects[name='main']/@projects[name='sysml']/@setupTasks.1/@workingSets.3"/>
@@ -850,11 +1252,17 @@
           <predicate
               xsi:type="predicates:AndPredicate">
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/plugins/sysml/.*}"/>
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.sysml.diagram.common"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
             <operand
                 xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.sysml\.diagram.*"/>
+                pattern="org\.eclipse\.papyrus\.sysml\.diagram($|\..+)"/>
+            <operand
+                xsi:type="workingsets:ExclusionPredicate"
+                excludedWorkingSet="//@projects[name='main']/@projects[name='sysml']/@setupTasks.1/@workingSets.3"/>
           </predicate>
         </workingSet>
         <workingSet
@@ -863,28 +1271,67 @@
           <predicate
               xsi:type="predicates:AndPredicate">
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/plugins/sysml/.*}"/>
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.sysml.nattable"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
             <operand
                 xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.sysml\.nattable.*"/>
+                pattern="org\.eclipse\.papyrus\.sysml\.nattable($|\..+)"/>
+            <operand
+                xsi:type="workingsets:ExclusionPredicate"
+                excludedWorkingSet="//@projects[name='main']/@projects[name='sysml']/@setupTasks.1/@workingSets.3"/>
           </predicate>
         </workingSet>
         <workingSet
             name="Papyrus SysML Tests"
             id="papyrus-sysml-tests">
           <predicate
-              xsi:type="predicates:LocationPredicate"
-              pattern="${papyrus.git.clone.location/tests/junit/plugins/sysml/.*}"/>
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.sysml.tests"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.sysml(\..+)?\.tests"/>
+          </predicate>
+        </workingSet>
+        <workingSet
+            name="Papyrus SysML Features"
+            id="papyrus-sysml-features">
+          <predicate
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.sysml.feature"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.FeatureNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus(\.tests)?\.sysml($|\..+)"/>
+          </predicate>
         </workingSet>
       </setupTask>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
     </project>
     <project
@@ -900,6 +1347,15 @@
         </sourceLocator>
         <sourceLocator
             rootFolder="${papyrus.git.clone.location/tests/junit/plugins/facet}"/>
+        <sourceLocator
+            rootFolder="${papyrus.git.clone.location/features}">
+          <predicate
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.(tests\.)?emf\.facet($|\..+)"/>
+          </predicate>
+        </sourceLocator>
       </setupTask>
       <setupTask
           xsi:type="setup.workingsets:WorkingSetTask">
@@ -907,23 +1363,50 @@
             name="Papyrus EMF Facet"
             id="papyrus-emffacet">
           <predicate
-              xsi:type="predicates:OrPredicate">
+              xsi:type="predicates:AndPredicate">
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/plugins/facet/.*}"/>
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.emf.facet.common.core"/>
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/tests/junit/plugins/facet/.*}"/>
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.emf\.facet($|\..+)"/>
+          </predicate>
+        </workingSet>
+        <workingSet
+            name="Papyrus EMF Facet Features"
+            id="papyrus-emffacet-features">
+          <predicate
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.emf.facet.feature"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.FeatureNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus(\.tests)?\.emf\.facet($|\..+)"/>
           </predicate>
         </workingSet>
       </setupTask>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
     </project>
     <project
@@ -940,6 +1423,15 @@
             rootFolder="${papyrus.git.clone.location/plugins/customization}"/>
         <sourceLocator
             rootFolder="${papyrus.git.clone.location/tests/junit/plugins/customization}"/>
+        <sourceLocator
+            rootFolder="${papyrus.git.clone.location/features}">
+          <predicate
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.(tests\.)?customization($|\..+)"/>
+          </predicate>
+        </sourceLocator>
       </setupTask>
       <setupTask
           xsi:type="setup.workingsets:WorkingSetTask">
@@ -947,26 +1439,56 @@
             name="Papyrus Customization"
             id="papyrus-customization">
           <predicate
-              xsi:type="predicates:OrPredicate">
+              xsi:type="predicates:AndPredicate">
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/plugins/customization/.*}"/>
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.customization"/>
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/tests/junit/plugins/customization/.*}"/>
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
+            <operand
+                xsi:type="predicates:OrPredicate">
+              <operand
+                  xsi:type="predicates:NamePredicate"
+                  pattern="org\.eclipse\.papyrus\.customization(?:$|\..+)"/>
+              <operand
+                  xsi:type="predicates:NamePredicate"
+                  pattern="org\.eclipse\.papyrus\.editor(?:$|\..+)"/>
+            </operand>
+          </predicate>
+        </workingSet>
+        <workingSet
+            name="Papyrus Customization Features"
+            id="papyrus-customization-features">
+          <predicate
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.customization.feature"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.FeatureNature"/>
             <operand
                 xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.editor(?:$|\..+)"/>
+                pattern="org\.eclipse\.papyrus\.customization(?:$|\..+)"/>
           </predicate>
         </workingSet>
       </setupTask>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
     </project>
     <project
@@ -976,6 +1498,15 @@
           xsi:type="projects:ProjectsImportTask">
         <sourceLocator
             rootFolder="${papyrus.git.clone.location/plugins/doc}"/>
+        <sourceLocator
+            rootFolder="${papyrus.git.clone.location/features}">
+          <predicate
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus(\..+)?\.doc($|\..+)"/>
+          </predicate>
+        </sourceLocator>
       </setupTask>
       <setupTask
           xsi:type="setup.workingsets:WorkingSetTask">
@@ -983,44 +1514,50 @@
             name="Papyrus Documentation"
             id="papyrus-doc">
           <predicate
-              xsi:type="predicates:NamePredicate"
-              pattern="org\.eclipse\.papyrus\..+\.doc"/>
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.uml.doc"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus(\..+)?\.doc(umentation)?"/>
+          </predicate>
+        </workingSet>
+        <workingSet
+            name="Papyrus Documentation Features"
+            id="papyrus-doc-features">
+          <predicate
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.doc.feature"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.FeatureNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus(\..+)?\.doc($|\..+)"/>
+          </predicate>
         </workingSet>
       </setupTask>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
       </stream>
-    </project>
-    <project
-        name="integrationtests"
-        label="Integration Tests">
-      <setupTask
-          xsi:type="projects:ProjectsImportTask">
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/tests/integration/plugins}"/>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.workingsets:WorkingSetTask">
-        <workingSet
-            name="Papyrus Integration Tests"
-            id="papyrus-integrationtests">
-          <predicate
-              xsi:type="predicates:LocationPredicate"
-              pattern="${papyrus.git.clone.location/tests/integration/plugins/.*}"/>
-        </workingSet>
-      </setupTask>
       <stream
-          name="master"
-          label="master (Luna/1.0.x)">
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
     </project>
     <project
@@ -1029,12 +1566,20 @@
       <setupTask
           xsi:type="projects:ProjectsImportTask">
         <sourceLocator
-            rootFolder="${papyrus.git.clone.location/tests/junit/plugins}">
+            rootFolder="${papyrus.git.clone.location/tests/junit/plugins}"/>
+        <sourceLocator
+            rootFolder="${papyrus.git.clone.location/features}">
           <predicate
-              xsi:type="predicates:NotPredicate">
+              xsi:type="predicates:AndPredicate">
             <operand
                 xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.(?:infra\.core\.)?sasheditor\.di\.tests"/>
+                pattern="org\.eclipse\.papyrus\.tests\..+"/>
+            <operand
+                xsi:type="predicates:NotPredicate">
+              <operand
+                  xsi:type="predicates:NamePredicate"
+                  pattern=".*\.extra\..*"/>
+            </operand>
           </predicate>
         </sourceLocator>
       </setupTask>
@@ -1044,17 +1589,62 @@
             name="Papyrus All Main Tests"
             id="papyrus-alltests">
           <predicate
-              xsi:type="predicates:LocationPredicate"
-              pattern="${papyrus.git.clone.location/tests/junit/plugins/.*}"/>
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.tests"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus(\..+)?\.tests"/>
+            <operand
+                xsi:type="predicates:NotPredicate">
+              <operand
+                  xsi:type="predicates:NamePredicate"
+                  pattern=".*\.extra\..*"/>
+            </operand>
+          </predicate>
+        </workingSet>
+        <workingSet
+            name="Papyrus Main Test Features"
+            id="papyrus-alltests-features">
+          <predicate
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.tests.feature"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.FeatureNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.tests($|\..+)"/>
+            <operand
+                xsi:type="predicates:NotPredicate">
+              <operand
+                  xsi:type="predicates:NamePredicate"
+                  pattern=".*\.extra\..*"/>
+            </operand>
+          </predicate>
         </workingSet>
       </setupTask>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
     </project>
     <project
@@ -1064,6 +1654,15 @@
           xsi:type="projects:ProjectsImportTask">
         <sourceLocator
             rootFolder="${papyrus.git.clone.location/plugins/team}"/>
+        <sourceLocator
+            rootFolder="${papyrus.git.clone.location/features}">
+          <predicate
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.team($|\..+)"/>
+          </predicate>
+        </sourceLocator>
       </setupTask>
       <setupTask
           xsi:type="setup.workingsets:WorkingSetTask">
@@ -1071,10 +1670,32 @@
             name="Papyrus Others"
             id="papyrus-others">
           <predicate
-              xsi:type="predicates:OrPredicate">
+              xsi:type="predicates:AndPredicate">
             <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="${papyrus.git.clone.location/plugins/team/.*}"/>
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.team.svn"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.PluginNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.team\.svn"/>
+          </predicate>
+        </workingSet>
+        <workingSet
+            name="Papyrus Other Features"
+            id="papyrus-others-features">
+          <predicate
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.papyrus.team.feature"/>
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.FeatureNature"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org\.eclipse\.papyrus\.team($|\..+)"/>
           </predicate>
         </workingSet>
       </setupTask>
@@ -1082,7 +1703,7 @@
           xsi:type="setup.targlets:TargletTask">
         <targlet
             name="Papyrus Other Dependencies"
-            activeRepositoryList="">
+            activeRepositoryList="${eclipse.target.platform}">
           <requirement
               name="org.eclipse.team.svn.feature.group"/>
           <requirement
@@ -1094,6 +1715,21 @@
             <repository
                 url="http://community.polarion.com/projects/subversive/download/eclipse/4.0/update-site/"/>
           </repositoryList>
+          <repositoryList
+              name="Mars">
+            <repository
+                url="http://download.eclipse.org/technology/subversive/2.0/luna-site/">
+              <annotation
+                  source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+                <detail
+                    key="updateFrom">
+                  <value>Subversive</value>
+                </detail>
+              </annotation>
+            </repository>
+            <repository
+                url="http://community.polarion.com/projects/subversive/download/eclipse/4.0/update-site/"/>
+          </repositoryList>
         </targlet>
         <description>
           Additional dependencies, e.g. for Subversive (SVN team integration), including
@@ -1103,46 +1739,19 @@
       </setupTask>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
       </stream>
-    </project>
-    <project
-        name="features"
-        label="Features">
-      <setupTask
-          xsi:type="projects:ProjectsImportTask">
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/features/papyrus-main-features}"/>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/features/papyrus-tests-features}"/>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.workingsets:WorkingSetTask">
-        <workingSet
-            name="Papyrus Features"
-            id="papyrus-features">
-          <predicate
-              xsi:type="predicates:OrPredicate">
-            <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="\Q${papyrus.git.clone.location/features/papyrus-main-features/}\E.*"/>
-            <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="\Q${papyrus.git.clone.location/features/papyrus-tests-features/}\E.*"/>
-          </predicate>
-        </workingSet>
-      </setupTask>
       <stream
-          name="master"
-          label="master (Luna/1.0.x)">
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
     </project>
     <project
@@ -1160,17 +1769,50 @@
             name="Papyrus Releng"
             id="papyrus-releng">
           <predicate
-              xsi:type="predicates:LocationPredicate"
-              pattern="${papyrus.git.clone.location/releng(?:/.+)?}"/>
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:RepositoryPredicate"
+                project="releng"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern=".*\.releng.*|.*\.oomph.*|releng"/>
+          </predicate>
         </workingSet>
       </setupTask>
+      <setupTask
+          xsi:type="setup.targlets:TargletTask">
+        <targlet
+            name="Papyrus Releng Dependencies"
+            activeRepositoryList="${eclipse.target.platform}">
+          <requirement
+              name="org.eclipse.b3.aggregator.engine.feature.feature.group"/>
+          <repositoryList
+              name="Mars">
+            <repository
+                url="http://download.eclipse.org/modeling/emft/b3/updates-4.3/"/>
+          </repositoryList>
+          <repositoryList
+              name="Luna">
+            <repository
+                url="http://download.eclipse.org/modeling/emft/b3/updates-4.3/"/>
+          </repositoryList>
+        </targlet>
+      </setupTask>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
     </project>
     <description>Tools, dependencies, and sources for development of the main Papyrus components.  Required for any Papyrus development.</description>
@@ -1193,11 +1835,16 @@
         xsi:type="setup.targlets:TargletTask">
       <targlet
           name="${scope.project.label} Plug-ins"
-          activeRepositoryList="">
+          activeRepositoryList="${eclipse.target.platform}">
         <requirement
             name="org.eclipse.papyrus.${papyrus.extrafeature}.feature.feature.group"
             optional="true"/>
         <repositoryList
+            name="Mars">
+          <repository
+              url="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Extra/lastSuccessfulBuild/artifact/releng/extras/target/repository/"/>
+        </repositoryList>
+        <repositoryList
             name="Luna">
           <repository
               url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/luna"/>
@@ -1231,19 +1878,28 @@
             xsi:type="predicates:OrPredicate">
           <operand
               xsi:type="predicates:LocationPredicate"
-              pattern="${papyrus.git.clone.location/extraplugins}/${papyrus.extraplugins.folder}"/>
+              pattern="\Q${papyrus.git.clone.location/extraplugins}\E[\\/]\Q${papyrus.extraplugins.folder}\E"/>
           <operand
               xsi:type="predicates:LocationPredicate"
-              pattern="${papyrus.git.clone.location/extraplugins}/${papyrus.extraplugins.folder}/.*"/>
+              pattern="\Q${papyrus.git.clone.location/extraplugins}\E[\\/]\Q${papyrus.extraplugins.folder}\E[\\/].*"/>
           <operand
               xsi:type="predicates:LocationPredicate"
-              pattern="${papyrus.git.clone.location/tests/junit/extraplugins}/${papyrus.extratests.folder}/.*"/>
-          <operand
-              xsi:type="predicates:NamePredicate"
-              pattern="org\.eclipse\.papyrus\.${papyrus.extrafeature}\.feature"/>
+              pattern="\Q${papyrus.git.clone.location/tests/junit/extraplugins}\E[\\/]\Q${papyrus.extratests.folder}\E[\\/].*"/>
           <operand
-              xsi:type="predicates:NamePredicate"
-              pattern="org\.eclipse\.papyrus\.${papyrus.extratestsfeature}\.feature"/>
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:NaturePredicate"
+                nature="org.eclipse.pde.FeatureNature"/>
+            <operand
+                xsi:type="predicates:OrPredicate">
+              <operand
+                  xsi:type="predicates:NamePredicate"
+                  pattern="org\.eclipse\.papyrus\.${papyrus.extrafeature}($|\..*)"/>
+              <operand
+                  xsi:type="predicates:NamePredicate"
+                  pattern="org\.eclipse\.papyrus\.${papyrus.extratestsfeature}($|\..*)"/>
+            </operand>
+          </operand>
         </predicate>
       </workingSet>
     </setupTask>
@@ -1254,10 +1910,23 @@
           xsi:type="setup.targlets:TargletTask">
         <targlet
             name="Papyrus CDO Dependencies"
-            activeRepositoryList="">
+            activeRepositoryList="${eclipse.target.platform}">
           <requirement
               name="org.eclipse.emf.cdo.sdk.feature.group"/>
           <repositoryList
+              name="Mars">
+            <repository
+                url="http://download.eclipse.org/modeling/emf/cdo/drops/R20140610-0212">
+              <annotation
+                  source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+                <detail
+                    key="updateFrom">
+                  <value>EMF CDO</value>
+                </detail>
+              </annotation>
+            </repository>
+          </repositoryList>
+          <repositoryList
               name="Luna">
             <repository
                 url="${base.downloads.url}/modeling/emf/cdo/drops/R20140610-0212"/>
@@ -1270,11 +1939,19 @@
           value="cdo"/>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
     </project>
     <project
@@ -1284,12 +1961,35 @@
           xsi:type="setup.targlets:TargletTask">
         <targlet
             name="Papyrus CPP Dependencies"
-            activeRepositoryList="">
+            activeRepositoryList="${eclipse.target.platform}">
           <requirement
               name="org.eclipse.cdt.feature.group"/>
           <requirement
               name="org.eclipse.emf.facet.sdk.feature.feature.group"/>
           <repositoryList
+              name="Mars">
+            <repository
+                url="http://download.eclipse.org/tools/cdt/builds/luna/milestones">
+              <annotation
+                  source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+                <detail
+                    key="updateFrom">
+                  <value>CDT</value>
+                </detail>
+              </annotation>
+            </repository>
+            <repository
+                url="http://download.eclipse.org/facet/updates/integration/0.5.0/I201408050748/">
+              <annotation
+                  source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
+                <detail
+                    key="updateFrom">
+                  <value>EMF Facet</value>
+                </detail>
+              </annotation>
+            </repository>
+          </repositoryList>
+          <repositoryList
               name="Luna">
             <repository
                 url="${base.downloads.url}/tools/cdt/builds/luna/milestones"/>
@@ -1316,11 +2016,19 @@
           value="tests.extra.codegen.cpp"/>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
     </project>
     <project
@@ -1332,11 +2040,19 @@
           value="diagramtemplate"/>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
       <description></description>
     </project>
@@ -1349,11 +2065,19 @@
           value="dsml.validation"/>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
       <description></description>
     </project>
@@ -1366,11 +2090,19 @@
           value="eastadl"/>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
       <description></description>
     </project>
@@ -1389,7 +2121,7 @@
           xsi:type="setup.targlets:TargletTask">
         <targlet
             name="Java Plug-ins"
-            activeRepositoryList="">
+            activeRepositoryList="${eclipse.target.platform}">
           <requirement
               name="org.eclipse.papyrus.java.profile.feature.feature.group"/>
           <requirement
@@ -1397,6 +2129,11 @@
           <requirement
               name="org.eclipse.papyrus.java.reverse.feature.feature.group"/>
           <repositoryList
+              name="Mars">
+            <repository
+                url="https://hudson.eclipse.org/papyrus/job/Papyrus-Master/lastSuccessfulBuild/artifact/releng/main/target/repository/"/>
+          </repositoryList>
+          <repositoryList
               name="Luna">
             <repository
                 url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/luna"/>
@@ -1405,11 +2142,19 @@
       </setupTask>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
       <description></description>
     </project>
@@ -1426,11 +2171,19 @@
           value="layers"/>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
       <description></description>
     </project>
@@ -1443,11 +2196,19 @@
           value="marte"/>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
       <description></description>
     </project>
@@ -1460,11 +2221,19 @@
           value="moka"/>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
       <description></description>
     </project>
@@ -1477,11 +2246,19 @@
           value="robotml"/>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
       <description></description>
     </project>
@@ -1498,11 +2275,19 @@
           value="tablemigration"/>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
       <description></description>
     </project>
@@ -1519,11 +2304,19 @@
           value="extra.uml.compare"/>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
       <description></description>
     </project>
@@ -1540,11 +2333,19 @@
           value="uml.export"/>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
       <description></description>
     </project>
@@ -1557,11 +2358,19 @@
           value="umlrt"/>
       <stream
           name="master"
-          label="master (Luna/1.0.x)">
+          label="master (Mars/1.1)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <stream
+          name="streams/1.0-maintenance"
+          label="streams/1.0-maintenance (Luna/1.0.x)">
         <setupTask
             xsi:type="setup:VariableTask"
             name="papyrus.bugzilla.version"
-            value="1.0.0"/>
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
       </stream>
       <description></description>
     </project>
@@ -1603,26 +2412,41 @@
           name="Papyrus Developer Tools"
           id="papyrus-dev">
         <predicate
-            xsi:type="predicates:OrPredicate">
-          <operand
-              xsi:type="predicates:LocationPredicate"
-              pattern="\Q${papyrus.git.clone.location/plugins/developer/}\E.+"/>
+            xsi:type="predicates:AndPredicate">
           <operand
-              xsi:type="predicates:LocationPredicate"
-              pattern="\Q${papyrus.git.clone.location/features/papyrus-dev-features/}\E.*"/>
+              xsi:type="predicates:RepositoryPredicate"
+              project="org.eclipse.papyrus.codegen"/>
           <operand
-              xsi:type="predicates:LocationPredicate"
-              pattern="\Q${papyrus.git.clone.location/tests/junit/plugins/developer/}\E.+"/>
+              xsi:type="predicates:OrPredicate">
+            <operand
+                xsi:type="predicates:LocationPredicate"
+                pattern="\Q${papyrus.git.clone.location/plugins/developer/}\E.+"/>
+            <operand
+                xsi:type="predicates:LocationPredicate"
+                pattern="\Q${papyrus.git.clone.location/features/papyrus-dev-features/}\E.*"/>
+            <operand
+                xsi:type="predicates:LocationPredicate"
+                pattern="\Q${papyrus.git.clone.location/tests/junit/plugins/developer/}\E.+"/>
+          </operand>
         </predicate>
       </workingSet>
     </setupTask>
     <setupTask
         xsi:type="setup.targlets:TargletTask">
       <targlet
-          name="Papyrus Developer Tools Dependencies"
-          activeRepositoryList="">
+          name="Papyrus Developer Tools Dependencies">
         <requirement
             name="org.eclipse.gmf.tooling.codegen.xtend2.feature.group"/>
+        <requirement
+            name="org.eclipse.oomph.setup.targlets.feature.group"
+            optional="true"/>
+        <requirement
+            name="org.eclipse.oomph.setup.feature.group"
+            optional="true"/>
+        <repositoryList>
+          <repository
+              url="${oomph.update.url}"/>
+        </repositoryList>
       </targlet>
     </setupTask>
     <setupTask
@@ -1630,13 +2454,40 @@
       <requirement
           name="org.eclipse.xtend.sdk.feature.group"/>
     </setupTask>
+    <project
+        name="Oomph"
+        label="Oomph Setup">
+      <setupTask
+          xsi:type="setup:EclipseIniTask"
+          id=""
+          option="-Doomph.redirection.papyrussetups"
+          value="=http://git.eclipse.org/c/papyrus/org.eclipse.papyrus.git/plain/releng/org.eclipse.papyrus.oomph/setups/->${papyrus.git.clone.location|uri}/releng/org.eclipse.papyrus.oomph/setups/"
+          vm="true"/>
+      <stream
+          name="master"
+          label="master (Mars/1.1)">
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="papyrus.bugzilla.version"
+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+      </stream>
+      <description>Additional configuration for developing and testing the Oomph setup model.</description>
+    </project>
     <stream
         name="master"
-        label="master (Luna/1.0.x)">
+        label="master (Mars/1.1)">
+      <setupTask
+          xsi:type="setup:VariableTask"
+          name="papyrus.bugzilla.version"
+          value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
+    </stream>
+    <stream
+        name="streams/1.0-maintenance"
+        label="streams/1.0-maintenance (Luna/1.0.x)">
       <setupTask
           xsi:type="setup:VariableTask"
           name="papyrus.bugzilla.version"
-          value="1.0.0"/>
+          value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
     </stream>
     <description>Sources and tools required for working on the Papyrus developer tools (not part of the product).</description>
   </project>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
index 6b73897fff2..6061279f471 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.papyrus.rcp.feature"

       label="Papyrus RCP Feature"

-      version="1.0.0.qualifier"

+      version="1.0.1.qualifier"

       provider-name="Eclipse Modeling Project">

 

    <description url="http://www.eclipse.org/papyrus">

diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
index 75a6c0ce089..b2bb4a99c2f 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../top-pom-rcp.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.papyrus</groupId>
 	<artifactId>org.eclipse.papyrus.rcp.feature</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/category.xml b/releng/rcp/org.eclipse.papyrus.rcp.product/category.xml
index 9b15c158e56..d438d271a93 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/category.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/category.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="org.eclipse.papyrus.rcp.feature_1.0.0.qualifier.jar" id="org.eclipse.papyrus.rcp.feature" version="1.0.0.qualifier"/>
+   <feature url="org.eclipse.papyrus.rcp.feature_1.1.0.qualifier.jar" id="org.eclipse.papyrus.rcp.feature" version="1.1.0.qualifier"/>
 </site>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
index 863e5585733..b179b18a44d 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <?pde version="3.5"?>

 

-<product name="Papyrus" uid="org.eclipse.papyrus.rcp.product" id="org.eclipse.papyrus.rcp.product" application="org.eclipse.ui.ide.workbench" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">

+<product name="Papyrus" uid="org.eclipse.papyrus.rcp.product" id="org.eclipse.papyrus.rcp.product" application="org.eclipse.ui.ide.workbench" version="1.0.1.qualifier" useFeatures="true" includeLaunchers="true">

 

    <aboutInfo>

       <image path="/org.eclipse.papyrus.rcp/icons/papyrus_lg.png"/>

diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
index bc3dfdd91c1..935bffaaba9 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
@@ -4,12 +4,12 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../top-pom-rcp.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.papyrus</groupId>
 	<artifactId>org.eclipse.papyrus.rcp.product</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 	<properties>
 		<product-id>org.eclipse.papyrus.rcp.product</product-id>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF b/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF
index 0c35fbe43c2..d21c77108cd 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF
+++ b/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Papyrus
 Bundle-SymbolicName: org.eclipse.papyrus.rcp;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
index c50e5831a4f..8fbab78f892 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../top-pom-rcp.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.papyrus</groupId>
 	<artifactId>org.eclipse.papyrus.rcp</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/releng/top-pom-dev.xml b/releng/top-pom-dev.xml
index a1bf265ce33..11664e2b92a 100755
--- a/releng/top-pom-dev.xml
+++ b/releng/top-pom-dev.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.papyrus</groupId>
 	<artifactId>org.eclipse.papyrus</artifactId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>../features/papyrus-dev-features/org.eclipse.papyrus.dev.feature</module>
diff --git a/releng/top-pom-extra-tests.xml b/releng/top-pom-extra-tests.xml
index 0883908fe25..3c864fa188e 100644
--- a/releng/top-pom-extra-tests.xml
+++ b/releng/top-pom-extra-tests.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>

   <groupId>org.eclipse.papyrus</groupId>

   <artifactId>org.eclipse.papyrus</artifactId>

-  <version>1.0.1-SNAPSHOT</version>

+  <version>1.1.0-SNAPSHOT</version>

   <packaging>pom</packaging>

   <modules>

     <!-- Shared modules with main tests -->

@@ -20,6 +20,7 @@
     <module>../tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests</module>

     <module>../tests/junit/extraplugins/moka/org.eclipse.papyrus.moka.tests</module>

     <module>../tests/junit/extraplugins/org.eclipse.papyrus.tests.extra</module>

+    <module>../tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests</module>

     <!-- Tests for umlrt -->

     <module>../tests/junit/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation.tests</module>

   </modules>

@@ -42,7 +43,7 @@
 			<id>birt</id>

 			<layout>p2</layout>

 			<!-- updateFrom("BIRT",0) -->

-			<url>http://download.eclipse.org/birt/update-site/4.4/</url>

+			<url>http://download.eclipse.org/birt/update-site/luna-interim/</url>

 		</repository>

 		<repository>

 			<id>cdt</id>

@@ -78,13 +79,13 @@
 			<id>emft-mwe[0]</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMFT MWE",0) -->

-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201408190419/mwe</url>

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/releases/R201409021027/mwe</url>

 		</repository>

 		<repository>

 			<id>emft-mwe[1]</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMFT MWE",1) -->

-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201408190839/mwe2lang</url>

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/releases/R201409021051/mwe2lang</url>

 		</repository>

 		<repository>

 			<id>emf-query</id>

@@ -108,7 +109,7 @@
 			<id>ep</id>

 			<layout>p2</layout>

 			<!-- updateFrom("Eclipse",0) -->

-			<url>http://download.eclipse.org/eclipse/updates/4.4milestones/M-4.4.1RC1-201408130800/</url>

+			<url>http://download.eclipse.org/eclipse/updates/4.4milestones/M-4.4.1RC3-201409031600/</url>

 		</repository>

 		<repository>

 			<id>gef</id>

@@ -135,16 +136,10 @@
 			<url>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.2.RC4a</url>

 		</repository>

 		<repository>

-			<id>m2m-atl</id>

-			<layout>p2</layout>

-			<!-- updateFrom("M2M ATL",0) -->

-			<url>http://download.eclipse.org/mmt/atl/updates/milestones/3.5/</url>

-		</repository>

-		<repository>

 			<id>m2t-acceleo</id>

 			<layout>p2</layout>

 			<!-- updateFrom("M2T ACCELEO",0) -->

-			<url>http://download.eclipse.org/acceleo/updates/milestones/3.5/S201406101309</url>

+			<url>http://download.eclipse.org/acceleo/updates/milestones/3.5/S201409021433</url>

 		</repository>

 		<repository>

 			<id>m2t-xpand</id>

@@ -156,7 +151,7 @@
 			<id>mdt-ocl</id>

 			<layout>p2</layout>

 			<!-- updateFrom("MDT OCL 5.0",0) -->

-			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/maintenance/5.0.2/S201408191529</url>

+			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/5.0.2/S201409011459</url>

 		</repository>

 		<repository>

 			<id>mdt-uml2</id>

@@ -171,12 +166,6 @@
 			<url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.4.0/S201406101621</url>

 		</repository>

 		<repository>

-			<id>mylyn</id>

-			<layout>p2</layout>

-			<!-- updateFrom("Mylyn",0) -->

-			<url>http://download.eclipse.org/mylyn/snapshots/3.13</url>

-		</repository>

-		<repository>

 			<id>nattable</id>

 			<layout>p2</layout>

 			<url>http://download.eclipse.org/nattable/releases/1.1.0/repository/</url>

@@ -196,13 +185,13 @@
 			<id>tmf-xtext</id>

 			<layout>p2</layout>

 			<!-- updateFrom("Xtext, Xtend",0) -->

-			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201408190707</url>

+			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/head/R201409090713</url>

 		</repository>

 		<repository>

 			<id>webtools</id>

 			<layout>p2</layout>

 			<!-- updateFrom("WebTools",0) -->

-			<url>http://download.eclipse.org/webtools/downloads/drops/R3.6.0/R-3.6.0-20140602160322/repository/</url>

+			<url>http://download.eclipse.org/webtools/downloads/drops/R3.6.1/M-3.6.1RC3-20140908000031/repository/</url>

 		</repository>

 	</repositories>

 	<build>

diff --git a/releng/top-pom-extras.xml b/releng/top-pom-extras.xml
index dc01959a4c1..1de47e5e3b0 100755
--- a/releng/top-pom-extras.xml
+++ b/releng/top-pom-extras.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>

 	<groupId>org.eclipse.papyrus</groupId>

 	<artifactId>org.eclipse.papyrus</artifactId>

-	<version>1.0.1-SNAPSHOT</version>

+	<version>1.1.0-SNAPSHOT</version>

 	<packaging>pom</packaging>

 	<modules>

 		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.cdo.feature</module>

@@ -29,6 +29,7 @@
 		<module>../features/papyrus-extra-features/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature</module>

 		<module>../features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature</module>

 		<module>../features/papyrus-extra-features/org.eclipse.papyrus.uml.export.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature</module>

 		<module>../extraplugins/codegen/org.eclipse.papyrus.acceleo</module>

 		<module>../extraplugins/codegen/org.eclipse.papyrus.acceleo.debug</module>

 		<module>../extraplugins/codegen/org.eclipse.papyrus.acceleo.ui</module>

@@ -135,13 +136,15 @@
 		<module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties</module>

 		<module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation</module>

 		<module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.wizard</module>

+		<module>../extraplugins/migration/org.eclipse.papyrus.m2m.qvto</module>

+		<module>../extraplugins/migration/org.eclipse.papyrus.migration.rsa</module>

 		<module>../extraplugins/codegen/org.eclipse.papyrus.views.cpp</module>

 		<module>../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints</module>

 		<module>extras</module>

 	</modules>

 	<properties>

-		<tycho-version>0.20.0</tycho-version>

-		<tychoExtrasVersion>0.20.0</tychoExtrasVersion>

+		<tycho-version>0.21.0</tycho-version>

+		<tychoExtrasVersion>0.21.0</tychoExtrasVersion>

 	</properties>

 	<repositories>

 		<repository>

@@ -150,12 +153,6 @@
 			<url>${papyrus.repo.main}</url>

 		</repository>

 		<repository>

-			<id>birt</id>

-			<layout>p2</layout>

-			<!-- updateFrom("BIRT",0) -->

-			<url>http://download.eclipse.org/birt/update-site/4.4/</url>

-		</repository>

-		<repository>

 			<id>cdt</id>

 			<layout>p2</layout>

 			<!-- updateFrom("CDT",0) -->

@@ -189,13 +186,13 @@
 			<id>emft-mwe[0]</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMFT MWE",0) -->

-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201408190419/mwe</url>

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/releases/R201409021027/mwe</url>

 		</repository>

 		<repository>

 			<id>emft-mwe[1]</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMFT MWE",1) -->

-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201408190839/mwe2lang</url>

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/releases/R201409021051/mwe2lang</url>

 		</repository>

 		<repository>

 			<id>emf-query</id>

@@ -219,7 +216,7 @@
 			<id>ep</id>

 			<layout>p2</layout>

 			<!-- updateFrom("Eclipse",0) -->

-			<url>http://download.eclipse.org/eclipse/updates/4.4milestones/M-4.4.1RC1-201408130800/</url>

+			<url>http://download.eclipse.org/eclipse/updates/4.4milestones/M-4.4.1RC3-201409031600/</url>

 		</repository>

 		<repository>

 			<id>gef</id>

@@ -246,16 +243,10 @@
 			<url>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.2.RC4a</url>

 		</repository>

 		<repository>

-			<id>m2m-atl</id>

-			<layout>p2</layout>

-			<!-- updateFrom("M2M ATL",0) -->

-			<url>http://download.eclipse.org/mmt/atl/updates/milestones/3.5/</url>

-		</repository>

-		<repository>

 			<id>m2t-acceleo</id>

 			<layout>p2</layout>

 			<!-- updateFrom("M2T ACCELEO",0) -->

-			<url>http://download.eclipse.org/acceleo/updates/milestones/3.5/S201406101309</url>

+			<url>http://download.eclipse.org/acceleo/updates/milestones/3.5/S201409021433</url>

 		</repository>

 		<repository>

 			<id>m2t-xpand</id>

@@ -267,7 +258,7 @@
 			<id>mdt-ocl</id>

 			<layout>p2</layout>

 			<!-- updateFrom("MDT OCL 5.0",0) -->

-			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/maintenance/5.0.2/S201408191529</url>

+			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/5.0.2/S201409011459</url>

 		</repository>

 		<repository>

 			<id>mdt-uml2</id>

@@ -282,12 +273,6 @@
 			<url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.4.0/S201406101621</url>

 		</repository>

 		<repository>

-			<id>mylyn</id>

-			<layout>p2</layout>

-			<!-- updateFrom("Mylyn",0) -->

-			<url>http://download.eclipse.org/mylyn/snapshots/3.13</url>

-		</repository>

-		<repository>

 			<id>nattable</id>

 			<layout>p2</layout>

 			<url>http://download.eclipse.org/nattable/releases/1.1.0/repository/</url>

@@ -307,13 +292,13 @@
 			<id>tmf-xtext</id>

 			<layout>p2</layout>

 			<!-- updateFrom("Xtext, Xtend",0) -->

-			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201408190707</url>

+			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/head/R201409090713</url>

 		</repository>

 		<repository>

 			<id>webtools</id>

 			<layout>p2</layout>

 			<!-- updateFrom("WebTools",0) -->

-			<url>http://download.eclipse.org/webtools/downloads/drops/R3.6.0/R-3.6.0-20140602160322/repository/</url>

+			<url>http://download.eclipse.org/webtools/downloads/drops/R3.6.1/M-3.6.1RC3-20140908000031/repository/</url>

 		</repository>

 	</repositories>

 	<build>

@@ -393,6 +378,7 @@
 			<plugin>

 				<groupId>org.eclipse.tycho.extras</groupId>

 				<artifactId>tycho-pack200a-plugin</artifactId>

+				<version>${tychoExtrasVersion}</version>

 				<executions>

 					<execution>

 						<id>pack200-normalize</id>

diff --git a/releng/top-pom-main-tests.xml b/releng/top-pom-main-tests.xml
index 468470fbff6..5b5542c1cf7 100644
--- a/releng/top-pom-main-tests.xml
+++ b/releng/top-pom-main-tests.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>

 	<groupId>org.eclipse.papyrus</groupId>

 	<artifactId>org.eclipse.papyrus</artifactId>

-	<version>1.0.1-SNAPSHOT</version>

+	<version>1.1.0-SNAPSHOT</version>

 	<packaging>pom</packaging>

 	<modules>

 		<module>../tests/junit/plugins/core/org.eclipse.papyrus.tests</module>

@@ -90,12 +90,6 @@
 			<url>${papyrus.repo.main}</url>

 		</repository>

 		<repository>

-			<id>birt</id>

-			<layout>p2</layout>

-			<!-- updateFrom("BIRT",0) -->

-			<url>http://download.eclipse.org/birt/update-site/4.4/</url>

-		</repository>

-		<repository>

 			<id>emf-compare</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMF COMPARE",0) -->

@@ -111,13 +105,13 @@
 			<id>emft-mwe[0]</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMFT MWE",0) -->

-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201408190419/mwe</url>

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/releases/R201409021027/mwe</url>

 		</repository>

 		<repository>

 			<id>emft-mwe[1]</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMFT MWE",1) -->

-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201408190839/mwe2lang</url>

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/releases/R201409021051/mwe2lang</url>

 		</repository>

 		<repository>

 			<id>emf-transaction</id>

@@ -135,7 +129,7 @@
 			<id>ep</id>

 			<layout>p2</layout>

 			<!-- updateFrom("Eclipse",0) -->

-			<url>http://download.eclipse.org/eclipse/updates/4.4milestones/M-4.4.1RC1-201408130800/</url>

+			<url>http://download.eclipse.org/eclipse/updates/4.4milestones/M-4.4.1RC3-201409031600/</url>

 		</repository>

 		<repository>

 			<id>gef</id>

@@ -162,16 +156,10 @@
 			<url>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.2.RC4a</url>

 		</repository>

 		<repository>

-			<id>m2m-atl</id>

-			<layout>p2</layout>

-			<!-- updateFrom("M2M ATL",0) -->

-			<url>http://download.eclipse.org/mmt/atl/updates/milestones/3.5/</url>

-		</repository>

-		<repository>

 			<id>m2t-acceleo</id>

 			<layout>p2</layout>

 			<!-- updateFrom("M2T ACCELEO",0) -->

-			<url>http://download.eclipse.org/acceleo/updates/milestones/3.5/S201406101309</url>

+			<url>http://download.eclipse.org/acceleo/updates/milestones/3.5/S201409021433</url>

 		</repository>

 		<repository>

 			<id>m2t-xpand</id>

@@ -183,7 +171,7 @@
 			<id>mdt-ocl</id>

 			<layout>p2</layout>

 			<!-- updateFrom("MDT OCL 5.0",0) -->

-			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/maintenance/5.0.2/S201408191529</url>

+			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/5.0.2/S201409011459</url>

 		</repository>

 		<repository>

 			<id>mdt-uml2</id>

@@ -198,12 +186,6 @@
 			<url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.4.0/S201406101621</url>

 		</repository>

 		<repository>

-			<id>mylyn</id>

-			<layout>p2</layout>

-			<!-- updateFrom("Mylyn",0) -->

-			<url>http://download.eclipse.org/mylyn/snapshots/3.13</url>

-		</repository>

-		<repository>

 			<id>nattable</id>

 			<layout>p2</layout>

 			<url>http://download.eclipse.org/nattable/releases/1.1.0/repository/</url>

@@ -223,18 +205,18 @@
 			<id>tmf-xtext</id>

 			<layout>p2</layout>

 			<!-- updateFrom("Xtext, Xtend",0) -->

-			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201408190707</url>

+			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/head/R201409090713</url>

 		</repository>

 		<repository>

-			<id>webtools</id>

+			<id>swtbot</id>

 			<layout>p2</layout>

-			<!-- updateFrom("WebTools",0) -->

-			<url>http://download.eclipse.org/webtools/downloads/drops/R3.6.0/R-3.6.0-20140602160322/repository/</url>

+			<url>http://download.eclipse.org/technology/swtbot/snapshots</url>

 		</repository>

 		<repository>

-			<id>swtbot</id>

+			<id>webtools</id>

 			<layout>p2</layout>

-			<url>http://download.eclipse.org/technology/swtbot/snapshots</url>

+			<!-- updateFrom("WebTools",0) -->

+			<url>http://download.eclipse.org/webtools/downloads/drops/R3.6.1/M-3.6.1RC3-20140908000031/repository/</url>

 		</repository>

 	</repositories>

 	<build>

diff --git a/releng/top-pom-main.xml b/releng/top-pom-main.xml
index 9467e5488ab..de30a03c8f4 100755
--- a/releng/top-pom-main.xml
+++ b/releng/top-pom-main.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>

 	<groupId>org.eclipse.papyrus</groupId>

 	<artifactId>org.eclipse.papyrus</artifactId>

-	<version>1.0.1-SNAPSHOT</version>

+	<version>1.1.0-SNAPSHOT</version>

 	<packaging>pom</packaging>

 	<modules>

 		<module>../features/papyrus-main-features/org.eclipse.papyrus.customization.feature</module>

@@ -303,24 +303,12 @@
 		<module>main</module>

 	</modules>

 	<properties>

-		<tycho-version>0.20.0</tycho-version>

-		<tychoExtrasVersion>0.20.0</tychoExtrasVersion>

+		<tycho-version>0.21.0</tycho-version>

+		<tychoExtrasVersion>0.21.0</tychoExtrasVersion>

 		<findbugs.version>2.5.3</findbugs.version>

 	</properties>

 	<repositories>

 		<repository>

-			<id>birt</id>

-			<layout>p2</layout>

-			<!-- updateFrom("BIRT",0) -->

-			<url>http://download.eclipse.org/birt/update-site/4.4/</url>

-		</repository>

-		<repository>

-			<id>emf-compare</id>

-			<layout>p2</layout>

-			<!-- updateFrom("EMF COMPARE",0) -->

-			<url>http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.0/S201408191310</url>

-		</repository>

-		<repository>

 			<id>emf-emf</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMF (Core)",0) -->

@@ -330,13 +318,13 @@
 			<id>emft-mwe[0]</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMFT MWE",0) -->

-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201408190419/mwe</url>

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/releases/R201409021027/mwe</url>

 		</repository>

 		<repository>

 			<id>emft-mwe[1]</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMFT MWE",1) -->

-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201408190839/mwe2lang</url>

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/releases/R201409021051/mwe2lang</url>

 		</repository>

 		<repository>

 			<id>emf-transaction</id>

@@ -354,7 +342,7 @@
 			<id>ep</id>

 			<layout>p2</layout>

 			<!-- updateFrom("Eclipse",0) -->

-			<url>http://download.eclipse.org/eclipse/updates/4.4milestones/M-4.4.1RC1-201408130800/</url>

+			<url>http://download.eclipse.org/eclipse/updates/4.4milestones/M-4.4.1RC3-201409031600/</url>

 		</repository>

 		<repository>

 			<id>gef</id>

@@ -381,18 +369,6 @@
 			<url>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.2.RC4a</url>

 		</repository>

 		<repository>

-			<id>m2m-atl</id>

-			<layout>p2</layout>

-			<!-- updateFrom("M2M ATL",0) -->

-			<url>http://download.eclipse.org/mmt/atl/updates/milestones/3.5/</url>

-		</repository>

-		<repository>

-			<id>m2t-acceleo</id>

-			<layout>p2</layout>

-			<!-- updateFrom("M2T ACCELEO",0) -->

-			<url>http://download.eclipse.org/acceleo/updates/milestones/3.5/S201406101309</url>

-		</repository>

-		<repository>

 			<id>m2t-xpand</id>

 			<layout>p2</layout>

 			<!-- updateFrom("M2T XPAND",0) -->

@@ -402,7 +378,7 @@
 			<id>mdt-ocl</id>

 			<layout>p2</layout>

 			<!-- updateFrom("MDT OCL 5.0",0) -->

-			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/maintenance/5.0.2/S201408191529</url>

+			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/5.0.2/S201409011459</url>

 		</repository>

 		<repository>

 			<id>mdt-uml2</id>

@@ -417,12 +393,6 @@
 			<url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.4.0/S201406101621</url>

 		</repository>

 		<repository>

-			<id>mylyn</id>

-			<layout>p2</layout>

-			<!-- updateFrom("Mylyn",0) -->

-			<url>http://download.eclipse.org/mylyn/snapshots/3.13</url>

-		</repository>

-		<repository>

 			<id>nattable</id>

 			<layout>p2</layout>

 			<url>http://download.eclipse.org/nattable/releases/1.1.0/repository/</url>

@@ -433,22 +403,16 @@
 			<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository</url>

 		</repository>

 		<repository>

-			<id>subversive</id>

-			<layout>p2</layout>

-			<!-- updateFrom("Subversive",0) -->

-			<url>http://download.eclipse.org/technology/subversive/2.0/luna-site/</url>

-		</repository>

-		<repository>

 			<id>tmf-xtext</id>

 			<layout>p2</layout>

 			<!-- updateFrom("Xtext, Xtend",0) -->

-			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201408190707</url>

+			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/head/R201409090713</url>

 		</repository>

 		<repository>

 			<id>webtools</id>

 			<layout>p2</layout>

 			<!-- updateFrom("WebTools",0) -->

-			<url>http://download.eclipse.org/webtools/downloads/drops/R3.6.0/R-3.6.0-20140602160322/repository/</url>

+			<url>http://download.eclipse.org/webtools/downloads/drops/R3.6.1/M-3.6.1RC3-20140908000031/repository/</url>

 		</repository>

 	</repositories>

 	<pluginRepositories>

@@ -538,100 +502,199 @@
 					</execution>

 				</executions>

 			</plugin>

-			<!-- Pack200 -->

-			<plugin>

-				<groupId>org.eclipse.tycho.extras</groupId>

-				<artifactId>tycho-pack200a-plugin</artifactId>

-				<executions>

-					<execution>

-						<id>pack200-normalize</id>

-						<goals>

-							<goal>normalize</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

-			<plugin>

-				<groupId>org.eclipse.tycho.extras</groupId>

-				<artifactId>tycho-pack200b-plugin</artifactId>

-				<version>${tychoExtrasVersion}</version>

-				<executions>

-					<execution>

-						<id>pack200-pack</id>

-						<goals>

-							<goal>pack</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

-			<plugin>

-				<groupId>org.eclipse.tycho</groupId>

-				<artifactId>tycho-p2-plugin</artifactId>

-				<version>${tycho-version}</version>

-				<executions>

-					<execution>

-						<id>attach-p2-metadata</id>

-						<phase>package</phase>

-						<goals>

-							<goal>p2-metadata</goal>

-						</goals>

-					</execution>

-				</executions>

-				<configuration>

-					<defaultP2Metadata>false</defaultP2Metadata>

-				</configuration>

-			</plugin>

 		</plugins>

 	</build>

+	

+	<!--
+		No profile: Don't produce any artifact (update site). Used by Gerrit
+		
+		findBugs: produce analysis reports. Activation: explicit ("Profiles")
+		packAndSign: produce a stable update site (Packed & signed). Used for releases (+ milestones) only. Activation: SIGN=true
+		pack: produce a simple update site (Packed). Used for nightly or feature branch builds. Activation: SIGN=false
+	 -->

 	<profiles>

-	  <profile>

-	  	<id>findBugs</id>

-	  	<build>

-	  		<plugins>

-	  			<plugin>

-					<groupId>org.codehaus.mojo</groupId>

-					<artifactId>findbugs-maven-plugin</artifactId>

-					<version>${findbugs.version}</version>

-					<configuration>

-						<findbugsXmlOutput>true</findbugsXmlOutput>

-						<failOnError>false</failOnError>

-					</configuration>

+		

+		<profile>

+			<id>defaultProfile</id>

+			<build>

+				<plugins>

+					<plugin>

+						<groupId>org.eclipse.tycho</groupId>

+						<artifactId>tycho-p2-plugin</artifactId>

+						<version>${tycho-version}</version>

+						<executions>

+							<execution>

+								<id>attach-p2-metadata</id>

+								<phase>package</phase>

+								<goals>

+									<goal>p2-metadata</goal>

+								</goals>

+							</execution>

+						</executions>

+					</plugin>

+				</plugins>

+			</build>

+			<activation>

+				<activeByDefault>true</activeByDefault>

+			</activation>

+		</profile>

+	

+		<profile>

+		  	<id>findBugs</id> <!-- Analysis profile. Takes +1h -->

+		  	<build>

+		  		<plugins>

+		  			<plugin>

+						<groupId>org.codehaus.mojo</groupId>

+						<artifactId>findbugs-maven-plugin</artifactId>

+						<version>${findbugs.version}</version>

+						<configuration>

+							<findbugsXmlOutput>true</findbugsXmlOutput>

+							<failOnError>false</failOnError>

+						</configuration>

+						<executions>

+							<execution>

+								<goals>

+									<goal>check</goal>

+								</goals>

+							</execution>

+						</executions>

+					</plugin>

+					<plugin>

+						<groupId>org.eclipse.tycho</groupId>

+						<artifactId>tycho-p2-plugin</artifactId>

+						<version>${tycho-version}</version>

+						<executions>

+							<execution>

+								<id>attach-p2-metadata</id>

+								<phase>package</phase>

+								<goals>

+									<goal>p2-metadata</goal>

+								</goals>

+							</execution>

+						</executions>

+					</plugin>

+		  		</plugins>

+		  	</build>

+		</profile>

+	  

+	  

+		<profile>

+	  		<id>packAndSign</id> <!-- Stable release profile. Takes +30min. Eclipse servers only -->

+		  	<!-- Pack200 -->

+		  	<build>

+			  	<plugins>

+					<plugin>

+						<groupId>org.eclipse.tycho.extras</groupId>

+						<artifactId>tycho-pack200a-plugin</artifactId>

+						<version>${tychoExtrasVersion}</version>

+						<executions>

+							<execution>

+								<id>pack200-normalize</id>

+								<goals>

+									<goal>normalize</goal>

+								</goals>

+							</execution>

+						</executions>

+					</plugin>

+					<plugin>

+						<groupId>org.eclipse.cbi.maven.plugins</groupId>

+						<artifactId>eclipse-jarsigner-plugin</artifactId>

+						<version>1.0.5</version>

+						<executions>

+							<execution>

+						    	<id>sign</id>

+						    	<goals>

+						    		<goal>sign</goal>

+						    	</goals>

+						  	</execution>

+						</executions>

+		            </plugin>

+					<plugin>

+						<groupId>org.eclipse.tycho.extras</groupId>

+						<artifactId>tycho-pack200b-plugin</artifactId>

+						<version>${tychoExtrasVersion}</version>

+						<executions>

+							<execution>

+								<id>pack200-pack</id>

+								<goals>

+									<goal>pack</goal>

+								</goals>

+							</execution>

+						</executions>

+					</plugin>

+					<plugin>

+						<groupId>org.eclipse.tycho</groupId>

+						<artifactId>tycho-p2-plugin</artifactId>

+						<version>${tycho-version}</version>

+						<executions>

+							<execution>

+								<id>attach-p2-metadata</id>

+								<phase>package</phase>

+								<goals>

+									<goal>p2-metadata</goal>

+								</goals>

+							</execution>

+						</executions>

+						<configuration>

+							<defaultP2Metadata>false</defaultP2Metadata>

+						</configuration>

+					</plugin>

+				</plugins>

+			</build>

+	        <activation>

+	        	<property>

+	        		<name>SIGN</name>

+	        		<value>true</value>

+	        	</property>

+	        </activation>

+		</profile>

+	  

+	  

+    	<profile>

+	        <id>pack</id> <!-- Nightly profile. Artifacts can be consumed, but are not signed -->

+	        <build>

+	          <plugins>

+	            <!-- Pack200 -->

+				<plugin>

+					<groupId>org.eclipse.tycho.extras</groupId>

+					<artifactId>tycho-pack200b-plugin</artifactId>

+					<version>${tychoExtrasVersion}</version>

 					<executions>

 						<execution>

+							<id>pack200-pack</id>

 							<goals>

-								<goal>check</goal>

+								<goal>pack</goal>

 							</goals>

 						</execution>

 					</executions>

 				</plugin>

-	  		</plugins>

-	  	</build>

-	  </profile>

-      <profile>

-        <id>sign</id>

-        <build>

-          <plugins>

-            <plugin>

-              <groupId>org.eclipse.cbi.maven.plugins</groupId>

-              <artifactId>eclipse-jarsigner-plugin</artifactId>

-              <version>1.0.5</version>

-              <executions>

-                <execution>

-                  <id>sign</id>

-                  <goals>

-                    <goal>sign</goal>

-                  </goals>

-                </execution>

-              </executions>

-            </plugin>

-          </plugins>

-        </build>

-        <activation>

-        	<property>

-        		<name>SIGN</name>

-        		<value>true</value>

-        	</property>

-        </activation>

-      </profile>

+				<plugin>

+					<groupId>org.eclipse.tycho</groupId>

+					<artifactId>tycho-p2-plugin</artifactId>

+					<version>${tycho-version}</version>

+					<executions>

+						<execution>

+							<id>attach-p2-metadata</id>

+							<phase>package</phase>

+							<goals>

+								<goal>p2-metadata</goal>

+							</goals>

+						</execution>

+					</executions>

+					<configuration>

+						<defaultP2Metadata>false</defaultP2Metadata>

+					</configuration>

+				</plugin>

+	          </plugins>

+	        </build>

+	        <activation>

+	        	<property>

+	        		<name>SIGN</name>

+	        		<value>false</value>

+	        	</property>

+	        </activation>

+    	</profile>

+      

+      

     </profiles>

 </project>

diff --git a/releng/top-pom-rcp.xml b/releng/top-pom-rcp.xml
index a47d88da3a3..d1eb5d37e73 100755..100644
--- a/releng/top-pom-rcp.xml
+++ b/releng/top-pom-rcp.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.papyrus</groupId>
 	<artifactId>org.eclipse.papyrus</artifactId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>rcp/org.eclipse.papyrus.rcp</module>
@@ -11,78 +11,116 @@
 		<module>rcp/org.eclipse.papyrus.rcp.product</module>
 	</modules>
 	<properties>
-		<tycho-version>0.20.0</tycho-version>
-		<tychoExtrasVersion>0.20.0</tychoExtrasVersion>
+		<tycho-version>0.21.0</tycho-version>
+		<tychoExtrasVersion>0.21.0</tychoExtrasVersion>
 	</properties>
 	<repositories>
-		<!-- Eclipse MDT components -->
 		<repository>
-			<id>eclipse</id>
+			<id>emf-emf</id>
 			<layout>p2</layout>
-			<url>http://download.eclipse.org/releases/luna</url>
+			<!-- updateFrom("EMF (Core)",0) -->
+			<url>http://download.eclipse.org/modeling/emf/emf/updates/2.10.x/</url>
 		</repository>
 		<repository>
-			<id>ep</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/eclipse/updates/4.4/R-4.4-201406061215/</url>
-		</repository>
-		<repository>
-			<id>emf-cdo</id>
+			<id>emft-mwe[0]</id>
 			<layout>p2</layout>
-			<url>http://download.eclipse.org/modeling/emf/cdo/drops/R20140610-0212</url>
+			<!-- updateFrom("EMFT MWE",0) -->
+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/releases/R201409021027/mwe</url>
 		</repository>
-		<!-- Papyrus components -->
 		<repository>
-			<id>papyrus-main</id>
+			<id>emft-mwe[1]</id>
 			<layout>p2</layout>
-			<url>${papyrus.repo.main}</url>
+			<!-- updateFrom("EMFT MWE",1) -->
+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/releases/R201409021051/mwe2lang</url>
 		</repository>
 		<repository>
-			<id>papyrus-extras</id>
+			<id>emf-transaction</id>
 			<layout>p2</layout>
-			<url>${papyrus.repo.extras}</url>
+			<!-- updateFrom("EMF TRANSACTION",0) -->
+			<url>http://download.eclipse.org/modeling/emf/transaction/updates/releases/R201405281451/</url>
 		</repository>
 		<repository>
-			<id>papyrus-dev</id>
+			<id>emf-validation</id>
 			<layout>p2</layout>
-			<url>${papyrus.repo.dev}</url>
+			<!-- updateFrom("EMF VALIDATION",0) -->
+			<url>http://download.eclipse.org/modeling/emf/validation/updates/releases/R201405281429/</url>
 		</repository>
-		<!-- Additional components -->
 		<repository>
-			<id>aggregated-legacies</id>
+			<id>ep</id>
 			<layout>p2</layout>
-			<url>${papyrus.repo.legacy}</url>
+			<!-- updateFrom("Eclipse",0) -->
+			<url>http://download.eclipse.org/eclipse/updates/4.4milestones/M-4.4.1RC3-201409031600/</url>
 		</repository>
 		<repository>
-			<id>subversive</id>
+			<id>gef</id>
 			<layout>p2</layout>
-			<url>http://download.eclipse.org/technology/subversive/2.0/luna-site/</url>
+			<!-- updateFrom("GEF",0) -->
+			<url>http://download.eclipse.org/tools/gef/updates/milestones</url>
 		</repository>
 		<repository>
 			<id>gmp-gmf-notation</id>
 			<layout>p2</layout>
-			<url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones</url>
+			<!-- updateFrom("GMF Notation",0) -->
+			<url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201405281433/</url>
 		</repository>
 		<repository>
 			<id>gmp-gmf-runtime</id>
 			<layout>p2</layout>
-			<url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones</url>
+			<!-- updateFrom("GMF Runtime",0) -->
+			<url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/maintenance/M201408201453/</url>
 		</repository>
 		<repository>
 			<id>gmf-tooling</id>
 			<layout>p2</layout>
+			<!-- updateFrom("GMF Tooling",0) -->
 			<url>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.2.RC4a</url>
 		</repository>
 		<repository>
-			<id>otdt</id>
+			<id>m2t-xpand</id>
+			<layout>p2</layout>
+			<!-- updateFrom("M2T XPAND",0) -->
+			<url>http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201406030414/</url>
+		</repository>
+		<repository>
+			<id>mdt-ocl</id>
+			<layout>p2</layout>
+			<!-- updateFrom("MDT OCL 5.0",0) -->
+			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/5.0.2/S201409011459</url>
+		</repository>
+		<repository>
+			<id>mdt-uml2</id>
 			<layout>p2</layout>
-			<url>http://download.eclipse.org/objectteams/updates/ot2.2/</url>
+			<!-- updateFrom("MDT UML2",0) -->
+			<url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.0.x</url>
+		</repository>
+		<repository>
+			<id>mmt-qvto</id>
+			<layout>p2</layout>
+			<!-- updateFrom("QVT Operational",0) -->
+			<url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.4.0/S201406101621</url>
+		</repository>
+		<repository>
+			<id>nattable</id>
+			<layout>p2</layout>
+			<url>http://download.eclipse.org/nattable/releases/1.1.0/repository/</url>
+		</repository>
+		<repository>
+			<id>orbit</id>
+			<layout>p2</layout>
+			<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository</url>
 		</repository>
 		<repository>
 			<id>tmf-xtext</id>
 			<layout>p2</layout>
-			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/head/R201405210727/</url>
+			<!-- updateFrom("Xtext, Xtend",0) -->
+			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/head/R201409090713</url>
 		</repository>
+		<repository>
+			<id>webtools</id>
+			<layout>p2</layout>
+			<!-- updateFrom("WebTools",0) -->
+			<url>http://download.eclipse.org/webtools/downloads/drops/R3.6.1/M-3.6.1RC3-20140908000031/repository/</url>
+		</repository>	
 	</repositories>
 	<build>
 		<plugins>
diff --git a/sandbox/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF
index a4af77d3748..87bb48e45d3 100644
--- a/sandbox/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF
+++ b/sandbox/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

  org.eclipse.core.commands,

  org.eclipse.core.resources;bundle-version="3.8.0",

- org.eclipse.papyrus.eclipse.project.editors;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.eclipse.project.editors;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.pde.ui,

  org.eclipse.ui.ide;bundle-version="3.10.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.dev.project.management.Activator

diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/META-INF/MANIFEST.MF b/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/META-INF/MANIFEST.MF
index 80ccb8df391..cb691f48142 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/META-INF/MANIFEST.MF
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/META-INF/MANIFEST.MF
@@ -3,18 +3,18 @@ Export-Package: org.eclipse.papyrus.core.queries.configuration.present
  ation

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="1.0.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport,

  org.eclipse.emf.edit.ui;visibility:=reexport,

  org.eclipse.ui.ide;visibility:=reexport,

  org.eclipse.emf.ecore.edit;visibility:=reexport,

  org.eclipse.emf.facet.infra.query.edit;visibility:=reexport,

  org.eclipse.uml2.uml.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.queries.core.configuration;bundle-version="1.0.0"

+ org.eclipse.papyrus.infra.queries.core.configuration;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.0.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/META-INF/MANIFEST.MF b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/META-INF/MANIFEST.MF
index c6ee64e5611..8b9a977bbe0 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/META-INF/MANIFEST.MF
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.extendedtypes.emf.modifysemanticva

  luesactionconfiguration.provider

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.extendedtypes.emf;bundle-version="1.0.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.extendedtypes.emf;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.queries.core.configuration;bundle-version="1.0.0";visibility:=reexport,

- org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="1.0.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.queries.core.configuration;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.0";visibility:=reexport,

- org.eclipse.papyrus.infra.extendedtypes.edit;bundle-version="1.0.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.extendedtypes.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.facet.infra.query;visibility:=reexport,

  org.eclipse.emf.facet.infra.query.edit;visibility:=reexport,

  org.eclipse.uml2.uml;visibility:=reexport,

@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.0.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/META-INF/MANIFEST.MF b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/META-INF/MANIFEST.MF
index a148f69442e..248652e14cf 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/META-INF/MANIFEST.MF
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/META-INF/MANIFEST.MF
@@ -3,19 +3,19 @@ Export-Package: org.eclipse.papyrus.extendedtypes.emf.modifysemanticva
  luesactionconfiguration.presentation

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.extendedtypes.emf.edit;bundle-version="1.0.0";visibility:=reexport,

+ org.eclipse.papyrus.extendedtypes.emf.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport,

  org.eclipse.emf.edit.ui;visibility:=reexport,

  org.eclipse.ui.ide;visibility:=reexport,

- org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="1.0.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.extendedtypes.edit;bundle-version="1.0.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.extendedtypes.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.facet.infra.query.edit;visibility:=reexport,

  org.eclipse.uml2.uml.edit;visibility:=reexport

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.0.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/META-INF/MANIFEST.MF b/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/META-INF/MANIFEST.MF
index 0db7e7a7111..3e047899e28 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/META-INF/MANIFEST.MF
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.paletteconfiguration.presentation

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;bundle-version="1.0.0";visibility:=reexport,

+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport,

  org.eclipse.emf.edit.ui;visibility:=reexport,

  org.eclipse.ui.ide;visibility:=reexport,

- org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="1.0.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.ecore.edit;visibility:=reexport,

  org.eclipse.emf.facet.infra.query.edit;visibility:=reexport,

  org.eclipse.uml2.uml.edit;visibility:=reexport

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.0.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/META-INF/MANIFEST.MF b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/META-INF/MANIFEST.MF
index 261def63166..853da23e41c 100644
--- a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/META-INF/MANIFEST.MF
+++ b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.extendedtypes.uml.applystereotypea

  ctionconfiguration.provider

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.tools.extendedtypes;bundle-version="1.0.0";visibility:=reexport,

+ org.eclipse.papyrus.uml.tools.extendedtypes;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.queries.core.configuration;bundle-version="1.0.0";visibility:=reexport,

- org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="1.0.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.queries.core.configuration;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.0";visibility:=reexport,

- org.eclipse.papyrus.infra.extendedtypes.edit;bundle-version="1.0.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.extendedtypes.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.facet.infra.query;visibility:=reexport,

  org.eclipse.emf.facet.infra.query.edit;visibility:=reexport,

  org.eclipse.uml2.uml;visibility:=reexport,

@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.0.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/META-INF/MANIFEST.MF b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/META-INF/MANIFEST.MF
index 26e0ea70aa9..deb8ac7a0bc 100644
--- a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/META-INF/MANIFEST.MF
+++ b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/META-INF/MANIFEST.MF
@@ -3,19 +3,19 @@ Export-Package: org.eclipse.papyrus.extendedtypes.uml.applystereotypea
  ctionconfiguration.presentation

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.extendedtypes.uml.edit;bundle-version="1.0.0";visibility:=reexport,

+ org.eclipse.papyrus.extendedtypes.uml.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport,

  org.eclipse.emf.edit.ui;visibility:=reexport,

  org.eclipse.ui.ide;visibility:=reexport,

- org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="1.0.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.extendedtypes.edit;bundle-version="1.0.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.extendedtypes.edit;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.emf.facet.infra.query.edit;visibility:=reexport,

  org.eclipse.uml2.uml.edit;visibility:=reexport

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.0.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/META-INF/MANIFEST.MF b/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/META-INF/MANIFEST.MF
index 21b9c106fdb..7d3ab2ef580 100644
--- a/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/META-INF/MANIFEST.MF
+++ b/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/META-INF/MANIFEST.MF
@@ -1,28 +1,30 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.integrationtests.editor
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.papyrus.integrationtests.editor.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.ui.workbench,
- org.eclipse.ui.ide,
- org.eclipse.emf.ecore;bundle-version="2.9.1",
- org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.emftree;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.0.1",
- org.eclipse.core.commands;bundle-version="3.6.100",
- org.eclipse.emf.transaction;bundle-version="1.4.0"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-Vendor: %providerName
-Export-Package: org.eclipse.papyrus.integrationtests.editor
-Bundle-Localization: plugin
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.core.runtime,

+ org.eclipse.core.resources,

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.ui.workbench,

+ org.eclipse.ui.ide,

+ org.eclipse.emf.ecore;bundle-version="2.9.1",

+ org.junit;bundle-version="4.10.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.emftree;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.1.0",

+ org.eclipse.core.commands;bundle-version="3.6.100",

+ org.eclipse.emf.transaction;bundle-version="1.4.0"

+Export-Package: org.eclipse.papyrus.integrationtests.editor

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-Version: 1.1.0.qualifier

+Bundle-Name: %pluginName

+Bundle-Localization: plugin

+Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.integrationtests.editor.Activato

+ r

+Bundle-SymbolicName: org.eclipse.papyrus.integrationtests.editor

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+

diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
index d335798509c..cf99194c159 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.cdo.core;bundle-version="1.0.1";visibility:=reexport,

+Require-Bundle: org.eclipse.papyrus.cdo.core;bundle-version="1.1.0";visibility:=reexport,

  org.junit;bundle-version="4.11.0";visibility:=reexport,

  org.eclipse.uml2.uml;bundle-version="4.0.0";visibility:=reexport,

  org.eclipse.emf.cdo.server.net4j;bundle-version="[4.1.0,5.0.0)",

  org.eclipse.emf.cdo.net4j;bundle-version="[4.1.0,5.0.0)",

  org.eclipse.net4j.jvm;bundle-version="[4.1.0,5.0.0)",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.core.expressions;bundle-version="3.4.0",

- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.resourceloading.preferences;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.resourceloading.preferences;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.cdo.core.resource.tests,

  org.eclipse.papyrus.cdo.core.tests,

  org.eclipse.papyrus.cdo.core.util.tests,

@@ -22,7 +22,7 @@ Export-Package: org.eclipse.papyrus.cdo.core.resource.tests,
  org.eclipse.papyrus.cdo.internal.core.importer.tests;x-internal:=true,

  org.eclipse.papyrus.cdo.internal.core.tests;x-internal:=true

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/pom.xml b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/pom.xml
index f002aedd130..00d3663d510 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/pom.xml
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-extra-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.cdo.core.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AllCoreTests.java b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AllCoreTests.java
new file mode 100644
index 00000000000..5086b719acc
--- /dev/null
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AllCoreTests.java
@@ -0,0 +1,30 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.cdo.core.tests;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+/**
+ * This is the AllCoreTests type. Enjoy.
+ */
+@RunWith(Suite.class)
+@SuiteClasses({ RepositoryManagerEventAdapterTest.class })
+public class AllCoreTests {
+
+	public AllCoreTests() {
+		super();
+	}
+
+}
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AllTests.java b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AllTests.java
index 9b44a696882..37df143a9cb 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AllTests.java
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AllTests.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
+ * 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
@@ -8,6 +8,8 @@
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus (CEA) - bug 443828
+ *   
  *****************************************************************************/
 package org.eclipse.papyrus.cdo.core.tests;
 
@@ -26,10 +28,10 @@ import org.junit.runners.Suite.SuiteClasses;
  * This is the AllTests type. Enjoy.
  */
 @RunWith(Suite.class)
-@SuiteClasses({ AllUtilTests.class, AllExpressionsTests.class, //
-AllInternalCoreTests.class, CDOAwareModelSetTest.class, //
-AllModelImportTests.class, AllModelExportTests.class, //
-CDOControlModeTest.class })
+@SuiteClasses({ AllCoreTests.class, AllUtilTests.class, AllExpressionsTests.class, //
+		AllInternalCoreTests.class, CDOAwareModelSetTest.class, //
+		AllModelImportTests.class, AllModelExportTests.class, //
+		CDOControlModeTest.class })
 public class AllTests {
 
 	public AllTests() {
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/RepositoryManagerEventAdapterTest.java b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/RepositoryManagerEventAdapterTest.java
new file mode 100644
index 00000000000..8c7d4ac4f43
--- /dev/null
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/RepositoryManagerEventAdapterTest.java
@@ -0,0 +1,169 @@
+/*****************************************************************************
+ * 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.cdo.core.tests;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.eclipse.emf.cdo.view.CDOView;
+import org.eclipse.emf.cdo.view.CDOViewInvalidationEvent;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.papyrus.cdo.core.IPapyrusRepository;
+import org.eclipse.papyrus.cdo.core.IPapyrusRepositoryManager;
+import org.eclipse.papyrus.cdo.core.RepositoryManagerEventAdapter;
+import org.eclipse.papyrus.cdo.internal.core.IInternalPapyrusRepository;
+import org.eclipse.papyrus.cdo.internal.core.IInternalPapyrusRepositoryManager;
+import org.eclipse.papyrus.cdo.internal.core.PapyrusRepositoryManager;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.junit.Test;
+
+import com.google.common.collect.Lists;
+
+/**
+ * Test suite for the {@link RepositoryManagerEventAdapter} class.
+ */
+public class RepositoryManagerEventAdapterTest extends AbstractPapyrusCDOTest {
+
+	public RepositoryManagerEventAdapterTest() {
+		super();
+	}
+
+	/**
+	 * Regression test for the invalid identity check bug (an actual bug) uncovered by FindBugs.
+	 * 
+	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=443828
+	 */
+	@Test
+	public void discoverExistingViews_bug443828() throws Exception {
+		IInternalPapyrusRepository repo = getInternalPapyrusRepository();
+		ResourceSet rset = repo.createTransaction(new ResourceSetImpl());
+		rset.createResource(getTestResourceURI("foo.ecore"));
+		repo.commit(rset);
+
+		Fixture fixture = createFixture(rset);
+
+		// Create a "remote session"
+		IPapyrusRepositoryManager mgr = createRepositoryManager();
+		IPapyrusRepository remote = mgr.getRepository(repo.getURL());
+		assertThat(remote.connect().isOK(), is(true));
+		ResourceSet remoteRset = remote.createTransaction(new ResourceSetImpl());
+
+		// Create a resource in the "remote session"
+		remoteRset.getResource(getTestResourceURI("foo.ecore"), true).getContents().add(EcoreFactory.eINSTANCE.createEPackage());
+		remote.commit(remoteRset);
+
+		fixture.assertInvalidation(0, repo, repo.getCDOView(rset));
+	}
+
+	//
+	// Test framework
+	//
+
+	Fixture createFixture(ResourceSet rset) {
+		Fixture result = new Fixture(rset);
+
+		result.install(PapyrusRepositoryManager.INSTANCE);
+		houseKeeper.cleanUpLater(result, new HouseKeeper.Disposer<RepositoryManagerEventAdapter>() {
+			@Override
+			public void dispose(RepositoryManagerEventAdapter object) throws Exception {
+				object.uninstall(PapyrusRepositoryManager.INSTANCE);
+			}
+		});
+
+		return result;
+	}
+
+	IInternalPapyrusRepositoryManager createRepositoryManager() {
+		IInternalPapyrusRepositoryManager result = new PapyrusRepositoryManager();
+		houseKeeper.cleanUpLater(result.getSessionsContainer(), containerDisposer());
+		return result;
+	}
+
+	static class Fixture extends RepositoryManagerEventAdapter {
+		private List<IPapyrusRepository> invalidatedRepositories = Lists.newArrayListWithExpectedSize(1);
+		private List<CDOView> invalidatedViews = Lists.newArrayListWithExpectedSize(1);
+		private List<CDOViewInvalidationEvent> invalidations = Lists.newArrayListWithExpectedSize(1);
+
+		private final Lock lock = new ReentrantLock();
+		private final Condition invalidationOccurred = lock.newCondition();
+
+		Fixture() {
+			super();
+		}
+
+		Fixture(ResourceSet rset) {
+			super(rset);
+		}
+
+		void reset() {
+			lock.lock();
+
+			try {
+				invalidatedRepositories.clear();
+				invalidatedViews.clear();
+				invalidations.clear();
+			} finally {
+				lock.unlock();
+			}
+		}
+
+		CDOViewInvalidationEvent assertInvalidation(int index, IPapyrusRepository repository, CDOView view) {
+			lock.lock();
+
+			try {
+				if (index >= invalidations.size()) {
+					try {
+						if (!invalidationOccurred.await(10, TimeUnit.SECONDS)) {
+							fail("Timed out waiting for local view invalidation.");
+						}
+					} catch (InterruptedException e) {
+						fail("Interrupted while waiting for local view invalidation.");
+					}
+				}
+
+				assertThat("Local view invalidation not detected", index, lessThan(invalidations.size()));
+				assertThat(invalidatedRepositories.get(index), sameInstance(repository));
+				assertThat(invalidatedViews.get(index), sameInstance(view));
+				return invalidations.get(index);
+			} finally {
+				lock.unlock();
+			}
+		}
+
+		@Override
+		protected void onInvalidation(IPapyrusRepository repository, CDOView view, CDOViewInvalidationEvent event) {
+			lock.lock();
+
+			try {
+				invalidatedRepositories.add(repository);
+				invalidatedViews.add(view);
+				invalidations.add(event);
+				invalidationOccurred.signalAll();
+			} finally {
+				lock.unlock();
+			}
+		}
+
+	}
+}
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/TestProject.java b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/TestProject.java
index a3f307d9efd..8596a311807 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/TestProject.java
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/TestProject.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2013, 2014 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,8 @@
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus (CEA) - bug 443828
+ *   
  *****************************************************************************/
 package org.eclipse.papyrus.cdo.core.tests;
 
@@ -47,7 +49,7 @@ public class TestProject
 		super();
 
 		this.project = ResourcesPlugin.getWorkspace().getRoot()
-			.getProject(name);
+				.getProject(name);
 	}
 
 	public IProject getProject() {
@@ -65,7 +67,7 @@ public class TestProject
 
 	public URI getResourceURI(String path) {
 		return URI.createPlatformResourceURI(getFile(path).getFullPath()
-			.toString(), true);
+				.toString(), true);
 	}
 
 	@Override
@@ -101,21 +103,26 @@ public class TestProject
 			throws Exception {
 
 		URL zipResource = Platform.getBundle(
-			"org.eclipse.papyrus.cdo.core.tests").getEntry(
-			String.format("resources/projects/%s.zip", project.getName()));
-		ZipInputStream zip = new ZipInputStream(zipResource.openStream());
-
-		for (ZipEntry entry = zip.getNextEntry(); entry != null; entry = zip
-			.getNextEntry()) {
-			if (entry.isDirectory()) {
-				createDirectory(project, entry.getName());
-			} else {
-				createFile(project, entry.getName(),
-					new ZipEntryInputStreamWrapper(zip));
+				"org.eclipse.papyrus.cdo.core.tests").getEntry(
+				String.format("resources/projects/%s.zip", project.getName()));
+
+		if (zipResource == null) {
+			fail("No such test project archive: " + project.getName());
+		} else {
+			ZipInputStream zip = new ZipInputStream(zipResource.openStream());
+
+			for (ZipEntry entry = zip.getNextEntry(); entry != null; entry = zip
+					.getNextEntry()) {
+				if (entry.isDirectory()) {
+					createDirectory(project, entry.getName());
+				} else {
+					createFile(project, entry.getName(),
+							new ZipEntryInputStreamWrapper(zip));
+				}
 			}
-		}
 
-		zip.close();
+			zip.close();
+		}
 	}
 
 	private void createDirectory(IProject project, String name)
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF
index d468e698b40..caffc86e13a 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.cdo.core.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.cdo.ui.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.cdo.validation.problems.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.cdo.uml.ui.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.cdo.uml.search.ui.tests;bundle-version="1.0.1"

+Require-Bundle: org.eclipse.papyrus.cdo.core.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.ui.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.validation.problems.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.uml.ui.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.uml.search.ui.tests;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.cdo.tests

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.tests/pom.xml b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.tests/pom.xml
index a74deba1de1..6fe6ff8e316 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.tests/pom.xml
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-extra-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.cdo.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
index 40a490d8de6..a9189b26eae 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
@@ -1,30 +1,31 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.ui.ide;bundle-version="[3.8.0,4.0.0)",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.ui.workbench,

- org.eclipse.papyrus.cdo.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.cdo.core;bundle-version="1.1.0",

  org.eclipse.emf.cdo.ui;bundle-version="[4.2.0,5.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)",

  org.eclipse.emf.cdo.dawn.gmf;bundle-version="[2.1.0,3.0.0)",

  org.eclipse.emf.cdo.dawn.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.cdo.core.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.cdo.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.validation;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.0.1",

- org.eclipse.papyrus.cdo.validation.problems;bundle-version="1.0.1",

- org.eclipse.papyrus.cdo.validation.problems.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.core.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.validation;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.validation.problems;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.validation.problems.edit;bundle-version="1.1.0",

  org.eclipse.emf.cdo.server.ocl;bundle-version="4.2.0",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.cdo.internal.ui.editors.tests;x-internal:=true,

  org.eclipse.papyrus.cdo.internal.ui.markers.tests;x-internal:=true,

+ org.eclipse.papyrus.cdo.internal.ui.views.tests;x-internal:=true,

  org.eclipse.papyrus.cdo.ui.tests

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/build.properties b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/build.properties
index 9de44fbc9f5..5371490a2c7 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/build.properties
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/build.properties
@@ -4,5 +4,6 @@ bin.includes = META-INF/,\
                .,\
                plugin.properties,\
                about.html,\
-               resources/
+               resources/,\
+               plugin.xml
 src.includes = about.html
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/plugin.xml b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/plugin.xml
new file mode 100644
index 00000000000..118a250b55d
--- /dev/null
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/plugin.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.cdo.ui.repositoryFilters">
+      <itemProviderFilter
+            id="org.eclipse.papyrus.cdo.ui.tests.itemProviderFilter1">
+         <predicate
+               class="org.eclipse.papyrus.cdo.internal.ui.views.tests.ItemProviderFilterRegistryTest$TestFilter"/>
+      </itemProviderFilter>
+   </extension>
+
+</plugin>
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/pom.xml b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/pom.xml
index 9c6bd84e580..6818469c2a6 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/pom.xml
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-extra-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.cdo.ui.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/views/tests/ItemProviderFilterRegistryTest.java b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/views/tests/ItemProviderFilterRegistryTest.java
new file mode 100644
index 00000000000..f32f763186c
--- /dev/null
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/views/tests/ItemProviderFilterRegistryTest.java
@@ -0,0 +1,65 @@
+/*****************************************************************************
+ * 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.cdo.internal.ui.views.tests;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.eclipse.papyrus.cdo.core.tests.AbstractPapyrusCDOTest;
+import org.eclipse.papyrus.cdo.internal.core.PapyrusRepositoryManager;
+import org.eclipse.papyrus.cdo.internal.ui.views.ModelRepositoryItemProvider;
+import org.junit.After;
+import org.junit.Test;
+
+import com.google.common.base.Predicate;
+
+/**
+ * Tests the {@code ItemProviderFilterRegistry} class.
+ */
+public class ItemProviderFilterRegistryTest extends AbstractPapyrusCDOTest {
+
+	public ItemProviderFilterRegistryTest() {
+		super();
+	}
+
+	@Test
+	public void testPredicateFilter() {
+		TestFilter.banned = getPapyrusRepository();
+		ModelRepositoryItemProvider itemProvider = new ModelRepositoryItemProvider(null);
+		itemProvider.inputChanged(null, null, PapyrusRepositoryManager.INSTANCE);
+
+		assertThat(Arrays.asList(itemProvider.getChildren(PapyrusRepositoryManager.INSTANCE)), is(Collections.EMPTY_LIST));
+	}
+
+	//
+	// Test framework
+	//
+
+	@After
+	public void tearDown() {
+		TestFilter.banned = null;
+	}
+
+	public static final class TestFilter implements Predicate<Object> {
+		static Object banned;
+
+		@Override
+		public boolean apply(Object input) {
+			return (banned != null) && (input == banned);
+		}
+	}
+}
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AllTests.java b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AllTests.java
index 4c02a05d91b..ce83603aa4a 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AllTests.java
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AllTests.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
+ * 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
@@ -8,6 +8,8 @@
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus (CEA) - bug 443830
+ *   
  *****************************************************************************/
 package org.eclipse.papyrus.cdo.ui.tests;
 
@@ -15,6 +17,7 @@ import org.eclipse.papyrus.cdo.internal.ui.editors.tests.BasicEditorTest;
 import org.eclipse.papyrus.cdo.internal.ui.editors.tests.DawnEditorAdapterTest;
 import org.eclipse.papyrus.cdo.internal.ui.markers.tests.CDOPapyrusMarkerTest;
 import org.eclipse.papyrus.cdo.internal.ui.markers.tests.ModelValidationMarkersTest;
+import org.eclipse.papyrus.cdo.internal.ui.views.tests.ItemProviderFilterRegistryTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
@@ -24,7 +27,8 @@ import org.junit.runners.Suite.SuiteClasses;
  */
 @RunWith(Suite.class)
 @SuiteClasses({ BasicEditorTest.class, DawnEditorAdapterTest.class, //
-ModelValidationMarkersTest.class, CDOPapyrusMarkerTest.class })
+		ModelValidationMarkersTest.class, CDOPapyrusMarkerTest.class, //
+		ItemProviderFilterRegistryTest.class })
 public class AllTests {
 
 	public AllTests() {
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF
index f895bd6129e..c3e53254d3a 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.cdo.core.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.cdo.uml.search.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.search.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.views.search;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.cdo.core.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.uml.search.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.search.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.search;bundle-version="1.1.0",

  org.eclipse.ui;bundle-version="3.105.0",

- org.eclipse.papyrus.cdo.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.cdo.ui;bundle-version="1.1.0",

  org.eclipse.search;bundle-version="3.9.0",

  org.eclipse.emf.cdo.server.ocl;bundle-version="4.2.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.cdo.uml.search.ui.tests

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/pom.xml b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/pom.xml
index 7a787d7a9a7..59f3fbb2e1d 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/pom.xml
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-extra-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.cdo.uml.search.ui.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/META-INF/MANIFEST.MF
index 18d992ec500..9a446815966 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.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.cdo.core.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.cdo.ui.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.cdo.uml.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.cdo.core.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.ui.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.uml.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

  org.eclipse.ui;bundle-version="3.100.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.cdo.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.ui;bundle-version="1.1.0",

  org.eclipse.emf.cdo.server.ocl;bundle-version="4.2.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.cdo.uml.internal.ui.importsources.tests;x-internal:=true,

  org.eclipse.papyrus.cdo.uml.ui.tests

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/pom.xml b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/pom.xml
index 583014e3255..a88b8661037 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/pom.xml
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-extra-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.cdo.uml.ui.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF
index 30d76b9f779..a28c350812c 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF
@@ -3,17 +3,17 @@ Export-Package: org.eclipse.papyrus.cdo.validation.problems.edit.tests,
  org.eclipse.papyrus.cdo.validation.problems.tests,

  org.eclipse.papyrus.cdo.validation.problems.util.tests

 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",

- org.eclipse.papyrus.cdo.validation.problems;bundle-version="1.0.1";visibility:=reexport,

- org.eclipse.papyrus.cdo.validation.problems.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.cdo.validation.problems;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.papyrus.cdo.validation.problems.edit;bundle-version="1.1.0",

  org.eclipse.emf.ecore.xmi;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,

  org.junit;visibility:=reexport,

  org.eclipse.emf.ecore.edit;bundle-version="[2.8.0,3.0.0)",

- org.eclipse.papyrus.cdo.core.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"

+ org.eclipse.papyrus.cdo.core.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/pom.xml b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/pom.xml
index 03159027e2c..83afe40ed8c 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/pom.xml
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-extra-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.cdo.validation.problems.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class8.cpp b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class8.cpp
deleted file mode 100644
index eacc3508b50..00000000000
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class8.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// --------------------------------------------------------
-// Code generated by Papyrus C++
-// --------------------------------------------------------
-
-#define CppCodegenTest_Package1_Class8_BODY
-
-/************************************************************
- Class8 class body
- ************************************************************/
-
-// include associated header file
-#include "CppCodegenTest/Package1/Class8.h"
-
-// Derived includes directives
-
-namespace Package1 {
-
-// static attributes (if any)
-
-/**
- * 
- * @param iVal1 @param iVal2 @param cVal1 @param cVal2 @param this 
- */
-int Class8::operation1(int /*in*/iVal1, int /*in*/iVal2, char /*in*/cVal1,
-		char /*in*/cVal2)
-{
-
-}
-
-/**
- * 
- * @param iVal1 
- */
-void Class8::operation1(int /*in*/iVal1)
-{
-
-}
-
-} // of namespace Package1
-
-/************************************************************
- End of Class8 class body
- ************************************************************/
\ No newline at end of file
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class8.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class8.h
deleted file mode 100644
index a9ce8cc797f..00000000000
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class8.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// --------------------------------------------------------
-// Code generated by Papyrus C++
-// --------------------------------------------------------
-
-#ifndef CPPCODEGENTEST_PACKAGE1_CLASS8_H
-#define CPPCODEGENTEST_PACKAGE1_CLASS8_H
-
-/************************************************************
- Class8 class header
- ************************************************************/
-
-#include "CppCodegenTest/Package1/Pkg_Package1.h"
-
-#include "AnsiCLibrary/Pkg_AnsiCLibrary.h"
-
-namespace Package1 {
-
-/************************************************************/
-/**
- * 
- */
-
-class Class8
-{
-
-public:
-	Class8() :
-			defaultIValue(12)
-	{
-	}
-
-	/**
-	 * 
-	 */
-	int defaultIValue;
-
-	/**
-	 * 
-	 * @param iVal1 @param iVal2 @param cVal1 @param cVal2 @param this 
-	 */
-	int operation1(int /*in*/iVal1, int /*in*/iVal2 = 2, char /*in*/cVal1,
-			char /*in*/cVal2);
-
-	/**
-	 * 
-	 * @param iVal1 
-	 */
-	void operation1(int /*in*/iVal1);
-
-};
-/************************************************************/
-/* External declarations (package visibility)               */
-
-/************************************************************/
-
-/* Inline functions                                         */
-
-} // of namespace Package1
-
-/************************************************************
- End of Class8 class header
- ************************************************************/
-
-#endif
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class9.cpp b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class9.cpp
deleted file mode 100644
index e02f960c86d..00000000000
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class9.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-// --------------------------------------------------------
-// Code generated by Papyrus C++
-// --------------------------------------------------------
-
-#define CppCodegenTest_Package1_Class9_BODY
-
-/************************************************************
- Class9 class body
- ************************************************************/
-
-// include associated header file
-#include "CppCodegenTest/Package1/Class9.h"
-
-// Derived includes directives
-
-namespace Package1 {
-
-// static attributes (if any)
-
-/**
- * 
- * @param  
- */
-int Class9::volatileIntOperation()
-{
-
-}
-
-/**
- * Should not generate the 'register' keyword as it cannot be used in method signatures.
- * @param  
- */
-int Class9::registerOperation()
-{
-
-}
-
-/**
- * 
- * @param  
- */
-int Class9::externOperation()
-{
-
-}
-
-} // of namespace Package1
-
-/************************************************************
- End of Class9 class body
- ************************************************************/
\ No newline at end of file
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class9.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class9.h
deleted file mode 100644
index 427cfa5b191..00000000000
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class9.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// --------------------------------------------------------
-// Code generated by Papyrus C++
-// --------------------------------------------------------
-
-#ifndef CPPCODEGENTEST_PACKAGE1_CLASS9_H
-#define CPPCODEGENTEST_PACKAGE1_CLASS9_H
-
-/************************************************************
- Class9 class header
- ************************************************************/
-
-#include "CppCodegenTest/Package1/Pkg_Package1.h"
-
-#include "AnsiCLibrary/Pkg_AnsiCLibrary.h"
-
-namespace Package1 {
-
-/************************************************************/
-/**
- * 
- */
-
-class Class9
-{
-
-public:
-	Class9() :
-			externAttribute(3)
-	{
-	}
-
-	/**
-	 * 
-	 */
-	int volatileAttribute;
-
-	/**
-	 * Should not generate 'register' keyword as 'register' only applies to properties declared within the scope of an operation.
-	 */
-	int registerAttribute;
-
-	/**
-	 * 
-	 * @param  
-	 */
-	int volatileIntOperation();
-
-	/**
-	 * Should not generate the 'register' keyword as it cannot be used in method signatures.
-	 * @param  
-	 */
-	int registerOperation();
-
-};
-/************************************************************/
-/* External declarations (package visibility)               */
-
-/**
- * 
- */
-int externAttribute;
-
-/**
- * 
- * @param  
- */
-int externOperation();
-
-/************************************************************/
-
-/* Inline functions                                         */
-
-} // of namespace Package1
-
-/************************************************************
- End of Class9 class header
- ************************************************************/
-
-#endif
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Pkg_Package1.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Pkg_Package1.h
deleted file mode 100644
index 6fee268eb47..00000000000
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Pkg_Package1.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// --------------------------------------------------------
-// Code generated by Papyrus C++
-// --------------------------------------------------------
-
-#ifndef PKG_CPPCODEGENTEST_PACKAGE1
-#define PKG_CPPCODEGENTEST_PACKAGE1
-
-/************************************************************
- Pkg_Package1 package header
- ************************************************************/
-
-#include "CppCodegenTest/Pkg_CppCodegenTest.h"
-
-#ifndef _IN_
-#define _IN_
-#endif
-#ifndef _OUT_
-#define _OUT_
-#endif
-#ifndef _INOUT_
-#define _INOUT_
-#endif
-
-/* Package dependency header include                        */
-
-namespace Package1 {
-
-// Types defined within the package
-
-}// of namespace Package1
-
-/************************************************************
- End of Pkg_Package1 package header
- ************************************************************/
-
-#endif
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class1.cpp b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class1.cpp
index e89d702b3f9..a5cf3849df5 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class1.cpp
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class1.cpp
@@ -17,9 +17,11 @@
 
 /**
  * Assignment operator
- * @param cSource @param this 
+ * @param cSource 
+ * @return this 
  */
 Class1& Class1::operator =(const Class1 /*in*/& cSource) {
+
 	if (this == &cSource)
 		return *this;
 
@@ -30,7 +32,6 @@ Class1& Class1::operator =(const Class1 /*in*/& cSource) {
 
 /**
  * Destructor
- * 
  */
 Class1::~Class1() {
 
@@ -41,6 +42,7 @@ Class1::~Class1() {
  * @param cSource 
  */
 Class1::Class1(const Class1 /*in*/& cSource) {
+
 	iVal = cSource.iVal;
 }
 
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class1.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class1.h
index f6818875447..76afbc28aef 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class1.h
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class1.h
@@ -17,20 +17,18 @@
 /**
  * 
  */
-
 class Class1 {
-
 public:
 
 	/**
 	 * Assignment operator
-	 * @param cSource @param this 
+	 * @param cSource 
+	 * @return this 
 	 */
 	Class1& operator =(const Class1 /*in*/& cSource);
 
 	/**
 	 * Destructor
-	 * 
 	 */
 	~Class1();
 
@@ -41,16 +39,13 @@ public:
 	Class1(const Class1 /*in*/& cSource);
 
 private:
-
 	/**
 	 * 
 	 */
 	int iVal;
-
 };
 /************************************************************/
 /* External declarations (package visibility)               */
-
 /************************************************************/
 
 /* Inline functions                                         */
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class2.cpp b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class2.cpp
index 2086e77728f..d90fadbc9d9 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class2.cpp
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class2.cpp
@@ -15,13 +15,12 @@
 
 // Include from Include declaration (body)
 #include <string.h>
-// End of Include stereotype (body)
+// End of Include declaration (body)
 
 // static attributes (if any)
 
 /**
  * Default constructor
- * 
  */
 Class2::Class2() {
 	iVal1 = 0;
@@ -31,7 +30,9 @@ Class2::Class2() {
 
 /**
  * Constructor with parameters
- * @param newIVal1 @param newIVal2 @param newBVal 
+ * @param newIVal1 
+ * @param newIVal2 
+ * @param newBVal 
  */
 Class2::Class2(int /*in*/newIVal1, int /*in*/newIVal2, bool /*in*/newBVal) {
 	iVal1 = newIVal1;
@@ -41,7 +42,9 @@ Class2::Class2(int /*in*/newIVal1, int /*in*/newIVal2, bool /*in*/newBVal) {
 
 /**
  * Virtual method
- * @param a @param b @param  
+ * @param a 
+ * @param b 
+ * @return  
  */
 double Class2::virtualOp(double /*in*/a, double /*in*/b) {
 	return;
@@ -49,42 +52,37 @@ double Class2::virtualOp(double /*in*/a, double /*in*/b) {
 
 /**
  * Static method
- * 
  */
 void Class2::staticOp() {
-
 }
 
 /**
  * Friend method
- * 
  */
 void Class2::friendOp() {
-
 }
 
 /**
  * Non-static method
- * 
  */
 void Class2::nonStaticOp() {
-
 }
 
 /**
  * Method with in, out, inout, return parameters
- * @param in @param out @param inout @param ret 
+ * @param in 
+ * @param out 
+ * @param inout 
+ * @return ret 
  */
 int Class2::paramsOp(int /*in*/in, int /*out*/* out, int /*inout*/* inout) {
-
 }
 
 /**
  * Void Method
- * @param  
+ * @return  
  */
 void Class2::voidOp() {
-
 }
 
 /**
@@ -92,28 +90,24 @@ void Class2::voidOp() {
  * @param newIVal1 
  */
 void Class2::defaultValueOp(int /*in*/newIVal1) {
-
 }
 
 /**
  * Virtual destructor
- * 
  */
 Class2::~Class2() {
-
 }
 
 /**
  * 
- * @param c1 @param  
+ * @param c1 
+ * @return  
  */
 Class1 Class2::classesOp(Class1 /*in*/c1) {
-
 }
 
 /**
  * Const method
- * 
  */
 void Class2::constOp() const {
 	std::cout << "I am a const method" << std::endl;
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class2.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class2.h
index 047fb6e8bb4..037be014e9c 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class2.h
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class2.h
@@ -12,7 +12,6 @@
 #include "CppCodegenTest/Pkg_CppCodegenTest.h"
 
 #include "AnsiCLibrary/Pkg_AnsiCLibrary.h"
-
 #include "CppCodegenTest/Class1.h"
 
 // Include from Include stereotype (header)
@@ -23,11 +22,8 @@
 /**
  * 
  */
-
 class Class2 {
-
 public:
-
 	/**
 	 * boolean  value with public visibility
 	 */
@@ -35,55 +31,60 @@ public:
 
 	/**
 	 * Default constructor
-	 * 
 	 */
 	Class2();
 
 	/**
 	 * Constructor with parameters
-	 * @param newIVal1 @param newIVal2 @param newBVal 
+	 * @param newIVal1 
+	 * @param newIVal2 
+	 * @param newBVal 
 	 */
 	Class2(int /*in*/newIVal1, int /*in*/newIVal2, bool /*in*/newBVal);
 
 	/**
 	 * Virtual method
-	 * @param a @param b @param  
+	 * @param a 
+	 * @param b 
+	 * @return  
 	 */
 	virtual double virtualOp(double /*in*/a, double /*in*/b);
 
 	/**
 	 * Static method
-	 * 
 	 */
 	static void staticOp();
 
 	/**
 	 * Inline method
-	 * @param a @param b @param  
+	 * @param a 
+	 * @param b 
+	 * @return  
 	 */
 	inline int inlineOp(int /*in*/a, int /*in*/b);
 
 	/**
 	 * Friend method
-	 * 
 	 */
 	void friendOp();
 
 	/**
 	 * Non-static method
-	 * 
 	 */
 	void nonStaticOp();
 
 	/**
 	 * Method with in, out, inout, return parameters
-	 * @param in @param out @param inout @param ret 
+	 * @param in 
+	 * @param out 
+	 * @param inout 
+	 * @return ret 
 	 */
 	int paramsOp(int /*in*/in, int /*out*/* out, int /*inout*/* inout);
 
 	/**
 	 * Void Method
-	 * @param  
+	 * @return  
 	 */
 	void voidOp();
 
@@ -95,52 +96,47 @@ public:
 
 	/**
 	 * Virtual destructor
-	 * 
 	 */
 	virtual ~Class2();
 
 	/**
 	 * 
-	 * @param c1 @param  
+	 * @param c1 
+	 * @return  
 	 */
 	Class1 classesOp(Class1 /*in*/c1);
 
 	/**
 	 * Const method
-	 * 
 	 */
 	void constOp() const;
 
 protected:
-
 	/**
 	 * int value with protected visibility
 	 */
 	int protectedIVal1;
 
 private:
-
 	/**
 	 * int value with private visibility
 	 */
 	int privateIVal2;
-
 };
 /************************************************************/
 /* External declarations (package visibility)               */
-
 /**
  * int value with package visibility
  */
 int packageIVal3;
-
 /************************************************************/
 
 /* Inline functions                                         */
-
 /**
  * Inline method
- * @param a @param b @param  
+ * @param a 
+ * @param b 
+ * @return  
  */
 inline int Class2::inlineOp(int /*in*/a, int /*in*/b) {
 	return a + b;
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class3.cpp b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class3.cpp
index 730349c9c02..df4c1ee3a6a 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class3.cpp
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class3.cpp
@@ -17,7 +17,9 @@
 
 /**
  * Inherited method overriding.
- * @param a @param b @param  
+ * @param a 
+ * @param b 
+ * @return  
  */
 double Class3::virtualOp(double /*in*/a, double /*in*/b) {
 	return a + b;
@@ -25,18 +27,14 @@ double Class3::virtualOp(double /*in*/a, double /*in*/b) {
 
 /**
  * Inherited virtual destructor
- * 
  */
 Class3::~Class3() {
-
 }
 
 /**
  * Default constructor
- * 
  */
 Class3::Class3() {
-
 }
 
 /************************************************************
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class3.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class3.h
index fb742f16899..21c580f553e 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class3.h
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class3.h
@@ -12,40 +12,36 @@
 #include "CppCodegenTest/Pkg_CppCodegenTest.h"
 
 #include "AnsiCLibrary/Pkg_AnsiCLibrary.h"
-
 #include "CppCodegenTest/Class2.h"
 
 /************************************************************/
 /**
  * 
  */
-
 class Class3: public Class2 {
-
 public:
 
 	/**
 	 * Inherited method overriding.
-	 * @param a @param b @param  
+	 * @param a 
+	 * @param b 
+	 * @return  
 	 */
 	double virtualOp(double /*in*/a, double /*in*/b);
 
 	/**
 	 * Inherited virtual destructor
-	 * 
 	 */
 	~Class3();
 
 	/**
 	 * Default constructor
-	 * 
 	 */
 	Class3();
 
 };
 /************************************************************/
 /* External declarations (package visibility)               */
-
 /************************************************************/
 
 /* Inline functions                                         */
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class4.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class4.h
index c39f38c764d..961583668f7 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class4.h
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class4.h
@@ -11,18 +11,15 @@
 
 #include "CppCodegenTest/Pkg_CppCodegenTest.h"
 
-#include "CppCodegenTest/Class3.h"
-
 #include "AnsiCLibrary/Pkg_AnsiCLibrary.h"
+#include "CppCodegenTest/Class3.h"
 
 /************************************************************/
 /**
  * 
  */
-
 class Class4 {
 public:
-
 	/**
 	 * 
 	 */
@@ -31,148 +28,119 @@ public:
 	Class4() :
 			arrayDoubleDefault( { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 }) {
 	}
-
 	/**
 	 * 
 	 */
 	Class3* c3;
-
 	/**
 	 * 
 	 */
 	char charVar;
-
 	/**
 	 * 
 	 */
 	double doubleVar;
-
 	/**
 	 * 
 	 */
 	float floatVar;
-
 	/**
 	 * 
 	 */
 	int intVar;
-
 	/**
 	 * 
 	 */
 	void voidVar;
-
 	/**
 	 * 
 	 */
 	long longVar;
-
 	/**
 	 * 
 	 */
 	long double longDoubleVar;
-
 	/**
 	 * 
 	 */
 	short shortVar;
-
 	/**
 	 * 
 	 */
 	unsigned int unsignedIntVar;
-
 	/**
 	 * 
 	 */
 	unsigned short unsignedShortVar;
-
 	/**
 	 * 
 	 */
 	unsigned char unsignedCharVar;
-
 	/**
 	 * 
 	 */
 	unsigned long unsignedLongVar;
-
 	/**
 	 * 
 	 */
 	bool boolVar;
-
 	/**
 	 * 
 	 */
 	int16_t int16_tVar;
-
 	/**
 	 * 
 	 */
 	uint16_t uint16_tVar;
-
 	/**
 	 * 
 	 */
 	int32_t int32_tVar;
-
 	/**
 	 * 
 	 */
 	uint32_t uint32_tVar;
-
 	/**
 	 * 
 	 */
 	int64_t int64_tVar;
-
 	/**
 	 * 
 	 */
 	uint64_t uint64_tVar;
-
 	/**
 	 * 
 	 */
 	wchar_t wchar_tVar;
-
 	/**
 	 * 
 	 */
 	int8_t int8_tVar;
-
 	/**
 	 * 
 	 */
 	uint8_t uint8_tVar;
-
 	/**
 	 * 
 	 */
 	::CppCodegenTest::Class4::pChar pc;
-
 	/**
 	 * 
 	 */
 	double arrayDoubleDefault[13];
-
 	/**
 	 * 
 	 */
 	char arrayCharInit[11] = { 'h', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l',
 			'd' };
-
 	/**
 	 * 
 	 */
 	char* charString;
-
 	/**
 	 * 
 	 */
 	char* ptrChar;
-
 	/**
 	 * 
 	 */
@@ -181,7 +149,6 @@ public:
 };
 /************************************************************/
 /* External declarations (package visibility)               */
-
 /************************************************************/
 
 /* Inline functions                                         */
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class5.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class5.h
index cdbc8316b4a..03a45babb83 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class5.h
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class5.h
@@ -17,11 +17,8 @@
 /**
  * C++ Virtual Interface
  */
-
 class Class5 {
-
 public:
-
 	/**
 	 * 
 	 */
@@ -29,20 +26,19 @@ public:
 
 	/**
 	 * 
-	 * @param iReturn 
+	 * @return iReturn 
 	 */
 	virtual int pureVirtualOp() = 0;
 
 	/**
 	 * 
-	 * @param iReturn 
+	 * @return iReturn 
 	 */
 	virtual int* pureVirtualConstOp() = 0;
 
 };
 /************************************************************/
 /* External declarations (package visibility)               */
-
 /************************************************************/
 
 /* Inline functions                                         */
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class6.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class6.h
index a7bb70004da..9d3f1d42847 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class6.h
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class6.h
@@ -12,18 +12,14 @@
 #include "CppCodegenTest/Pkg_CppCodegenTest.h"
 
 #include "CppCodegenTest/Class3.h"
-
 #include "CppCodegenTest/Class5.h"
 
 /************************************************************/
 /**
  * Virtual class inheritance and class instantiation
  */
-
 class Class6: public Class5 {
-
 public:
-
 	/**
 	 * 
 	 */
@@ -32,7 +28,6 @@ public:
 };
 /************************************************************/
 /* External declarations (package visibility)               */
-
 /************************************************************/
 
 /* Inline functions                                         */
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class7.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class7.h
index ba39ae90524..163c5fef2c9 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class7.h
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class7.h
@@ -21,19 +21,15 @@
 /**
  * 
  */
-
 class Class7 {
-
 public:
 	Class7() :
 			defaultProp(43) {
 	}
-
 	/**
 	 * 
 	 */
 	static int staticProp;
-
 	/**
 	 * 
 	 */
@@ -42,12 +38,10 @@ public:
 };
 /************************************************************/
 /* External declarations (package visibility)               */
-
 /**
  * 
  */
 int externProp;
-
 /************************************************************/
 
 /* Inline functions                                         */
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class8.cpp b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class8.cpp
index c0c966cbd99..f58270b9f4f 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class8.cpp
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class8.cpp
@@ -19,11 +19,14 @@ namespace Package1 {
 
 /**
  * 
- * @param iVal1 @param iVal2 @param cVal1 @param cVal2 @param this 
+ * @param iVal1 
+ * @param iVal2 
+ * @param cVal1 
+ * @param cVal2 
+ * @return this 
  */
 int Class8::operation1(int /*in*/iVal1, int /*in*/iVal2, char /*in*/cVal1,
 		char /*in*/cVal2) {
-
 }
 
 /**
@@ -31,7 +34,6 @@ int Class8::operation1(int /*in*/iVal1, int /*in*/iVal2, char /*in*/cVal1,
  * @param iVal1 
  */
 void Class8::operation1(int /*in*/iVal1) {
-
 }
 
 } // of namespace Package1
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class8.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class8.h
index 194ce808122..38718cf0b89 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class8.h
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class8.h
@@ -19,14 +19,11 @@ namespace Package1 {
 /**
  * 
  */
-
 class Class8 {
-
 public:
 	Class8() :
 			defaultIValue(12) {
 	}
-
 	/**
 	 * 
 	 */
@@ -34,7 +31,11 @@ public:
 
 	/**
 	 * 
-	 * @param iVal1 @param iVal2 @param cVal1 @param cVal2 @param this 
+	 * @param iVal1 
+	 * @param iVal2 
+	 * @param cVal1 
+	 * @param cVal2 
+	 * @return this 
 	 */
 	int operation1(int /*in*/iVal1, int /*in*/iVal2 = 2, char /*in*/cVal1,
 			char /*in*/cVal2);
@@ -48,7 +49,6 @@ public:
 };
 /************************************************************/
 /* External declarations (package visibility)               */
-
 /************************************************************/
 
 /* Inline functions                                         */
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class9.cpp b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class9.cpp
index 26d3b037db4..7421ee6daa6 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class9.cpp
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class9.cpp
@@ -19,26 +19,23 @@ namespace Package1 {
 
 /**
  * 
- * @param  
+ * @return  
  */
 int Class9::volatileIntOperation() {
-
 }
 
 /**
  * Should not generate the 'register' keyword as it cannot be used in method signatures.
- * @param  
+ * @return  
  */
 int Class9::registerOperation() {
-
 }
 
 /**
  * 
- * @param  
+ * @return  
  */
 int Class9::externOperation() {
-
 }
 
 } // of namespace Package1
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class9.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class9.h
index 03603e898f5..b1972b6446f 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class9.h
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class9.h
@@ -19,19 +19,15 @@ namespace Package1 {
 /**
  * 
  */
-
 class Class9 {
-
 public:
 	Class9() :
 			externAttribute(3) {
 	}
-
 	/**
 	 * 
 	 */
 	int volatileAttribute;
-
 	/**
 	 * Should not generate 'register' keyword as 'register' only applies to properties declared within the scope of an operation.
 	 */
@@ -39,20 +35,19 @@ public:
 
 	/**
 	 * 
-	 * @param  
+	 * @return  
 	 */
 	int volatileIntOperation();
 
 	/**
 	 * Should not generate the 'register' keyword as it cannot be used in method signatures.
-	 * @param  
+	 * @return  
 	 */
 	int registerOperation();
 
 };
 /************************************************************/
 /* External declarations (package visibility)               */
-
 /**
  * 
  */
@@ -60,10 +55,9 @@ int externAttribute;
 
 /**
  * 
- * @param  
+ * @return  
  */
 int externOperation();
-
 /************************************************************/
 
 /* Inline functions                                         */
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Pkg_Package1.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Pkg_Package1.h
index 6fee268eb47..2e26af6ff93 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Pkg_Package1.h
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Pkg_Package1.h
@@ -1,7 +1,3 @@
-// --------------------------------------------------------
-// Code generated by Papyrus C++
-// --------------------------------------------------------
-
 #ifndef PKG_CPPCODEGENTEST_PACKAGE1
 #define PKG_CPPCODEGENTEST_PACKAGE1
 
@@ -26,7 +22,6 @@
 namespace Package1 {
 
 // Types defined within the package
-
 }// of namespace Package1
 
 /************************************************************
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Pkg_CppCodegenTest.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Pkg_CppCodegenTest.h
index 62e2045f7ef..bc206abeaee 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Pkg_CppCodegenTest.h
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Pkg_CppCodegenTest.h
@@ -1,7 +1,3 @@
-// --------------------------------------------------------
-// Code generated by Papyrus C++
-// --------------------------------------------------------
-
 #ifndef PKG_CPPCODEGENTEST
 #define PKG_CPPCODEGENTEST
 
@@ -24,7 +20,6 @@
 namespace CppCodegenTest {
 
 // Types defined within the package
-
 }// of namespace CppCodegenTest
 
 /************************************************************
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/META-INF/MANIFEST.MF
index a90e2fe8750..5e514658522 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.junit,

- org.eclipse.papyrus.cpp.codegen;bundle-version="1.0.1",

- org.eclipse.papyrus.cpp.codegen.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.cpp.codegen;bundle-version="1.1.0",

+ org.eclipse.papyrus.cpp.codegen.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.ui.ide,

  org.eclipse.emf.common.ui,

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

  org.eclipse.emf.edit,

  org.eclipse.gmf.runtime.diagram.ui,

- org.eclipse.papyrus.infra.services.openelement;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.openelement;bundle-version="1.1.0",

  org.eclipse.cdt.core,

- org.eclipse.papyrus.acceleo;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.acceleo;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.cpp.codegen.tests

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Eclipse-BundleShape: dir

 Bundle-Name: Papyrus CPP Codegen Tests (Incubation)

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/build.properties b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/build.properties
index 11811fead79..196f960c0e9 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/build.properties
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/build.properties
@@ -4,6 +4,5 @@ bin.includes = .,\
                resources/,\

                META-INF/,\

                ExpectedModel/,\

-               about.html,\

-               CppCodegenTest/

+               about.html

 src.includes = about.html

diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/pom.xml b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/pom.xml
index 8693fb3e9f6..5dff9a50400 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/pom.xml
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-extra-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.cpp.codegen.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/src/org/eclipse/papyrus/cpp/codegen/tests/CppCodegenTest.java b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/src/org/eclipse/papyrus/cpp/codegen/tests/CppCodegenTest.java
index fdbc25e5389..435eb82ab26 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/src/org/eclipse/papyrus/cpp/codegen/tests/CppCodegenTest.java
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/src/org/eclipse/papyrus/cpp/codegen/tests/CppCodegenTest.java
@@ -43,6 +43,7 @@ import org.junit.BeforeClass;
 import org.junit.ClassRule;

 import org.junit.Test;

 

+@SuppressWarnings("nls")

 public class CppCodegenTest {

 

 	static {

diff --git a/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/.classpath b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/.classpath
new file mode 100644
index 00000000000..2d1a4302f04
--- /dev/null
+++ b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/.project b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/.project
new file mode 100644
index 00000000000..5787642c84a
--- /dev/null
+++ b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.migration.rsa.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/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..44217f8c068
--- /dev/null
+++ b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

+org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.5

diff --git a/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..016fa756ffa
--- /dev/null
+++ b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,43 @@
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.core.runtime,

+ org.eclipse.uml2.uml,

+ org.eclipse.emf;bundle-version="2.6.0",

+ org.eclipse.m2m.qvt.oml;bundle-version="3.4.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.1.0",

+ org.eclipse.papyrus.migration.rsa;bundle-version="1.1.0",

+ org.eclipse.ui;bundle-version="3.106.0",

+ org.junit;bundle-version="4.11.0",

+ org.eclipse.papyrus.m2m.qvto;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.core.resources,

+ org.eclipse.ui.workbench,

+ org.eclipse.ui.ide,

+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.1.0",

+ org.eclipse.gmf.runtime.notation.edit,

+ org.eclipse.gmf.runtime.emf.core,

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0",

+ org.eclipse.emf.ecore,

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.emf.common,

+ org.eclipse.core.commands,

+ org.eclipse.emf.transaction,

+ org.eclipse.uml2.uml.resources,

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.gef

+Export-Package: org.eclipse.papyrus.migration.rsa.tests,

+ org.eclipse.papyrus.migration.rsa.tests.qvt

+Bundle-Vendor: Eclipse Modeling Project

+Bundle-ActivationPolicy: lazy

+Bundle-Version: 1.1.0.qualifier

+Bundle-Name: Model import migration Tests (Incubation)

+Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.migration.rsa.tests.Activator

+Bundle-SymbolicName: org.eclipse.papyrus.migration.rsa.tests

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

+

diff --git a/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/about.html b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/about.html
new file mode 100644
index 00000000000..5ddc72c177f
--- /dev/null
+++ b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>November 20, 2008</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/build.properties b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/build.properties
new file mode 100644
index 00000000000..fdd2cc92d34
--- /dev/null
+++ b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/build.properties
@@ -0,0 +1,7 @@
+source.. = src/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               about.html,\

+               resources/

+src.includes = about.html

diff --git a/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/org.eclipse.papyrus.migration.rsa.tests.launch b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/org.eclipse.papyrus.migration.rsa.tests.launch
new file mode 100644
index 00000000000..9ccdfb31e31
--- /dev/null
+++ b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/org.eclipse.papyrus.migration.rsa.tests.launch
@@ -0,0 +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-migration-workspace"/>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

+<listEntry value="/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/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.migration.rsa.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.migration.rsa.tests"/>

+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms512m -Xmx1024m -XX:PermSize=256M -XX:MaxPermSize=512M"/>

+<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/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/pom.xml b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/pom.xml
new file mode 100644
index 00000000000..d6a837a04cf
--- /dev/null
+++ b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/pom.xml
@@ -0,0 +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</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+    <relativePath>../../../../../releng/top-pom-extra-tests.xml</relativePath>
+  </parent>
+  <groupId>org.eclipse.papyrus</groupId>
+  <artifactId>org.eclipse.papyrus.migration.rsa.tests</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+</project>
diff --git a/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/resources/ModelTestClass.emx b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/resources/ModelTestClass.emx
new file mode 100644
index 00000000000..c0499ebacc8
--- /dev/null
+++ b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/resources/ModelTestClass.emx
@@ -0,0 +1,606 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--xtools2_universal_type_manager-->

+<?com.ibm.xtools.emf.core.signature <signature id="com.ibm.xtools.uml.msl.model" version="7.0.0"><feature description="" name="com.ibm.xtools.ruml.feature" url="" version="7.0.0"/></signature>?>

+<?com.ibm.xtools.emf.core.signature <signature id="com.ibm.xtools.mmi.ui.signatures.diagram" version="7.0.0"><feature description="" name="Rational Modeling Platform (com.ibm.xtools.rmp)" url="" version="7.0.0"/></signature>?>

+<uml:Package 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/3.0.0/UML" xmlns:umlnotation="http://www.ibm.com/xtools/1.5.3/Umlnotation" xmi:id="_CpI9orM9EeOedMT5QMT8fQ" name="ModelTestClass">

+  <eAnnotations xmi:id="_CpI9o7M9EeOedMT5QMT8fQ" source="uml2.diagrams">

+    <contents xmi:type="umlnotation:UMLDiagram" xmi:id="_G_f54LM9EeOedMT5QMT8fQ" type="Class" name="ClassDiagramTest">

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_JlYXALM9EeOedMT5QMT8fQ" element="_JkyhILM9EeOedMT5QMT8fQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_JlYXArM9EeOedMT5QMT8fQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_JlYXA7M9EeOedMT5QMT8fQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_JliIALM9EeOedMT5QMT8fQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_JliIAbM9EeOedMT5QMT8fQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_JliIArM9EeOedMT5QMT8fQ" type="Parent"/>

+        <children xmi:type="umlnotation:UMLShapeCompartment" xmi:id="_JliIA7M9EeOedMT5QMT8fQ" type="PackageContents" collapsed="true" canonical="false"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JlYXAbM9EeOedMT5QMT8fQ" x="3095" y="2090" width="9918" height="7641"/>

+      </children>

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_KpEooLM9EeOedMT5QMT8fQ" element="_KoojwLM9EeOedMT5QMT8fQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_KprFkLM9EeOedMT5QMT8fQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_KprFkbM9EeOedMT5QMT8fQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_KprFkrM9EeOedMT5QMT8fQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_KprFk7M9EeOedMT5QMT8fQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_KprFlLM9EeOedMT5QMT8fQ" type="Parent"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_KprFlbM9EeOedMT5QMT8fQ" type="AttributeCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_KprFlrM9EeOedMT5QMT8fQ" type="OperationCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_KprFl7M9EeOedMT5QMT8fQ" visible="false" type="SignalCompartment"/>

+        <children xmi:type="umlnotation:UMLShapeCompartment" xmi:id="_KprFmLM9EeOedMT5QMT8fQ" visible="false" type="StructureCompartment"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KpEoobM9EeOedMT5QMT8fQ" x="4259" y="3889" width="3859" height="3331"/>

+      </children>

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_RwU_MLM9EeOedMT5QMT8fQ" element="_RwLOMLM9EeOedMT5QMT8fQ" fontName="Times New Roman" fontHeight="8" transparency="69" gradient="11102764, 16777215, 0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_RwU_MrM9EeOedMT5QMT8fQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_RwU_M7M9EeOedMT5QMT8fQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_RwU_NLM9EeOedMT5QMT8fQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_RwU_NbM9EeOedMT5QMT8fQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_RwU_NrM9EeOedMT5QMT8fQ" type="Parent"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_RwU_N7M9EeOedMT5QMT8fQ" type="AttributeCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_RwU_OLM9EeOedMT5QMT8fQ" type="OperationCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_RwU_ObM9EeOedMT5QMT8fQ" visible="false" type="SignalCompartment"/>

+        <children xmi:type="umlnotation:UMLShapeCompartment" xmi:id="_RwU_OrM9EeOedMT5QMT8fQ" visible="false" type="StructureCompartment"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RwU_MbM9EeOedMT5QMT8fQ" x="15180" y="5544" height="1926"/>

+      </children>

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_rrrG4LM9EeOedMT5QMT8fQ" element="_rrh88LM9EeOedMT5QMT8fQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_rrrG4rM9EeOedMT5QMT8fQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_rrrG47M9EeOedMT5QMT8fQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_rrrG5LM9EeOedMT5QMT8fQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_rrrG5bM9EeOedMT5QMT8fQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_rrrG5rM9EeOedMT5QMT8fQ" type="Parent"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_rrrG57M9EeOedMT5QMT8fQ" type="AttributeCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_rrrG6LM9EeOedMT5QMT8fQ" type="OperationCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_rrrG6bM9EeOedMT5QMT8fQ" visible="false" type="SignalCompartment"/>

+        <children xmi:type="umlnotation:UMLShapeCompartment" xmi:id="_rrrG6rM9EeOedMT5QMT8fQ" visible="false" type="StructureCompartment"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rrrG4bM9EeOedMT5QMT8fQ" x="13596" y="792"/>

+      </children>

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_sgDKIbM9EeOedMT5QMT8fQ" element="_sgDKILM9EeOedMT5QMT8fQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_sgDKI7M9EeOedMT5QMT8fQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_sgDKJLM9EeOedMT5QMT8fQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_sgDKJbM9EeOedMT5QMT8fQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_sgDKJrM9EeOedMT5QMT8fQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_sgDKJ7M9EeOedMT5QMT8fQ" type="Parent"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_sgDKKLM9EeOedMT5QMT8fQ" type="AttributeCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_sgDKKbM9EeOedMT5QMT8fQ" type="OperationCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_sgDKKrM9EeOedMT5QMT8fQ" visible="false" type="SignalCompartment"/>

+        <children xmi:type="umlnotation:UMLShapeCompartment" xmi:id="_sgDKK7M9EeOedMT5QMT8fQ" visible="false" type="StructureCompartment"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sgDKIrM9EeOedMT5QMT8fQ" x="17952" y="792"/>

+      </children>

+      <element xsi:nil="true"/>

+      <edges xmi:type="umlnotation:UMLConnector" xmi:id="_TPivMLM9EeOedMT5QMT8fQ" element="_TPGDQLM9EeOedMT5QMT8fQ" source="_KpEooLM9EeOedMT5QMT8fQ" target="_RwU_MLM9EeOedMT5QMT8fQ" fontName="Segoe UI" fontHeight="8" roundedBendpointsRadius="4" routing="Rectilinear" lineColor="8421504" lineWidth="1" showStereotype="Text">

+        <children xmi:type="notation:DecorationNode" xmi:id="_TPivMrM9EeOedMT5QMT8fQ" type="NameLabel">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_TPivNLM9EeOedMT5QMT8fQ" type="Stereotype"/>

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_TPivNbM9EeOedMT5QMT8fQ" type="Name"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TPivM7M9EeOedMT5QMT8fQ" y="-186"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_TPivNrM9EeOedMT5QMT8fQ" type="ToMultiplicityLabel" element="_TPP0Q7M9EeOedMT5QMT8fQ">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_TPivOLM9EeOedMT5QMT8fQ" type="ToMultiplicity"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TPivN7M9EeOedMT5QMT8fQ" y="396"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_TPivObM9EeOedMT5QMT8fQ" type="ToRoleLabel" element="_TPP0Q7M9EeOedMT5QMT8fQ">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_TPivO7M9EeOedMT5QMT8fQ" type="ToRole"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TPivOrM9EeOedMT5QMT8fQ" y="-397"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_TPivPLM9EeOedMT5QMT8fQ" type="FromMultiplicityLabel" element="_TPP0QLM9EeOedMT5QMT8fQ">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_TPivPrM9EeOedMT5QMT8fQ" type="FromMultiplicity"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TPivPbM9EeOedMT5QMT8fQ" y="396"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_TPivP7M9EeOedMT5QMT8fQ" type="FromRoleLabel" element="_TPP0QLM9EeOedMT5QMT8fQ">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_TPivQbM9EeOedMT5QMT8fQ" type="FromRole"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TPivQLM9EeOedMT5QMT8fQ" y="-397"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_TPivQrM9EeOedMT5QMT8fQ" type="ToQualifierLabel" element="_TPP0Q7M9EeOedMT5QMT8fQ">

+          <children xmi:type="notation:SemanticListCompartment" xmi:id="_TPivRLM9EeOedMT5QMT8fQ" type="QualifierCompartment"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TPivQ7M9EeOedMT5QMT8fQ" y="-186"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_TPivRbM9EeOedMT5QMT8fQ" type="FromQualifierLabel" element="_TPP0QLM9EeOedMT5QMT8fQ">

+          <children xmi:type="notation:SemanticListCompartment" xmi:id="_TPivR7M9EeOedMT5QMT8fQ" type="QualifierCompartment"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TPivRrM9EeOedMT5QMT8fQ" y="-186"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_TPivSLM9EeOedMT5QMT8fQ" type="ToConstraintLabel" element="_TPP0Q7M9EeOedMT5QMT8fQ">

+          <children xmi:type="notation:ListCompartment" xmi:id="_TPsgMLM9EeOedMT5QMT8fQ" type="ToConstraintCompartment"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TPivSbM9EeOedMT5QMT8fQ" y="1058"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_TPsgMbM9EeOedMT5QMT8fQ" type="FromConstraintLabel" element="_TPP0QLM9EeOedMT5QMT8fQ">

+          <children xmi:type="notation:ListCompartment" xmi:id="_TPsgM7M9EeOedMT5QMT8fQ" type="FromConstraintCompartment"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TPsgMrM9EeOedMT5QMT8fQ" y="1058"/>

+        </children>

+        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TPivMbM9EeOedMT5QMT8fQ" points="[1890, -237, -8382, -2641]$[5201, -237, -5071, -2641]$[5201, 2174, -5071, -230]$[9295, 2174, -977, -230]"/>

+      </edges>

+      <edges xmi:type="umlnotation:UMLConnector" xmi:id="_vmXa0LM9EeOedMT5QMT8fQ" element="_vmNp0LM9EeOedMT5QMT8fQ" source="_rrrG4LM9EeOedMT5QMT8fQ" target="_sgDKIbM9EeOedMT5QMT8fQ" fontName="Segoe UI" fontHeight="8" roundedBendpointsRadius="4" lineColor="8421504" lineWidth="1" showStereotype="Text">

+        <children xmi:type="notation:DecorationNode" xmi:id="_vmXa0rM9EeOedMT5QMT8fQ" type="NameLabel">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_vmXa1LM9EeOedMT5QMT8fQ" type="Stereotype"/>

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_vmXa1bM9EeOedMT5QMT8fQ" type="Name"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vmXa07M9EeOedMT5QMT8fQ" y="-186"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_vmXa1rM9EeOedMT5QMT8fQ" type="ToMultiplicityLabel" element="_vmNp1LM9EeOedMT5QMT8fQ">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_vmXa2LM9EeOedMT5QMT8fQ" type="ToMultiplicity"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vmXa17M9EeOedMT5QMT8fQ" y="396"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_vmXa2bM9EeOedMT5QMT8fQ" type="ToRoleLabel" element="_vmNp1LM9EeOedMT5QMT8fQ">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_vmXa27M9EeOedMT5QMT8fQ" type="ToRole"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vmXa2rM9EeOedMT5QMT8fQ" y="-397"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_vmXa3LM9EeOedMT5QMT8fQ" type="FromMultiplicityLabel" element="_vmNp0bM9EeOedMT5QMT8fQ">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_vmXa3rM9EeOedMT5QMT8fQ" type="FromMultiplicity"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vmXa3bM9EeOedMT5QMT8fQ" y="396"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_vmXa37M9EeOedMT5QMT8fQ" type="FromRoleLabel" element="_vmNp0bM9EeOedMT5QMT8fQ">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_vmXa4bM9EeOedMT5QMT8fQ" type="FromRole"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vmXa4LM9EeOedMT5QMT8fQ" y="-397"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_vmXa4rM9EeOedMT5QMT8fQ" type="ToQualifierLabel" element="_vmNp1LM9EeOedMT5QMT8fQ">

+          <children xmi:type="notation:SemanticListCompartment" xmi:id="_vmXa5LM9EeOedMT5QMT8fQ" type="QualifierCompartment"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vmXa47M9EeOedMT5QMT8fQ" y="-186"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_vmXa5bM9EeOedMT5QMT8fQ" type="FromQualifierLabel" element="_vmNp0bM9EeOedMT5QMT8fQ">

+          <children xmi:type="notation:SemanticListCompartment" xmi:id="_vmXa57M9EeOedMT5QMT8fQ" type="QualifierCompartment"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vmXa5rM9EeOedMT5QMT8fQ" y="-186"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_vmXa6LM9EeOedMT5QMT8fQ" type="ToConstraintLabel" element="_vmNp1LM9EeOedMT5QMT8fQ">

+          <children xmi:type="notation:ListCompartment" xmi:id="_vmXa6rM9EeOedMT5QMT8fQ" type="ToConstraintCompartment"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vmXa6bM9EeOedMT5QMT8fQ" y="1058"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_vmXa67M9EeOedMT5QMT8fQ" type="FromConstraintLabel" element="_vmNp0bM9EeOedMT5QMT8fQ">

+          <children xmi:type="notation:ListCompartment" xmi:id="_vmXa7bM9EeOedMT5QMT8fQ" type="FromConstraintCompartment"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vmXa7LM9EeOedMT5QMT8fQ" y="1058"/>

+        </children>

+        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vmXa0bM9EeOedMT5QMT8fQ" points="[40, 634, -5136, 567]$[40, 1326, -5136, 1259]$[1778, 2252, -3398, 2185]$[2439, 1326, -2737, 1259]$[3762, 2517, -1414, 2450]$[5216, 1326, 40, 1259]$[5216, 768, 40, 701]"/>

+      </edges>

+    </contents>

+    <contents xmi:type="umlnotation:UMLDiagram" xmi:id="_k6tgYLmTEeOxHvnUw-zqDQ" type="Object" name="ObjectDiagram1">

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_m6XD8LmTEeOxHvnUw-zqDQ" element="_m6NS8bmTEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_m6XD8rmTEeOxHvnUw-zqDQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_m6XD87mTEeOxHvnUw-zqDQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_m6XD9LmTEeOxHvnUw-zqDQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_m6XD9bmTEeOxHvnUw-zqDQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_m6XD9rmTEeOxHvnUw-zqDQ" type="Parent"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_m6XD97mTEeOxHvnUw-zqDQ" type="ValueSpecification"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_m6XD-LmTEeOxHvnUw-zqDQ" visible="false" type="TaggedValueSet"/>

+        <children xmi:type="notation:ListCompartment" xmi:id="_m6XD-bmTEeOxHvnUw-zqDQ" type="SlotCompartment"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m6XD8bmTEeOxHvnUw-zqDQ" x="3466" y="2592" height="3171"/>

+      </children>

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_n9waobmTEeOxHvnUw-zqDQ" element="_n9waoLmTEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_n9wao7mTEeOxHvnUw-zqDQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_n9wapLmTEeOxHvnUw-zqDQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_n9wapbmTEeOxHvnUw-zqDQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_n9waprmTEeOxHvnUw-zqDQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_n9wap7mTEeOxHvnUw-zqDQ" type="Parent"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_n9waqLmTEeOxHvnUw-zqDQ" type="ValueSpecification"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_n9waqbmTEeOxHvnUw-zqDQ" visible="false" type="TaggedValueSet"/>

+        <children xmi:type="notation:ListCompartment" xmi:id="_n9waqrmTEeOxHvnUw-zqDQ" type="SlotCompartment"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n9waormTEeOxHvnUw-zqDQ" x="12938" y="3518"/>

+      </children>

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_uFxhwLmTEeOxHvnUw-zqDQ" element="_uFem0bmTEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Image">

+        <children xmi:type="notation:DecorationNode" xmi:id="_uFxhwrmTEeOxHvnUw-zqDQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_uFxhw7mTEeOxHvnUw-zqDQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_uFxhxLmTEeOxHvnUw-zqDQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_uFxhxbmTEeOxHvnUw-zqDQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_uFxhxrmTEeOxHvnUw-zqDQ" type="ValueSpecification"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_uFxhx7mTEeOxHvnUw-zqDQ" visible="false" type="TaggedValueSet"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_uFxhyLmTEeOxHvnUw-zqDQ" type="Parent"/>

+        <children xmi:type="umlnotation:UMLShapeCompartment" xmi:id="_uFxhybmTEeOxHvnUw-zqDQ" type="InstanceStructureCompartment"/>

+        <children xmi:type="notation:ListCompartment" xmi:id="_uF7SwLmTEeOxHvnUw-zqDQ" type="SlotCompartment"/>

+        <children xmi:type="umlnotation:UMLShapeCompartment" xmi:id="_uF7SwbmTEeOxHvnUw-zqDQ" visible="false" type="DeploymentShapeCompartment"/>

+        <children xmi:type="notation:ListCompartment" xmi:id="_uF7SwrmTEeOxHvnUw-zqDQ" visible="false" type="DeploymentListCompartment"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uFxhwbmTEeOxHvnUw-zqDQ" x="14313" y="7117"/>

+      </children>

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_2bblILmTEeOxHvnUw-zqDQ" element="_2bR0IbmTEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_2bblIrmTEeOxHvnUw-zqDQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_2bblI7mTEeOxHvnUw-zqDQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_2bblJLmTEeOxHvnUw-zqDQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_2bblJbmTEeOxHvnUw-zqDQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_2bblJrmTEeOxHvnUw-zqDQ" type="Parent"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_2bblJ7mTEeOxHvnUw-zqDQ" type="ValueSpecification"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_2bblKLmTEeOxHvnUw-zqDQ" visible="false" type="TaggedValueSet"/>

+        <children xmi:type="notation:ListCompartment" xmi:id="_2bblKbmTEeOxHvnUw-zqDQ" type="SlotCompartment"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2bblIbmTEeOxHvnUw-zqDQ" x="20399" y="2989"/>

+      </children>

+      <element xsi:nil="true"/>

+      <edges xmi:type="umlnotation:UMLConnector" xmi:id="_qBIAkbmTEeOxHvnUw-zqDQ" element="_qBIAkLmTEeOxHvnUw-zqDQ" source="_n9waobmTEeOxHvnUw-zqDQ" target="_m6XD8LmTEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" roundedBendpointsRadius="4" routing="Rectilinear" lineColor="8421504" lineWidth="1" showStereotype="Text">

+        <children xmi:type="notation:DecorationNode" xmi:id="_qBIAk7mTEeOxHvnUw-zqDQ" visible="false" type="NameLabel">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_qBIAlbmTEeOxHvnUw-zqDQ" type="Stereotype"/>

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_qBIAlrmTEeOxHvnUw-zqDQ" type="Name"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qBIAlLmTEeOxHvnUw-zqDQ" y="-186"/>

+        </children>

+        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qBIAkrmTEeOxHvnUw-zqDQ" points="[-79, -7, 279, 28]$[-279, -26, 79, 9]"/>

+      </edges>

+    </contents>

+    <contents xmi:type="umlnotation:UMLDiagram" xmi:id="_LD2lMLmVEeOxHvnUw-zqDQ" type="Class" name="ClassDiagram1">

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_LZYJQLmVEeOxHvnUw-zqDQ" element="_LZNxMLmVEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_LZYwULmVEeOxHvnUw-zqDQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_LZYwUbmVEeOxHvnUw-zqDQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_LZYwUrmVEeOxHvnUw-zqDQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_LZZXYLmVEeOxHvnUw-zqDQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_LZZXYbmVEeOxHvnUw-zqDQ" type="Parent"/>

+        <children xmi:type="umlnotation:UMLShapeCompartment" xmi:id="_LZZXYrmVEeOxHvnUw-zqDQ" type="PackageContents" collapsed="true" canonical="false"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LZYJQbmVEeOxHvnUw-zqDQ" x="12170" y="3757"/>

+      </children>

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_N0KwsLmVEeOxHvnUw-zqDQ" element="_N0AYoLmVEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_N0LXwLmVEeOxHvnUw-zqDQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_N0LXwbmVEeOxHvnUw-zqDQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_N0LXwrmVEeOxHvnUw-zqDQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_N0LXw7mVEeOxHvnUw-zqDQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_N0LXxLmVEeOxHvnUw-zqDQ" type="Parent"/>

+        <children xmi:type="umlnotation:UMLShapeCompartment" xmi:id="_N0L-0LmVEeOxHvnUw-zqDQ" type="PackageContents" collapsed="true" canonical="false"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N0KwsbmVEeOxHvnUw-zqDQ" x="8281" y="8228"/>

+      </children>

+      <element xsi:nil="true"/>

+      <edges xmi:type="umlnotation:UMLConnector" xmi:id="_P1TiALmVEeOxHvnUw-zqDQ" element="_P1OpgLmVEeOxHvnUw-zqDQ" source="_N0KwsLmVEeOxHvnUw-zqDQ" target="_LZYJQLmVEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" roundedBendpointsRadius="4" routing="Rectilinear" lineColor="8421504" lineWidth="1" showStereotype="Text">

+        <children xmi:type="notation:DecorationNode" xmi:id="_P1UJELmVEeOxHvnUw-zqDQ" type="NameLabel">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_P1UJErmVEeOxHvnUw-zqDQ" type="Stereotype"/>

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_P1UJE7mVEeOxHvnUw-zqDQ" type="Name"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P1UJEbmVEeOxHvnUw-zqDQ" y="-186"/>

+        </children>

+        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P1TiAbmVEeOxHvnUw-zqDQ" points="[16, -16, -131, 153]$[152, -141, 5, 28]"/>

+      </edges>

+    </contents>

+  </eAnnotations>

+  <packageImport xmi:id="_CpI9pLM9EeOedMT5QMT8fQ">

+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

+  </packageImport>

+  <packagedElement xmi:type="uml:Package" xmi:id="_JkyhILM9EeOedMT5QMT8fQ" name="Package1">

+    <eAnnotations xmi:id="_JlFcELM9EeOedMT5QMT8fQ" source="uml2.diagrams"/>

+    <packagedElement xmi:type="uml:Class" xmi:id="_KoojwLM9EeOedMT5QMT8fQ" name="Class1">

+      <ownedAttribute xmi:id="_MGNVALM9EeOedMT5QMT8fQ" name="attribute1" visibility="private"/>

+      <ownedAttribute xmi:id="_MU8UkLM9EeOedMT5QMT8fQ" name="attribute2" visibility="private"/>

+      <ownedAttribute xmi:id="_TPP0QLM9EeOedMT5QMT8fQ" name="class2" visibility="private" type="_RwLOMLM9EeOedMT5QMT8fQ" association="_TPGDQLM9EeOedMT5QMT8fQ">

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WILJMLM9EeOedMT5QMT8fQ" value="1"/>

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WILJMbM9EeOedMT5QMT8fQ" value="1"/>

+      </ownedAttribute>

+      <ownedOperation xmi:id="_OfmOQLM9EeOedMT5QMT8fQ" name="Operation1"/>

+    </packagedElement>

+    <packagedElement xmi:type="uml:Association" xmi:id="_TPGDQLM9EeOedMT5QMT8fQ" name="" memberEnd="_TPP0QLM9EeOedMT5QMT8fQ _TPP0Q7M9EeOedMT5QMT8fQ"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_RwLOMLM9EeOedMT5QMT8fQ" name="Class2">

+    <ownedAttribute xmi:id="_TPP0Q7M9EeOedMT5QMT8fQ" name="class1" visibility="private" type="_KoojwLM9EeOedMT5QMT8fQ" association="_TPGDQLM9EeOedMT5QMT8fQ">

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WIU6MLM9EeOedMT5QMT8fQ" value="1"/>

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WIU6MbM9EeOedMT5QMT8fQ" value="1"/>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_rrh88LM9EeOedMT5QMT8fQ" name="Class1">

+    <ownedAttribute xmi:id="_vmNp0bM9EeOedMT5QMT8fQ" name="class3" visibility="private" type="_sgDKILM9EeOedMT5QMT8fQ" association="_vmNp0LM9EeOedMT5QMT8fQ">

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vmNp07M9EeOedMT5QMT8fQ" value="1"/>

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vmNp0rM9EeOedMT5QMT8fQ" value="1"/>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_sgDKILM9EeOedMT5QMT8fQ" name="Class3">

+    <ownedAttribute xmi:id="_vmNp1LM9EeOedMT5QMT8fQ" name="class1" visibility="private" type="_rrh88LM9EeOedMT5QMT8fQ" association="_vmNp0LM9EeOedMT5QMT8fQ">

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vmNp1rM9EeOedMT5QMT8fQ" value="1"/>

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vmNp1bM9EeOedMT5QMT8fQ" value="1"/>

+    </ownedAttribute>

+    <ownedOperation xmi:id="_taNsULM9EeOedMT5QMT8fQ" name="OperationClass31"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Association" xmi:id="_vmNp0LM9EeOedMT5QMT8fQ" name="" memberEnd="_vmNp0bM9EeOedMT5QMT8fQ _vmNp1LM9EeOedMT5QMT8fQ"/>

+  <packagedElement xmi:type="uml:Class" xmi:id="_ReW1YLmTEeOxHvnUw-zqDQ" name="Class4">

+    <eAnnotations xmi:id="_Rey6QLmTEeOxHvnUw-zqDQ" source="uml2.diagrams">

+      <contents xmi:type="umlnotation:UMLDiagram" xmi:id="_Rey6QbmTEeOxHvnUw-zqDQ" type="Structure" element="_ReW1YLmTEeOxHvnUw-zqDQ" measurementUnit="Himetric">

+        <children xmi:type="umlnotation:UMLShape" xmi:id="_Rey6QrmTEeOxHvnUw-zqDQ" type="StructureDiagramFrame" element="_ReW1YLmTEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+          <children xmi:type="umlnotation:UMLShapeCompartment" xmi:id="_Rey6Q7mTEeOxHvnUw-zqDQ" type="StructureCompartment">

+            <children xmi:type="umlnotation:UMLShape" xmi:id="_V1micrmTEeOxHvnUw-zqDQ" element="_V1micbmTEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" showListVisibility="None" showListSignature="true" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+              <eAnnotations xmi:id="_V1midLmTEeOxHvnUw-zqDQ" source="com.ibm.xtools.uml.ui.diagram.internal.styles">

+                <details xmi:id="_V1wTcLmTEeOxHvnUw-zqDQ" key="ShowTypeLabelStyle" value="Represents Name and Type Name"/>

+              </eAnnotations>

+              <children xmi:type="notation:DecorationNode" xmi:id="_V1wTcbmTEeOxHvnUw-zqDQ" type="ImageCompartment">

+                <layoutConstraint xmi:type="notation:Size" xmi:id="_V1wTcrmTEeOxHvnUw-zqDQ" width="1320" height="1320"/>

+              </children>

+              <children xmi:type="notation:BasicDecorationNode" xmi:id="_V1wTc7mTEeOxHvnUw-zqDQ" type="PartTextCompartment"/>

+              <children xmi:type="umlnotation:UMLShapeCompartment" xmi:id="_V1wTdLmTEeOxHvnUw-zqDQ" visible="false" type="PartStructureCompartment"/>

+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V1mic7mTEeOxHvnUw-zqDQ" x="2877" y="2692"/>

+            </children>

+          </children>

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_Rey6RLmTEeOxHvnUw-zqDQ" type="Name"/>

+          <children xmi:type="umlnotation:UMLShape" xmi:id="_UAhQILmTEeOxHvnUw-zqDQ" element="_UAXfILmTEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" showListVisibility="None" showListSignature="true" fillColor="16116705" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+            <eAnnotations xmi:id="_UAhQIrmTEeOxHvnUw-zqDQ" source="com.ibm.xtools.uml.ui.diagram.internal.styles">

+              <details xmi:id="_UAhQI7mTEeOxHvnUw-zqDQ" key="ShowTypeLabelStyle" value="Represents Name and Type Name"/>

+            </eAnnotations>

+            <children xmi:type="notation:DecorationNode" xmi:id="_UAhQJLmTEeOxHvnUw-zqDQ" type="PortName">

+              <children xmi:type="notation:BasicDecorationNode" xmi:id="_UAhQJrmTEeOxHvnUw-zqDQ" type="PartTextCompartment"/>

+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UAhQJbmTEeOxHvnUw-zqDQ" y="-133"/>

+            </children>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UAhQIbmTEeOxHvnUw-zqDQ" x="15611" y="3175"/>

+          </children>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rey6RbmTEeOxHvnUw-zqDQ" x="793" y="793" height="9498"/>

+        </children>

+        <edges xmi:type="umlnotation:UMLConnector" xmi:id="_Xeo80LmTEeOxHvnUw-zqDQ" element="_XeWB4LmTEeOxHvnUw-zqDQ" source="_V1micrmTEeOxHvnUw-zqDQ" target="_UAhQILmTEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" roundedBendpointsRadius="4" routing="Rectilinear" lineColor="8421504" lineWidth="1" showStereotype="Text">

+          <children xmi:type="notation:DecorationNode" xmi:id="_Xeo80rmTEeOxHvnUw-zqDQ" type="NameLabel">

+            <children xmi:type="notation:BasicDecorationNode" xmi:id="_Xeo81LmTEeOxHvnUw-zqDQ" type="Stereotype"/>

+            <children xmi:type="notation:BasicDecorationNode" xmi:id="_Xeo81bmTEeOxHvnUw-zqDQ" type="Name"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xeo807mTEeOxHvnUw-zqDQ" y="-186"/>

+          </children>

+          <children xmi:type="notation:DecorationNode" xmi:id="_Xeo81rmTEeOxHvnUw-zqDQ" visible="false" type="ToMultiplicityLabel" element="_XefL0bmTEeOxHvnUw-zqDQ">

+            <children xmi:type="notation:BasicDecorationNode" xmi:id="_Xeo82LmTEeOxHvnUw-zqDQ" type="ToMultiplicity"/>

+            <layoutConstraint xmi:type="notation:Location" xmi:id="_Xeo817mTEeOxHvnUw-zqDQ" y="396"/>

+          </children>

+          <children xmi:type="notation:DecorationNode" xmi:id="_Xeo82bmTEeOxHvnUw-zqDQ" visible="false" type="FromMultiplicityLabel" element="_XefL0LmTEeOxHvnUw-zqDQ">

+            <children xmi:type="notation:BasicDecorationNode" xmi:id="_Xeo827mTEeOxHvnUw-zqDQ" type="FromMultiplicity"/>

+            <layoutConstraint xmi:type="notation:Location" xmi:id="_Xeo82rmTEeOxHvnUw-zqDQ" y="396"/>

+          </children>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xeo80bmTEeOxHvnUw-zqDQ" points="[-1781, 543, -10724, 1284]$[-1781, 1376, -10724, 2117]$[8282, 1376, -661, 2117]$[8282, -767, -661, -26]$[8705, -767, -238, -26]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xe73wLmTEeOxHvnUw-zqDQ" id="(0.920623671155209,0.5211640211640212)"/>

+        </edges>

+      </contents>

+    </eAnnotations>

+    <ownedAttribute xmi:type="uml:Port" xmi:id="_UAXfILmTEeOxHvnUw-zqDQ" name="class1" type="_rrh88LM9EeOedMT5QMT8fQ" aggregation="composite"/>

+    <ownedAttribute xmi:id="_V1micbmTEeOxHvnUw-zqDQ" name="component" visibility="private" type="_V1micLmTEeOxHvnUw-zqDQ" aggregation="composite"/>

+    <ownedConnector xmi:id="_XeWB4LmTEeOxHvnUw-zqDQ" name="Connector" kind="delegation">

+      <end xmi:id="_XefL0LmTEeOxHvnUw-zqDQ" role="_V1micbmTEeOxHvnUw-zqDQ"/>

+      <end xmi:id="_XefL0bmTEeOxHvnUw-zqDQ" role="_UAXfILmTEeOxHvnUw-zqDQ"/>

+    </ownedConnector>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Component" xmi:id="_V1micLmTEeOxHvnUw-zqDQ" name="component"/>

+  <packagedElement xmi:type="uml:Class" xmi:id="_m6NS8LmTEeOxHvnUw-zqDQ" name="Class5"/>

+  <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_m6NS8bmTEeOxHvnUw-zqDQ" name="Class5Instance" classifier="_m6NS8LmTEeOxHvnUw-zqDQ"/>

+  <packagedElement xmi:type="uml:Class" xmi:id="_n9mpoLmTEeOxHvnUw-zqDQ" name="Class6"/>

+  <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_n9waoLmTEeOxHvnUw-zqDQ" name="Class6Instance" classifier="_n9mpoLmTEeOxHvnUw-zqDQ"/>

+  <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_qBIAkLmTEeOxHvnUw-zqDQ" name="InstanceSpecification1"/>

+  <packagedElement xmi:type="uml:Device" xmi:id="_uFem0LmTEeOxHvnUw-zqDQ" name="Device1"/>

+  <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_uFem0bmTEeOxHvnUw-zqDQ" name="Device1Instance" classifier="_uFem0LmTEeOxHvnUw-zqDQ"/>

+  <packagedElement xmi:type="uml:Signal" xmi:id="_2bR0ILmTEeOxHvnUw-zqDQ" name="Signal1"/>

+  <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_2bR0IbmTEeOxHvnUw-zqDQ" name="Signal1Instance" classifier="_2bR0ILmTEeOxHvnUw-zqDQ"/>

+  <packagedElement xmi:type="uml:Activity" xmi:id="_8QtWcLmTEeOxHvnUw-zqDQ" name="Activity1">

+    <eAnnotations xmi:id="_8RARYLmTEeOxHvnUw-zqDQ" source="uml2.diagrams">

+      <contents xmi:type="umlnotation:UMLDiagram" xmi:id="_8RARYbmTEeOxHvnUw-zqDQ" type="Activity" element="_8QtWcLmTEeOxHvnUw-zqDQ" name="ActivityDiagram1" measurementUnit="Himetric">

+        <children xmi:type="umlnotation:UMLFrame" xmi:id="_8RARYrmTEeOxHvnUw-zqDQ" type="Activity Frame" element="_8QtWcLmTEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" fillColor="16444909" transparency="23" lineColor="13121592" lineWidth="1" showStereotype="Label">

+          <children xmi:type="umlnotation:UMLShapeCompartment" xmi:id="_8RARY7mTEeOxHvnUw-zqDQ" type="ActivityCompartment">

+            <children xmi:type="umlnotation:UMLShape" xmi:id="_9LxQgLmTEeOxHvnUw-zqDQ" element="_9LoGkLmTEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" fillColor="15912618" transparency="0" lineColor="15912618" lineWidth="1" showStereotype="Label">

+              <children xmi:type="notation:DecorationNode" xmi:id="_9L7BgLmTEeOxHvnUw-zqDQ" type="ImageCompartment">

+                <layoutConstraint xmi:type="notation:Size" xmi:id="_9L7BgbmTEeOxHvnUw-zqDQ" width="1320" height="1320"/>

+              </children>

+              <children xmi:type="notation:DecorationNode" xmi:id="_9L7BgrmTEeOxHvnUw-zqDQ" type="NameLabel">

+                <children xmi:type="notation:BasicDecorationNode" xmi:id="_9L7BhLmTEeOxHvnUw-zqDQ" type="Stereotype"/>

+                <children xmi:type="notation:BasicDecorationNode" xmi:id="_9L7BhbmTEeOxHvnUw-zqDQ" type="Name"/>

+                <children xmi:type="notation:BasicDecorationNode" xmi:id="_9L7BhrmTEeOxHvnUw-zqDQ" type="Parent"/>

+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9L7Bg7mTEeOxHvnUw-zqDQ" y="-186"/>

+              </children>

+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9LxQgbmTEeOxHvnUw-zqDQ" x="924" y="1794"/>

+            </children>

+            <children xmi:type="umlnotation:UMLShape" xmi:id="_-p8esLmTEeOxHvnUw-zqDQ" element="_-pzUwLmTEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" fillColor="16116705" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+              <children xmi:type="notation:DecorationNode" xmi:id="_-p8esrmTEeOxHvnUw-zqDQ" type="ImageCompartment">

+                <layoutConstraint xmi:type="notation:Size" xmi:id="_-p8es7mTEeOxHvnUw-zqDQ" width="1320" height="1320"/>

+              </children>

+              <children xmi:type="notation:BasicDecorationNode" xmi:id="_-p8etLmTEeOxHvnUw-zqDQ" type="Stereotype"/>

+              <children xmi:type="notation:BasicDecorationNode" xmi:id="_-p8etbmTEeOxHvnUw-zqDQ" type="InPartitions"/>

+              <children xmi:type="notation:BasicDecorationNode" xmi:id="_-p8etrmTEeOxHvnUw-zqDQ" type="Name"/>

+              <children xmi:type="notation:BasicDecorationNode" xmi:id="_-p8et7mTEeOxHvnUw-zqDQ" type="Parent"/>

+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-p8esbmTEeOxHvnUw-zqDQ" x="5451" y="2013"/>

+            </children>

+            <children xmi:type="umlnotation:UMLShape" xmi:id="_FmfaELmUEeOxHvnUw-zqDQ" element="_FmVpELmUEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="15912618" lineWidth="1" showStereotype="Label">

+              <children xmi:type="notation:DecorationNode" xmi:id="_FmfaErmUEeOxHvnUw-zqDQ" type="ImageCompartment">

+                <layoutConstraint xmi:type="notation:Size" xmi:id="_FmfaE7mUEeOxHvnUw-zqDQ" width="1320" height="1320"/>

+              </children>

+              <children xmi:type="notation:DecorationNode" xmi:id="_FmfaFLmUEeOxHvnUw-zqDQ" type="NameLabel">

+                <children xmi:type="notation:BasicDecorationNode" xmi:id="_FmfaFrmUEeOxHvnUw-zqDQ" type="Stereotype"/>

+                <children xmi:type="notation:BasicDecorationNode" xmi:id="_FmfaF7mUEeOxHvnUw-zqDQ" type="Name"/>

+                <children xmi:type="notation:BasicDecorationNode" xmi:id="_FmfaGLmUEeOxHvnUw-zqDQ" type="Parent"/>

+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FmfaFbmUEeOxHvnUw-zqDQ" y="-186"/>

+              </children>

+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FmfaEbmUEeOxHvnUw-zqDQ" x="11616" y="2965"/>

+            </children>

+          </children>

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_8RARZLmTEeOxHvnUw-zqDQ" type="Name"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8RARZbmTEeOxHvnUw-zqDQ" x="793" y="793"/>

+        </children>

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8RARZrmTEeOxHvnUw-zqDQ" name="support_hide_pins"/>

+        <edges xmi:type="umlnotation:UMLConnector" xmi:id="_Cd7tsLmUEeOxHvnUw-zqDQ" element="_CdyjwLmUEeOxHvnUw-zqDQ" source="_9LxQgLmTEeOxHvnUw-zqDQ" target="_-p8esLmTEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" roundedBendpointsRadius="4" lineColor="8421504" lineWidth="1" showStereotype="Text">

+          <children xmi:type="notation:DecorationNode" xmi:id="_Cd7tsrmUEeOxHvnUw-zqDQ" type="ActivityEdgeLabelCompartment">

+            <children xmi:type="notation:BasicDecorationNode" xmi:id="_Cd7ttLmUEeOxHvnUw-zqDQ" type="Stereotype"/>

+            <children xmi:type="notation:BasicDecorationNode" xmi:id="_Cd7ttbmUEeOxHvnUw-zqDQ" type="ActivityEdgeLabel"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cd7ts7mUEeOxHvnUw-zqDQ" y="-186"/>

+          </children>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Cd7tsbmUEeOxHvnUw-zqDQ" points="[0, 264, -5770, -166]$[0, 2230, -5770, 1800]$[1671, 510, -4099, 80]$[5770, 2230, 0, 1800]$[5770, 905, 0, 475]"/>

+        </edges>

+        <edges xmi:type="umlnotation:UMLConnector" xmi:id="_GIG5YLmUEeOxHvnUw-zqDQ" element="_GH9vcLmUEeOxHvnUw-zqDQ" source="_-p8esLmTEeOxHvnUw-zqDQ" target="_FmfaELmUEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" roundedBendpointsRadius="4" routing="Rectilinear" lineColor="8421504" lineWidth="1" showStereotype="Text">

+          <children xmi:type="notation:DecorationNode" xmi:id="_GIG5YrmUEeOxHvnUw-zqDQ" type="ActivityEdgeLabelCompartment">

+            <children xmi:type="notation:BasicDecorationNode" xmi:id="_GIG5ZLmUEeOxHvnUw-zqDQ" type="Stereotype"/>

+            <children xmi:type="notation:BasicDecorationNode" xmi:id="_GIG5ZbmUEeOxHvnUw-zqDQ" type="ActivityEdgeLabel"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GIG5Y7mUEeOxHvnUw-zqDQ" y="-186"/>

+          </children>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GIG5YbmUEeOxHvnUw-zqDQ" points="[57, 7, -132, -24]$[194, 19, 5, -12]"/>

+        </edges>

+      </contents>

+    </eAnnotations>

+    <node xmi:type="uml:InitialNode" xmi:id="_9LoGkLmTEeOxHvnUw-zqDQ" outgoing="_CdyjwLmUEeOxHvnUw-zqDQ"/>

+    <node xmi:type="uml:OpaqueAction" xmi:id="_-pzUwLmTEeOxHvnUw-zqDQ" name="OpaqueAction" outgoing="_GH9vcLmUEeOxHvnUw-zqDQ" incoming="_CdyjwLmUEeOxHvnUw-zqDQ"/>

+    <node xmi:type="uml:ActivityFinalNode" xmi:id="_FmVpELmUEeOxHvnUw-zqDQ" incoming="_GH9vcLmUEeOxHvnUw-zqDQ"/>

+    <edge xmi:type="uml:ControlFlow" xmi:id="_CdyjwLmUEeOxHvnUw-zqDQ" source="_9LoGkLmTEeOxHvnUw-zqDQ" target="_-pzUwLmTEeOxHvnUw-zqDQ">

+      <guard xmi:type="uml:OpaqueExpression" xmi:id="_CdyjwbmUEeOxHvnUw-zqDQ">

+        <language></language>

+        <body></body>

+      </guard>

+      <weight xmi:type="uml:LiteralInteger" xmi:id="_CdyjwrmUEeOxHvnUw-zqDQ" value="1"/>

+    </edge>

+    <edge xmi:type="uml:ControlFlow" xmi:id="_GH9vcLmUEeOxHvnUw-zqDQ" source="_-pzUwLmTEeOxHvnUw-zqDQ" target="_FmVpELmUEeOxHvnUw-zqDQ">

+      <guard xmi:type="uml:OpaqueExpression" xmi:id="_GH9vcbmUEeOxHvnUw-zqDQ">

+        <language></language>

+        <body></body>

+      </guard>

+      <weight xmi:type="uml:LiteralInteger" xmi:id="_GH9vcrmUEeOxHvnUw-zqDQ" value="1"/>

+    </edge>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Collaboration" xmi:id="_NQG20LmUEeOxHvnUw-zqDQ" name="Collaboration1">

+    <ownedBehavior xmi:type="uml:Interaction" xmi:id="_NQZxwLmUEeOxHvnUw-zqDQ" name="Interaction1">

+      <eAnnotations xmi:id="_NQsssLmUEeOxHvnUw-zqDQ" source="uml2.diagrams" references="_NQsssbmUEeOxHvnUw-zqDQ">

+        <contents xmi:type="umlnotation:UMLDiagram" xmi:id="_NQsssbmUEeOxHvnUw-zqDQ" type="Sequence" element="_NQZxwLmUEeOxHvnUw-zqDQ" name="SequenceDiagram1" measurementUnit="Himetric">

+          <children xmi:type="umlnotation:UMLShape" xmi:id="_NQsssrmUEeOxHvnUw-zqDQ" element="_NQZxwLmUEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" fillColor="16250871" transparency="0" lineColor="12632258" lineWidth="1" showStereotype="Label">

+            <children xmi:type="umlnotation:UMLShapeCompartment" xmi:id="_NQsss7mUEeOxHvnUw-zqDQ" type="interaction_compartment">

+              <children xmi:type="umlnotation:UMLShape" xmi:id="_QI4awLmUEeOxHvnUw-zqDQ" element="_QIvQ0LmUEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" fillColor="16116705" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+                <eAnnotations xmi:id="_QI4awrmUEeOxHvnUw-zqDQ" source="com.ibm.xtools.uml.ui.diagram.internal.styles">

+                  <details xmi:id="_QI4aw7mUEeOxHvnUw-zqDQ" key="LifelineLabelStyle" value="Represents Name and Type Name"/>

+                </eAnnotations>

+                <children xmi:type="notation:BasicDecorationNode" xmi:id="_QI4axLmUEeOxHvnUw-zqDQ" type="Stereotype"/>

+                <children xmi:type="notation:BasicDecorationNode" xmi:id="_QI4axbmUEeOxHvnUw-zqDQ" type="Name"/>

+                <children xmi:type="notation:BasicDecorationNode" xmi:id="_QI4axrmUEeOxHvnUw-zqDQ" type="Parent"/>

+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QI4awbmUEeOxHvnUw-zqDQ" x="3243" y="317" width="1799" height="9525"/>

+              </children>

+              <children xmi:type="umlnotation:UMLShape" xmi:id="_PHt4sLmUEeOxHvnUw-zqDQ" element="_PHa9wLmUEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" fillColor="16116705" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+                <eAnnotations xmi:id="_PHt4srmUEeOxHvnUw-zqDQ" source="com.ibm.xtools.uml.ui.diagram.internal.styles">

+                  <details xmi:id="_PHt4s7mUEeOxHvnUw-zqDQ" key="LifelineLabelStyle" value="Represents Name and Type Name"/>

+                </eAnnotations>

+                <children xmi:type="notation:BasicDecorationNode" xmi:id="_PHt4tLmUEeOxHvnUw-zqDQ" type="Stereotype"/>

+                <children xmi:type="notation:BasicDecorationNode" xmi:id="_PHt4tbmUEeOxHvnUw-zqDQ" type="Name"/>

+                <children xmi:type="notation:BasicDecorationNode" xmi:id="_PHt4trmUEeOxHvnUw-zqDQ" type="Parent"/>

+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PHt4sbmUEeOxHvnUw-zqDQ" x="264"/>

+              </children>

+            </children>

+            <children xmi:type="notation:BasicDecorationNode" xmi:id="_NQsstLmUEeOxHvnUw-zqDQ" type="Name"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NQsstbmUEeOxHvnUw-zqDQ" x="793" y="793"/>

+          </children>

+          <edges xmi:type="umlnotation:UMLConnector" xmi:id="_SRKV4LmUEeOxHvnUw-zqDQ" element="_SQkgALmUEeOxHvnUw-zqDQ" source="_PHt4sLmUEeOxHvnUw-zqDQ" target="_QI4awLmUEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" lineColor="8421504" lineWidth="1" showStereotype="Text">

+            <children xmi:type="notation:DecorationNode" xmi:id="_SRKV4rmUEeOxHvnUw-zqDQ" type="MessageNameLabel">

+              <children xmi:type="notation:BasicDecorationNode" xmi:id="_SRKV5LmUEeOxHvnUw-zqDQ" type="Stereotype"/>

+              <children xmi:type="notation:BasicDecorationNode" xmi:id="_SRKV5bmUEeOxHvnUw-zqDQ" type="Name"/>

+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SRKV47mUEeOxHvnUw-zqDQ" y="-317"/>

+            </children>

+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SRKV4bmUEeOxHvnUw-zqDQ" points="[0, 0, -214, 0]$[214, 0, 0, 0]"/>

+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SRdQ0LmUEeOxHvnUw-zqDQ" id="18:2277"/>

+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SRdQ0bmUEeOxHvnUw-zqDQ" id="77:0"/>

+          </edges>

+          <edges xmi:type="umlnotation:UMLConnector" xmi:id="_TxHswLmUEeOxHvnUw-zqDQ" element="_Tw0x0LmUEeOxHvnUw-zqDQ" source="_PHt4sLmUEeOxHvnUw-zqDQ" target="_QI4awLmUEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" lineColor="8421504" lineWidth="1" showStereotype="Text">

+            <children xmi:type="notation:DecorationNode" xmi:id="_TxHswrmUEeOxHvnUw-zqDQ" type="MessageNameLabel">

+              <children xmi:type="notation:BasicDecorationNode" xmi:id="_TxHsxLmUEeOxHvnUw-zqDQ" type="Stereotype"/>

+              <children xmi:type="notation:BasicDecorationNode" xmi:id="_TxHsxbmUEeOxHvnUw-zqDQ" type="Name"/>

+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TxHsw7mUEeOxHvnUw-zqDQ" y="-317"/>

+            </children>

+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TxHswbmUEeOxHvnUw-zqDQ" points="[0, 0, -214, 0]$[214, 0, 0, 0]"/>

+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TxRdwLmUEeOxHvnUw-zqDQ" id="91:1878"/>

+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TxRdwbmUEeOxHvnUw-zqDQ" id="153:0"/>

+          </edges>

+        </contents>

+      </eAnnotations>

+      <ownedConnector xmi:id="_SQkgBrmUEeOxHvnUw-zqDQ">

+        <end xmi:id="_SQkgB7mUEeOxHvnUw-zqDQ" role="_PHkuwLmUEeOxHvnUw-zqDQ"/>

+        <end xmi:id="_SQkgCLmUEeOxHvnUw-zqDQ" role="_QIvQ0bmUEeOxHvnUw-zqDQ"/>

+      </ownedConnector>

+      <lifeline xmi:id="_PHa9wLmUEeOxHvnUw-zqDQ" name="activity" represents="_PHkuwLmUEeOxHvnUw-zqDQ" coveredBy="_SQkgAbmUEeOxHvnUw-zqDQ _Tw0x0bmUEeOxHvnUw-zqDQ _Tw0x1rmUEeOxHvnUw-zqDQ"/>

+      <lifeline xmi:id="_QIvQ0LmUEeOxHvnUw-zqDQ" name="Property" represents="_QIvQ0bmUEeOxHvnUw-zqDQ" coveredBy="_SQkgArmUEeOxHvnUw-zqDQ _SQkgA7mUEeOxHvnUw-zqDQ _SQkgBbmUEeOxHvnUw-zqDQ _Tw0x0rmUEeOxHvnUw-zqDQ _Tw0x07mUEeOxHvnUw-zqDQ _Tw0x1LmUEeOxHvnUw-zqDQ"/>

+      <fragment xmi:type="uml:MessageOccurrenceSpecification" xmi:id="_SQkgAbmUEeOxHvnUw-zqDQ" covered="_PHa9wLmUEeOxHvnUw-zqDQ" message="_SQkgALmUEeOxHvnUw-zqDQ"/>

+      <fragment xmi:type="uml:MessageOccurrenceSpecification" xmi:id="_SQkgArmUEeOxHvnUw-zqDQ" covered="_QIvQ0LmUEeOxHvnUw-zqDQ" message="_SQkgALmUEeOxHvnUw-zqDQ"/>

+      <fragment xmi:type="uml:BehaviorExecutionSpecification" xmi:id="_SQkgA7mUEeOxHvnUw-zqDQ" covered="_QIvQ0LmUEeOxHvnUw-zqDQ" start="_SQkgArmUEeOxHvnUw-zqDQ" finish="_SQkgBbmUEeOxHvnUw-zqDQ"/>

+      <fragment xmi:type="uml:ExecutionOccurrenceSpecification" xmi:id="_SQkgBbmUEeOxHvnUw-zqDQ" covered="_QIvQ0LmUEeOxHvnUw-zqDQ" event="_SQkgBLmUEeOxHvnUw-zqDQ" execution="_SQkgA7mUEeOxHvnUw-zqDQ"/>

+      <fragment xmi:type="uml:MessageOccurrenceSpecification" xmi:id="_Tw0x0bmUEeOxHvnUw-zqDQ" covered="_PHa9wLmUEeOxHvnUw-zqDQ" message="_Tw0x0LmUEeOxHvnUw-zqDQ"/>

+      <fragment xmi:type="uml:MessageOccurrenceSpecification" xmi:id="_Tw0x0rmUEeOxHvnUw-zqDQ" covered="_QIvQ0LmUEeOxHvnUw-zqDQ" message="_Tw0x0LmUEeOxHvnUw-zqDQ"/>

+      <fragment xmi:type="uml:BehaviorExecutionSpecification" xmi:id="_Tw0x07mUEeOxHvnUw-zqDQ" covered="_QIvQ0LmUEeOxHvnUw-zqDQ" start="_Tw0x0rmUEeOxHvnUw-zqDQ" finish="_Tw0x1LmUEeOxHvnUw-zqDQ"/>

+      <fragment xmi:type="uml:MessageOccurrenceSpecification" xmi:id="_Tw0x1LmUEeOxHvnUw-zqDQ" covered="_QIvQ0LmUEeOxHvnUw-zqDQ" message="_Tw0x1bmUEeOxHvnUw-zqDQ"/>

+      <fragment xmi:type="uml:MessageOccurrenceSpecification" xmi:id="_Tw0x1rmUEeOxHvnUw-zqDQ" covered="_PHa9wLmUEeOxHvnUw-zqDQ" message="_Tw0x1bmUEeOxHvnUw-zqDQ"/>

+      <message xmi:id="_SQkgALmUEeOxHvnUw-zqDQ" name="\Unspecified\" messageSort="asynchCall" receiveEvent="_SQkgArmUEeOxHvnUw-zqDQ" sendEvent="_SQkgAbmUEeOxHvnUw-zqDQ" connector="_SQkgBrmUEeOxHvnUw-zqDQ"/>

+      <message xmi:id="_Tw0x0LmUEeOxHvnUw-zqDQ" name="\Unspecified\" receiveEvent="_Tw0x0rmUEeOxHvnUw-zqDQ" sendEvent="_Tw0x0bmUEeOxHvnUw-zqDQ" connector="_SQkgBrmUEeOxHvnUw-zqDQ"/>

+      <message xmi:id="_Tw0x1bmUEeOxHvnUw-zqDQ" name="\Unspecified\" messageSort="reply" receiveEvent="_Tw0x1rmUEeOxHvnUw-zqDQ" sendEvent="_Tw0x1LmUEeOxHvnUw-zqDQ" connector="_SQkgBrmUEeOxHvnUw-zqDQ"/>

+    </ownedBehavior>

+    <ownedAttribute xmi:id="_PHkuwLmUEeOxHvnUw-zqDQ" name="activity" type="_OpXv0LmUEeOxHvnUw-zqDQ"/>

+    <ownedAttribute xmi:id="_QIvQ0bmUEeOxHvnUw-zqDQ" name="Property"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_OpXv0LmUEeOxHvnUw-zqDQ" name="activity"/>

+  <packagedElement xmi:type="uml:ExecutionEvent" xmi:id="_SQkgBLmUEeOxHvnUw-zqDQ" name="ExecutionEvent1"/>

+  <packagedElement xmi:type="uml:StateMachine" xmi:id="_WGV3sLmUEeOxHvnUw-zqDQ" name="StateMachine1">

+    <eAnnotations xmi:id="_WG8UoLmUEeOxHvnUw-zqDQ" source="uml2.diagrams">

+      <contents xmi:type="umlnotation:UMLDiagram" xmi:id="_WG8UobmUEeOxHvnUw-zqDQ" type="Statechart" element="_WGV3sLmUEeOxHvnUw-zqDQ" measurementUnit="Himetric">

+        <children xmi:type="umlnotation:UMLFrame" xmi:id="_WG8UormUEeOxHvnUw-zqDQ" type="Statemachine" element="_WGV3sLmUEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" fillColor="16250871" transparency="0" lineColor="12632258" lineWidth="1" showStereotype="Label" alignment="Horizontal">

+          <children xmi:type="umlnotation:UMLShapeCompartment" xmi:id="_WG8Uo7mUEeOxHvnUw-zqDQ" type="Region" element="_WGfosLmUEeOxHvnUw-zqDQ">

+            <children xmi:type="umlnotation:UMLShape" xmi:id="_YT-z8LmUEeOxHvnUw-zqDQ" element="_YT1C8LmUEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" fillColor="15912618" transparency="0" lineColor="15912618" lineWidth="1" showStereotype="Label">

+              <children xmi:type="notation:DecorationNode" xmi:id="_YT-z8rmUEeOxHvnUw-zqDQ" type="NameLabel">

+                <children xmi:type="notation:BasicDecorationNode" xmi:id="_YT-z9LmUEeOxHvnUw-zqDQ" type="Stereotype"/>

+                <children xmi:type="notation:BasicDecorationNode" xmi:id="_YT-z9bmUEeOxHvnUw-zqDQ" type="Name"/>

+                <children xmi:type="notation:BasicDecorationNode" xmi:id="_YT-z9rmUEeOxHvnUw-zqDQ" type="Parent"/>

+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YT-z87mUEeOxHvnUw-zqDQ" y="-186"/>

+              </children>

+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YT-z8bmUEeOxHvnUw-zqDQ" x="2026" y="1827"/>

+            </children>

+            <children xmi:type="umlnotation:UMLShape" xmi:id="_YtHssLmUEeOxHvnUw-zqDQ" element="_Ys97sLmUEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="15912618" lineWidth="1" showStereotype="Label">

+              <children xmi:type="notation:DecorationNode" xmi:id="_YtHssrmUEeOxHvnUw-zqDQ" type="NameLabel">

+                <children xmi:type="notation:BasicDecorationNode" xmi:id="_YtHstLmUEeOxHvnUw-zqDQ" type="Stereotype"/>

+                <children xmi:type="notation:BasicDecorationNode" xmi:id="_YtHstbmUEeOxHvnUw-zqDQ" type="Name"/>

+                <children xmi:type="notation:BasicDecorationNode" xmi:id="_YtHstrmUEeOxHvnUw-zqDQ" type="Parent"/>

+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YtHss7mUEeOxHvnUw-zqDQ" y="-186"/>

+              </children>

+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YtHssbmUEeOxHvnUw-zqDQ" x="11312" y="1933"/>

+            </children>

+            <children xmi:type="umlnotation:UMLShape" xmi:id="_ZA6LYbmUEeOxHvnUw-zqDQ" element="_ZA6LYLmUEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+              <children xmi:type="notation:DecorationNode" xmi:id="_ZA6LY7mUEeOxHvnUw-zqDQ" type="ImageCompartment">

+                <layoutConstraint xmi:type="notation:Size" xmi:id="_ZA6LZLmUEeOxHvnUw-zqDQ" width="1320" height="1320"/>

+              </children>

+              <children xmi:type="notation:BasicDecorationNode" xmi:id="_ZA6LZbmUEeOxHvnUw-zqDQ" type="Stereotype"/>

+              <children xmi:type="notation:BasicDecorationNode" xmi:id="_ZA6LZrmUEeOxHvnUw-zqDQ" type="Name"/>

+              <children xmi:type="notation:BasicDecorationNode" xmi:id="_ZA6LZ7mUEeOxHvnUw-zqDQ" type="Parent"/>

+              <children xmi:type="notation:ListCompartment" xmi:id="_ZA6LaLmUEeOxHvnUw-zqDQ" visible="false" type="Activities"/>

+              <children xmi:type="notation:ListCompartment" xmi:id="_ZBDVULmUEeOxHvnUw-zqDQ" visible="false" type="InternalTransitionCompartment"/>

+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZA6LYrmUEeOxHvnUw-zqDQ" x="5809" y="3335"/>

+            </children>

+          </children>

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_WG8UpLmUEeOxHvnUw-zqDQ" type="Name"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WG8UpbmUEeOxHvnUw-zqDQ" x="793" y="793"/>

+        </children>

+        <edges xmi:type="umlnotation:UMLConnector" xmi:id="_ZsMkELmUEeOxHvnUw-zqDQ" element="_Zr5pILmUEeOxHvnUw-zqDQ" source="_YT-z8LmUEeOxHvnUw-zqDQ" target="_ZA6LYbmUEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" roundedBendpointsRadius="4" lineColor="8421504" lineWidth="1" showStereotype="Text">

+          <children xmi:type="notation:DecorationNode" xmi:id="_ZsMkErmUEeOxHvnUw-zqDQ" type="TransitionLabelCompartment">

+            <children xmi:type="notation:BasicDecorationNode" xmi:id="_ZsMkFLmUEeOxHvnUw-zqDQ" type="Stereotype"/>

+            <children xmi:type="notation:BasicDecorationNode" xmi:id="_ZsMkFbmUEeOxHvnUw-zqDQ" type="TransitionLabel"/>

+            <children xmi:type="notation:ListCompartment" xmi:id="_ZsMkFrmUEeOxHvnUw-zqDQ" type="Triggers"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZsMkE7mUEeOxHvnUw-zqDQ" y="-186"/>

+          </children>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZsMkEbmUEeOxHvnUw-zqDQ" points="[413, 186, -4349, -1771]$[1587, 714, -3175, -1243]$[2196, 2487, -2566, 530]$[3704, 2175, -1058, 218]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZsWVELmUEeOxHvnUw-zqDQ" id="(0.14933837429111532,0.4007561436672968)"/>

+        </edges>

+        <edges xmi:type="umlnotation:UMLConnector" xmi:id="_dnCB8LmUEeOxHvnUw-zqDQ" element="_dm44ALmUEeOxHvnUw-zqDQ" source="_ZA6LYbmUEeOxHvnUw-zqDQ" target="_YtHssLmUEeOxHvnUw-zqDQ" fontName="Segoe UI" fontHeight="8" roundedBendpointsRadius="4" lineColor="8421504" lineWidth="1" showStereotype="Text">

+          <children xmi:type="notation:DecorationNode" xmi:id="_dnCB8rmUEeOxHvnUw-zqDQ" type="TransitionLabelCompartment">

+            <children xmi:type="notation:BasicDecorationNode" xmi:id="_dnCB9LmUEeOxHvnUw-zqDQ" type="Stereotype"/>

+            <children xmi:type="notation:BasicDecorationNode" xmi:id="_dnCB9bmUEeOxHvnUw-zqDQ" type="TransitionLabel"/>

+            <children xmi:type="notation:ListCompartment" xmi:id="_dnCB9rmUEeOxHvnUw-zqDQ" type="Triggers"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dnCB87mUEeOxHvnUw-zqDQ" y="-186"/>

+          </children>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dnCB8bmUEeOxHvnUw-zqDQ" points="[40, -15, -141, 50]$[180, -77, -1, -12]"/>

+        </edges>

+      </contents>

+    </eAnnotations>

+    <region xmi:id="_WGfosLmUEeOxHvnUw-zqDQ" name="Region1">

+      <subvertex xmi:type="uml:Pseudostate" xmi:id="_YT1C8LmUEeOxHvnUw-zqDQ"/>

+      <subvertex xmi:type="uml:FinalState" xmi:id="_Ys97sLmUEeOxHvnUw-zqDQ"/>

+      <subvertex xmi:type="uml:State" xmi:id="_ZA6LYLmUEeOxHvnUw-zqDQ" name="State1"/>

+      <transition xmi:id="_Zr5pILmUEeOxHvnUw-zqDQ" name="test" source="_YT1C8LmUEeOxHvnUw-zqDQ" target="_ZA6LYLmUEeOxHvnUw-zqDQ">

+        <eAnnotations xmi:id="_Zr5pIbmUEeOxHvnUw-zqDQ" source="uml2.alias">

+          <details xmi:id="_Zr5pIrmUEeOxHvnUw-zqDQ" key="Initial"/>

+        </eAnnotations>

+      </transition>

+      <transition xmi:id="_dm44ALmUEeOxHvnUw-zqDQ" source="_ZA6LYLmUEeOxHvnUw-zqDQ" target="_Ys97sLmUEeOxHvnUw-zqDQ"/>

+    </region>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Package" xmi:id="_LZNxMLmVEeOxHvnUw-zqDQ" name="Package2">

+    <eAnnotations xmi:id="_LZOYQLmVEeOxHvnUw-zqDQ" source="uml2.diagrams" references="_LZOYQbmVEeOxHvnUw-zqDQ">

+      <contents xmi:type="umlnotation:UMLDiagram" xmi:id="_LZOYQbmVEeOxHvnUw-zqDQ" type="Freeform" name="Main">

+        <element xsi:nil="true"/>

+      </contents>

+    </eAnnotations>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Package" xmi:id="_N0AYoLmVEeOxHvnUw-zqDQ" name="Package3" clientDependency="_P1OpgLmVEeOxHvnUw-zqDQ">

+    <eAnnotations xmi:id="_N0A_sLmVEeOxHvnUw-zqDQ" source="uml2.diagrams" references="_N0A_sbmVEeOxHvnUw-zqDQ">

+      <contents xmi:type="umlnotation:UMLDiagram" xmi:id="_N0A_sbmVEeOxHvnUw-zqDQ" type="Freeform" name="Main">

+        <element xsi:nil="true"/>

+      </contents>

+    </eAnnotations>

+    <packagedElement xmi:type="uml:Dependency" xmi:id="_P1OpgLmVEeOxHvnUw-zqDQ" supplier="_LZNxMLmVEeOxHvnUw-zqDQ" client="_N0AYoLmVEeOxHvnUw-zqDQ"/>

+  </packagedElement>

+  <profileApplication xmi:id="_CpI9pbM9EeOedMT5QMT8fQ">

+    <eAnnotations xmi:id="_CpI9prM9EeOedMT5QMT8fQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

+      <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Standard.profile.uml#_yzU58YinEdqtvbnfB2L_5w"/>

+    </eAnnotations>

+    <appliedProfile href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/>

+  </profileApplication>

+  <profileApplication xmi:id="_CpI9p7M9EeOedMT5QMT8fQ">

+    <eAnnotations xmi:id="_CpI9qLM9EeOedMT5QMT8fQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

+      <references xmi:type="ecore:EPackage" href="pathmap://UML2_MSL_PROFILES/Default.epx#_fNwoAAqoEd6-N_NOT9vsCA?Default/Default?"/>

+    </eAnnotations>

+    <appliedProfile href="pathmap://UML2_MSL_PROFILES/Default.epx#_a_S3wNWLEdiy4IqP8whjFA?Default?"/>

+  </profileApplication>

+  <profileApplication xmi:id="_CpI9qbM9EeOedMT5QMT8fQ">

+    <eAnnotations xmi:id="_CpI9qrM9EeOedMT5QMT8fQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

+      <references xmi:type="ecore:EPackage" href="pathmap://UML2_MSL_PROFILES/Deployment.epx#_IrdAUMmBEdqBcN1R6EvWUw?Deployment/Deployment?"/>

+    </eAnnotations>

+    <appliedProfile href="pathmap://UML2_MSL_PROFILES/Deployment.epx#_vjbuwOvHEdiDX5bji0iVSA?Deployment?"/>

+  </profileApplication>

+</uml:Package>

diff --git a/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/resources/Profile.epx b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/resources/Profile.epx
new file mode 100644
index 00000000000..b0def6c7841
--- /dev/null
+++ b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/resources/Profile.epx
@@ -0,0 +1,499 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--xtools2_universal_type_manager-->

+<?com.ibm.xtools.emf.core.signature <signature id="com.ibm.xtools.uml.msl.profile" version="7.0.0"><feature description="" name="com.ibm.xtools.ruml.feature" url="" version="7.0.0"/></signature>?>

+<uml:Profile 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/3.0.0/UML" xmlns:umlnotation="http://www.ibm.com/xtools/1.5.3/Umlnotation" xmi:id="_S0ev0JpPEeOk3ovACNQDQQ" name="Profile" metamodelReference="_S0jBQZpPEeOk3ovACNQDQQ">

+  <eAnnotations xmi:id="_S0og0JpPEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

+    <contents xmi:type="ecore:EPackage" xmi:id="_Q88J8ZpQEeOk3ovACNQDQQ" name="Profile" nsURI="http:///schemas/Profile/_Q88J8JpQEeOk3ovACNQDQQ/3" nsPrefix="Profile">

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_Q88J8ppQEeOk3ovACNQDQQ" name="Participant">

+        <eAnnotations xmi:id="_Q88J85pQEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_2w-zYJpPEeOk3ovACNQDQQ"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Q88J9JpQEeOk3ovACNQDQQ" name="base_Class" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_Q88J9ppQEeOk3ovACNQDQQ" name="Agent" eSuperTypes="_Q88J8ppQEeOk3ovACNQDQQ">

+        <eAnnotations xmi:id="_Q88J95pQEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_5dk8gJpPEeOk3ovACNQDQQ"/>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_Q88J-ZpQEeOk3ovACNQDQQ" name="Stereotype1">

+        <eAnnotations xmi:id="_Q88J-ppQEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_97pqUJpPEeOk3ovACNQDQQ"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Q88J-5pQEeOk3ovACNQDQQ" name="base_Port" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_Q88J_ZpQEeOk3ovACNQDQQ" name="Stereotype2">

+        <eAnnotations xmi:id="_Q88J_ppQEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_-TEr0JpPEeOk3ovACNQDQQ"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Q88J_5pQEeOk3ovACNQDQQ" name="base_Port" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>

+        </eStructuralFeatures>

+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Q88KAZpQEeOk3ovACNQDQQ" name="TESt" 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="_Q88KA5pQEeOk3ovACNQDQQ" name="Stereotype3">

+        <eAnnotations xmi:id="_Q88KBJpQEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_-pIbYJpPEeOk3ovACNQDQQ"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Q88KBZpQEeOk3ovACNQDQQ" name="base_Port" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_Q88KB5pQEeOk3ovACNQDQQ" name="Stereotype4">

+        <eAnnotations xmi:id="_Q88KCJpQEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_D_RZoJpQEeOk3ovACNQDQQ"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Q88KCZpQEeOk3ovACNQDQQ" name="base_Interface" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Interface"/>

+        </eStructuralFeatures>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Q88KC5pQEeOk3ovACNQDQQ" name="base_Class" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+    </contents>

+    <contents xmi:type="ecore:EPackage" xmi:id="_P77Y4ZpQEeOk3ovACNQDQQ" name="Profile" nsURI="http:///schemas/Profile/_P77Y4JpQEeOk3ovACNQDQQ/2" nsPrefix="Profile">

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_P77Y4ppQEeOk3ovACNQDQQ" name="Participant">

+        <eAnnotations xmi:id="_P77Y45pQEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_2w-zYJpPEeOk3ovACNQDQQ"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_P77Y5JpQEeOk3ovACNQDQQ" name="base_Class" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_P77Y5ppQEeOk3ovACNQDQQ" name="Agent" eSuperTypes="_P77Y4ppQEeOk3ovACNQDQQ">

+        <eAnnotations xmi:id="_P77Y55pQEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_5dk8gJpPEeOk3ovACNQDQQ"/>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_P77_8JpQEeOk3ovACNQDQQ" name="Stereotype1">

+        <eAnnotations xmi:id="_P77_8ZpQEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_97pqUJpPEeOk3ovACNQDQQ"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_P77_8ppQEeOk3ovACNQDQQ" name="base_Port" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_P77_9JpQEeOk3ovACNQDQQ" name="Stereotype2">

+        <eAnnotations xmi:id="_P77_9ZpQEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_-TEr0JpPEeOk3ovACNQDQQ"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_P77_9ppQEeOk3ovACNQDQQ" name="base_Port" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>

+        </eStructuralFeatures>

+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_P77_-JpQEeOk3ovACNQDQQ" name="TESt" 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="_P77_-ppQEeOk3ovACNQDQQ" name="Stereotype3">

+        <eAnnotations xmi:id="_P77_-5pQEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_-pIbYJpPEeOk3ovACNQDQQ"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_P77__JpQEeOk3ovACNQDQQ" name="base_Port" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_P77__ppQEeOk3ovACNQDQQ" name="Stereotype4">

+        <eAnnotations xmi:id="_P77__5pQEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_D_RZoJpQEeOk3ovACNQDQQ"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_P78AAJpQEeOk3ovACNQDQQ" name="base_Interface" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Interface"/>

+        </eStructuralFeatures>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_P78AAppQEeOk3ovACNQDQQ" name="base_Class" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+    </contents>

+    <contents xmi:type="ecore:EPackage" xmi:id="_FTKDYJpQEeOk3ovACNQDQQ" name="Profile" nsURI="http:///schemas/Profile/_FTI1QJpQEeOk3ovACNQDQQ/1" nsPrefix="Profile">

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_FTKDYZpQEeOk3ovACNQDQQ" name="Participant">

+        <eAnnotations xmi:id="_FTKDYppQEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_2w-zYJpPEeOk3ovACNQDQQ"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_FTKDY5pQEeOk3ovACNQDQQ" name="base_Class" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_FTKDZZpQEeOk3ovACNQDQQ" name="Agent" eSuperTypes="_FTKDYZpQEeOk3ovACNQDQQ">

+        <eAnnotations xmi:id="_FTKDZppQEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_5dk8gJpPEeOk3ovACNQDQQ"/>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_FTKDaJpQEeOk3ovACNQDQQ" name="Stereotype1">

+        <eAnnotations xmi:id="_FTKDaZpQEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_97pqUJpPEeOk3ovACNQDQQ"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_FTKDappQEeOk3ovACNQDQQ" name="base_Port" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_FTKDbJpQEeOk3ovACNQDQQ" name="Stereotype2">

+        <eAnnotations xmi:id="_FTKDbZpQEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_-TEr0JpPEeOk3ovACNQDQQ"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_FTKDbppQEeOk3ovACNQDQQ" name="base_Port" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_FTKDcJpQEeOk3ovACNQDQQ" name="Stereotype3">

+        <eAnnotations xmi:id="_FTKDcZpQEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_-pIbYJpPEeOk3ovACNQDQQ"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_FTKDcppQEeOk3ovACNQDQQ" name="base_Port" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_FTKDdJpQEeOk3ovACNQDQQ" name="Stereotype4">

+        <eAnnotations xmi:id="_FTKDdZpQEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_D_RZoJpQEeOk3ovACNQDQQ"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_FTKDdppQEeOk3ovACNQDQQ" name="base_Interface" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Interface"/>

+        </eStructuralFeatures>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_FTKDeJpQEeOk3ovACNQDQQ" name="base_Class" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+    </contents>

+    <contents xmi:type="ecore:EPackage" xmi:id="_S0og0ZpPEeOk3ovACNQDQQ" name="Profile" nsURI="http:///schemas/Profile/_S0n5wJpPEeOk3ovACNQDQQ/0" nsPrefix="Profile"/>

+  </eAnnotations>

+  <eAnnotations xmi:id="_UQpy4JpPEeOk3ovACNQDQQ" source="uml2.profile.diagrams">

+    <contents xmi:type="umlnotation:UMLDiagram" xmi:id="_UQpy4ZpPEeOk3ovACNQDQQ" type="Class" name="ClassDiagram1">

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_jMSrwJpPEeOk3ovACNQDQQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_jMTS0JpPEeOk3ovACNQDQQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_jMTS0ZpPEeOk3ovACNQDQQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_jMTS0ppPEeOk3ovACNQDQQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_jMT54JpPEeOk3ovACNQDQQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_jMT54ZpPEeOk3ovACNQDQQ" type="Parent"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_jMT54ppPEeOk3ovACNQDQQ" type="AttributeCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_jMT545pPEeOk3ovACNQDQQ" type="OperationCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_jMUg8JpPEeOk3ovACNQDQQ" visible="false" type="SignalCompartment"/>

+        <children xmi:type="umlnotation:UMLShapeCompartment" xmi:id="_jMUg8ZpPEeOk3ovACNQDQQ" visible="false" type="StructureCompartment"/>

+        <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jMSrwZpPEeOk3ovACNQDQQ" x="1188" y="2640"/>

+      </children>

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_kDJbQJpPEeOk3ovACNQDQQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_kDKCUJpPEeOk3ovACNQDQQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_kDKCUZpPEeOk3ovACNQDQQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_kDKCUppPEeOk3ovACNQDQQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_kDKpYJpPEeOk3ovACNQDQQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_kDKpYZpPEeOk3ovACNQDQQ" type="Parent"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_kDKpYppPEeOk3ovACNQDQQ" type="AttributeCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_kDKpY5pPEeOk3ovACNQDQQ" type="OperationCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_kDLQcJpPEeOk3ovACNQDQQ" visible="false" type="SignalCompartment"/>

+        <children xmi:type="umlnotation:UMLShapeCompartment" xmi:id="_kDLQcZpPEeOk3ovACNQDQQ" visible="false" type="StructureCompartment"/>

+        <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kDJbQZpPEeOk3ovACNQDQQ" x="14138" y="528"/>

+      </children>

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_u4w58JpPEeOk3ovACNQDQQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_u4xhAJpPEeOk3ovACNQDQQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_u4xhAZpPEeOk3ovACNQDQQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_u4xhAppPEeOk3ovACNQDQQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_u4xhA5pPEeOk3ovACNQDQQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_u4yIEJpPEeOk3ovACNQDQQ" type="Parent"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_u4yIEZpPEeOk3ovACNQDQQ" type="AttributeCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_u4yIEppPEeOk3ovACNQDQQ" type="OperationCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_u4yIE5pPEeOk3ovACNQDQQ" visible="false" type="SignalCompartment"/>

+        <children xmi:type="umlnotation:UMLShapeCompartment" xmi:id="_u4yvIJpPEeOk3ovACNQDQQ" visible="false" type="StructureCompartment"/>

+        <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u4w58ZpPEeOk3ovACNQDQQ" x="7920" y="1452"/>

+      </children>

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_xMkIkJpPEeOk3ovACNQDQQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_xMkvoJpPEeOk3ovACNQDQQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_xMkvoZpPEeOk3ovACNQDQQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_xMkvoppPEeOk3ovACNQDQQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_xMlWsJpPEeOk3ovACNQDQQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_xMlWsZpPEeOk3ovACNQDQQ" type="Parent"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_xMlWsppPEeOk3ovACNQDQQ" type="AttributeCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_xMlWs5pPEeOk3ovACNQDQQ" type="OperationCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_xMlWtJpPEeOk3ovACNQDQQ" visible="false" type="SignalCompartment"/>

+        <children xmi:type="umlnotation:UMLShapeCompartment" xmi:id="_xMl9wJpPEeOk3ovACNQDQQ" visible="false" type="StructureCompartment"/>

+        <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xMkIkZpPEeOk3ovACNQDQQ" x="20724" y="3828"/>

+      </children>

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_2xBPoJpPEeOk3ovACNQDQQ" element="_2w-zYJpPEeOk3ovACNQDQQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_2xB2sJpPEeOk3ovACNQDQQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_2xB2sZpPEeOk3ovACNQDQQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_2xB2sppPEeOk3ovACNQDQQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_2xB2s5pPEeOk3ovACNQDQQ" type="Kind"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_2xB2tJpPEeOk3ovACNQDQQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_2xCdwJpPEeOk3ovACNQDQQ" type="Parent"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_2xCdwZpPEeOk3ovACNQDQQ" type="AttributeCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_2xCdwppPEeOk3ovACNQDQQ" visible="false" type="OperationCompartment"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2xBPoZpPEeOk3ovACNQDQQ" x="2508" y="8844"/>

+      </children>

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_5dsRQJpPEeOk3ovACNQDQQ" element="_5dk8gJpPEeOk3ovACNQDQQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_5dsRQppPEeOk3ovACNQDQQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_5dsRQ5pPEeOk3ovACNQDQQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_5ds4UJpPEeOk3ovACNQDQQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_5ds4UZpPEeOk3ovACNQDQQ" type="Kind"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_5ds4UppPEeOk3ovACNQDQQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_5ds4U5pPEeOk3ovACNQDQQ" type="Parent"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_5dtfYJpPEeOk3ovACNQDQQ" type="AttributeCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_5dtfYZpPEeOk3ovACNQDQQ" visible="false" type="OperationCompartment"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5dsRQZpPEeOk3ovACNQDQQ" x="1534" y="12911"/>

+      </children>

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_97sGkJpPEeOk3ovACNQDQQ" element="_97pqUJpPEeOk3ovACNQDQQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_97stoJpPEeOk3ovACNQDQQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_97stoZpPEeOk3ovACNQDQQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_97stoppPEeOk3ovACNQDQQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_97tUsJpPEeOk3ovACNQDQQ" type="Kind"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_97tUsZpPEeOk3ovACNQDQQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_97tUsppPEeOk3ovACNQDQQ" type="Parent"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_97tUs5pPEeOk3ovACNQDQQ" type="AttributeCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_97tUtJpPEeOk3ovACNQDQQ" visible="false" type="OperationCompartment"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_97sGkZpPEeOk3ovACNQDQQ" x="20577" y="10956"/>

+      </children>

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_-THIEJpPEeOk3ovACNQDQQ" element="_-TEr0JpPEeOk3ovACNQDQQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_-THvIJpPEeOk3ovACNQDQQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_-THvIZpPEeOk3ovACNQDQQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_-THvIppPEeOk3ovACNQDQQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_-TIWMJpPEeOk3ovACNQDQQ" type="Kind"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_-TIWMZpPEeOk3ovACNQDQQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_-TIWMppPEeOk3ovACNQDQQ" type="Parent"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_-TIWM5pPEeOk3ovACNQDQQ" type="AttributeCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_-TIWNJpPEeOk3ovACNQDQQ" visible="false" type="OperationCompartment"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-THIEZpPEeOk3ovACNQDQQ" x="12936" y="6732" height="2325"/>

+      </children>

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_-pLesJpPEeOk3ovACNQDQQ" element="_-pIbYJpPEeOk3ovACNQDQQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_-pLesppPEeOk3ovACNQDQQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_-pLes5pPEeOk3ovACNQDQQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_-pMFwJpPEeOk3ovACNQDQQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_-pMFwZpPEeOk3ovACNQDQQ" type="Kind"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_-pMFwppPEeOk3ovACNQDQQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_-pMFw5pPEeOk3ovACNQDQQ" type="Parent"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_-pMFxJpPEeOk3ovACNQDQQ" type="AttributeCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_-pMs0JpPEeOk3ovACNQDQQ" visible="false" type="OperationCompartment"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-pLesZpPEeOk3ovACNQDQQ" x="16368" y="11352"/>

+      </children>

+      <children xmi:type="umlnotation:UMLShape" xmi:id="_D_VEAJpQEeOk3ovACNQDQQ" element="_D_RZoJpQEeOk3ovACNQDQQ" fontName="Segoe UI" fontHeight="8" transparency="0" lineColor="14263149" lineWidth="1" showStereotype="Label">

+        <children xmi:type="notation:DecorationNode" xmi:id="_D_VrEJpQEeOk3ovACNQDQQ" type="ImageCompartment">

+          <layoutConstraint xmi:type="notation:Size" xmi:id="_D_VrEZpQEeOk3ovACNQDQQ" width="1320" height="1320"/>

+        </children>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_D_VrEppQEeOk3ovACNQDQQ" type="Stereotype"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_D_VrE5pQEeOk3ovACNQDQQ" type="Kind"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_D_WSIJpQEeOk3ovACNQDQQ" type="Name"/>

+        <children xmi:type="notation:BasicDecorationNode" xmi:id="_D_WSIZpQEeOk3ovACNQDQQ" type="Parent"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_D_WSIppQEeOk3ovACNQDQQ" type="AttributeCompartment"/>

+        <children xmi:type="notation:SemanticListCompartment" xmi:id="_D_W5MJpQEeOk3ovACNQDQQ" visible="false" type="OperationCompartment"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D_VEAZpQEeOk3ovACNQDQQ" x="8678" y="7699"/>

+      </children>

+      <element xsi:nil="true"/>

+      <edges xmi:type="umlnotation:UMLConnector" xmi:id="_7iBggJpPEeOk3ovACNQDQQ" element="_7h49oJpPEeOk3ovACNQDQQ" source="_2xBPoJpPEeOk3ovACNQDQQ" target="_jMSrwJpPEeOk3ovACNQDQQ" fontName="Segoe UI" fontHeight="8" roundedBendpointsRadius="4" routing="Rectilinear" lineColor="8421504" lineWidth="1" showStereotype="Text">

+        <children xmi:type="notation:DecorationNode" xmi:id="_7iBggppPEeOk3ovACNQDQQ" visible="false" type="NameLabel">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_7iCHkJpPEeOk3ovACNQDQQ" type="Stereotype"/>

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_7iCHkZpPEeOk3ovACNQDQQ" type="Name"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7iBgg5pPEeOk3ovACNQDQQ" y="-186"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_7iCHkppPEeOk3ovACNQDQQ" type="ToMultiplicityLabel" element="_7h5ksZpPEeOk3ovACNQDQQ">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_7iCHlJpPEeOk3ovACNQDQQ" type="ExtensionRequired"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_7iCHk5pPEeOk3ovACNQDQQ" y="396"/>

+        </children>

+        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7iBggZpPEeOk3ovACNQDQQ" points="[-2, -22, 1, 150]$[-2, -111, 1, 61]"/>

+      </edges>

+      <edges xmi:type="umlnotation:UMLConnector" xmi:id="_8PLhcJpPEeOk3ovACNQDQQ" element="_8PIeIJpPEeOk3ovACNQDQQ" source="_5dsRQJpPEeOk3ovACNQDQQ" target="_2xBPoJpPEeOk3ovACNQDQQ" fontName="Segoe UI" fontHeight="8" roundedBendpointsRadius="4" routing="Rectilinear" lineColor="8421504" lineWidth="1" showStereotype="Text">

+        <children xmi:type="notation:DecorationNode" xmi:id="_8PLhcppPEeOk3ovACNQDQQ" type="NameLabel">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_8PMIgJpPEeOk3ovACNQDQQ" type="Stereotype"/>

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_8PMIgZpPEeOk3ovACNQDQQ" type="Name"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PLhc5pPEeOk3ovACNQDQQ" y="-186"/>

+        </children>

+        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8PLhcZpPEeOk3ovACNQDQQ" points="[7, -22, -31, 117]$[41, -117, 3, 22]"/>

+      </edges>

+      <edges xmi:type="umlnotation:UMLConnector" xmi:id="__x7PcJpPEeOk3ovACNQDQQ" element="__x1I0JpPEeOk3ovACNQDQQ" source="_-pLesJpPEeOk3ovACNQDQQ" target="_xMkIkJpPEeOk3ovACNQDQQ" fontName="Segoe UI" fontHeight="8" roundedBendpointsRadius="4" routing="Rectilinear" lineColor="8421504" lineWidth="1" showStereotype="Text">

+        <children xmi:type="notation:DecorationNode" xmi:id="__x7PcppPEeOk3ovACNQDQQ" visible="false" type="NameLabel">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="__x7PdJpPEeOk3ovACNQDQQ" type="Stereotype"/>

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="__x72gJpPEeOk3ovACNQDQQ" type="Name"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="__x7Pc5pPEeOk3ovACNQDQQ" y="-186"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="__x72gZpPEeOk3ovACNQDQQ" type="ToMultiplicityLabel" element="__x1v4ZpPEeOk3ovACNQDQQ">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="__x72g5pPEeOk3ovACNQDQQ" type="ExtensionRequired"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="__x72gppPEeOk3ovACNQDQQ" y="396"/>

+        </children>

+        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__x7PcZpPEeOk3ovACNQDQQ" points="[24, -22, -163, 136]$[111, -112, -76, 46]"/>

+      </edges>

+      <edges xmi:type="umlnotation:UMLConnector" xmi:id="_AUfJ8JpQEeOk3ovACNQDQQ" element="_AUZqYJpQEeOk3ovACNQDQQ" source="_-THIEJpPEeOk3ovACNQDQQ" target="_xMkIkJpPEeOk3ovACNQDQQ" fontName="Segoe UI" fontHeight="8" roundedBendpointsRadius="4" routing="Rectilinear" lineColor="8421504" lineWidth="1" showStereotype="Text">

+        <children xmi:type="notation:DecorationNode" xmi:id="_AUfxAJpQEeOk3ovACNQDQQ" visible="false" type="NameLabel">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_AUfxAppQEeOk3ovACNQDQQ" type="Stereotype"/>

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_AUfxA5pQEeOk3ovACNQDQQ" type="Name"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AUfxAZpQEeOk3ovACNQDQQ" y="-186"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_AUgYEJpQEeOk3ovACNQDQQ" type="ToMultiplicityLabel" element="_AUaRcZpQEeOk3ovACNQDQQ">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_AUgYEppQEeOk3ovACNQDQQ" type="ExtensionRequired"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_AUgYEZpQEeOk3ovACNQDQQ" y="396"/>

+        </children>

+        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AUfJ8ZpQEeOk3ovACNQDQQ" points="[45, -22, -284, 143]$[245, -119, -84, 46]"/>

+      </edges>

+      <edges xmi:type="umlnotation:UMLConnector" xmi:id="_BRrK8JpQEeOk3ovACNQDQQ" element="_BRlrYJpQEeOk3ovACNQDQQ" source="_97sGkJpPEeOk3ovACNQDQQ" target="_xMkIkJpPEeOk3ovACNQDQQ" fontName="Segoe UI" fontHeight="8" roundedBendpointsRadius="4" routing="Rectilinear" lineColor="8421504" lineWidth="1" showStereotype="Text">

+        <children xmi:type="notation:DecorationNode" xmi:id="_BRrK8ppQEeOk3ovACNQDQQ" visible="false" type="NameLabel">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_BRrK9JpQEeOk3ovACNQDQQ" type="Stereotype"/>

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_BRryAJpQEeOk3ovACNQDQQ" type="Name"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BRrK85pQEeOk3ovACNQDQQ" y="-186"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_BRryAZpQEeOk3ovACNQDQQ" type="ToMultiplicityLabel" element="_BRlrYppQEeOk3ovACNQDQQ">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_BRryA5pQEeOk3ovACNQDQQ" type="ExtensionRequired"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_BRryAppQEeOk3ovACNQDQQ" y="396"/>

+        </children>

+        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BRrK8ZpQEeOk3ovACNQDQQ" points="[47, -15, -428, 147]$[485, -116, 10, 46]"/>

+      </edges>

+      <edges xmi:type="umlnotation:UMLConnector" xmi:id="_EX2RsJpQEeOk3ovACNQDQQ" element="_EXwLEJpQEeOk3ovACNQDQQ" source="_D_VEAJpQEeOk3ovACNQDQQ" target="_u4w58JpPEeOk3ovACNQDQQ" fontName="Segoe UI" fontHeight="8" roundedBendpointsRadius="4" routing="Rectilinear" lineColor="8421504" lineWidth="1" showStereotype="Text">

+        <children xmi:type="notation:DecorationNode" xmi:id="_EX2RsppQEeOk3ovACNQDQQ" visible="false" type="NameLabel">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_EX2RtJpQEeOk3ovACNQDQQ" type="Stereotype"/>

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_EX24wJpQEeOk3ovACNQDQQ" type="Name"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EX2Rs5pQEeOk3ovACNQDQQ" y="-186"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_EX24wZpQEeOk3ovACNQDQQ" type="ToMultiplicityLabel" element="_EXwyIZpQEeOk3ovACNQDQQ">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_EX24w5pQEeOk3ovACNQDQQ" type="ExtensionRequired"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_EX24wppQEeOk3ovACNQDQQ" y="396"/>

+        </children>

+        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EX2RsZpQEeOk3ovACNQDQQ" points="[-6, -22, -9, 175]$[-6, -160, -9, 37]"/>

+      </edges>

+      <edges xmi:type="umlnotation:UMLConnector" xmi:id="_E3cXwJpQEeOk3ovACNQDQQ" element="_E3WRIJpQEeOk3ovACNQDQQ" source="_D_VEAJpQEeOk3ovACNQDQQ" target="_kDJbQJpPEeOk3ovACNQDQQ" fontName="Segoe UI" fontHeight="8" roundedBendpointsRadius="4" routing="Rectilinear" lineColor="8421504" lineWidth="1" showStereotype="Text">

+        <children xmi:type="notation:DecorationNode" xmi:id="_E3c-0JpQEeOk3ovACNQDQQ" visible="false" type="NameLabel">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_E3c-0ppQEeOk3ovACNQDQQ" type="Stereotype"/>

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_E3c-05pQEeOk3ovACNQDQQ" type="Name"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E3c-0ZpQEeOk3ovACNQDQQ" y="-186"/>

+        </children>

+        <children xmi:type="notation:DecorationNode" xmi:id="_E3dl4JpQEeOk3ovACNQDQQ" type="ToMultiplicityLabel" element="_E3W4MZpQEeOk3ovACNQDQQ">

+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_E3dl4ppQEeOk3ovACNQDQQ" type="ExtensionRequired"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_E3dl4ZpQEeOk3ovACNQDQQ" y="396"/>

+        </children>

+        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_E3cXwZpQEeOk3ovACNQDQQ" points="[25, -22, -200, 183]$[169, -144, -56, 61]"/>

+      </edges>

+    </contents>

+  </eAnnotations>

+  <packageImport xmi:id="_S0jBQJpPEeOk3ovACNQDQQ">

+    <eAnnotations xmi:id="_FTKqcJpQEeOk3ovACNQDQQ" source="uml2.extensions">

+      <details xmi:id="_FTKqcZpQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+    </eAnnotations>

+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

+  </packageImport>

+  <packageImport xmi:id="_S0jBQZpPEeOk3ovACNQDQQ">

+    <eAnnotations xmi:id="_FTKqcppQEeOk3ovACNQDQQ" source="uml2.extensions">

+      <details xmi:id="_FTKqc5pQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+    </eAnnotations>

+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>

+  </packageImport>

+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_2w-zYJpPEeOk3ovACNQDQQ" name="Participant">

+    <eAnnotations xmi:id="_FTKqdJpQEeOk3ovACNQDQQ" source="uml2.extensions">

+      <details xmi:id="_FTKqdZpQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+    </eAnnotations>

+    <ownedAttribute xmi:id="_7h5ksZpPEeOk3ovACNQDQQ" name="base_Class" association="_7h49oJpPEeOk3ovACNQDQQ">

+      <eAnnotations xmi:id="_FTLRgJpQEeOk3ovACNQDQQ" source="uml2.extensions">

+        <details xmi:id="_FTLRgZpQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+      </eAnnotations>

+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_5dk8gJpPEeOk3ovACNQDQQ" name="Agent">

+    <eAnnotations xmi:id="_FTLRgppQEeOk3ovACNQDQQ" source="uml2.extensions">

+      <details xmi:id="_FTLRg5pQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+    </eAnnotations>

+    <generalization xmi:id="_8PIeIJpPEeOk3ovACNQDQQ" general="_2w-zYJpPEeOk3ovACNQDQQ">

+      <eAnnotations xmi:id="_FTLRhJpQEeOk3ovACNQDQQ" source="uml2.extensions">

+        <details xmi:id="_FTLRhZpQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+      </eAnnotations>

+    </generalization>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Extension" xmi:id="_7h49oJpPEeOk3ovACNQDQQ" name="Class_Participant" memberEnd="_7h5ksJpPEeOk3ovACNQDQQ _7h5ksZpPEeOk3ovACNQDQQ">

+    <eAnnotations xmi:id="_FTLRhppQEeOk3ovACNQDQQ" source="uml2.extensions">

+      <details xmi:id="_FTLRh5pQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+    </eAnnotations>

+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_7h5ksJpPEeOk3ovACNQDQQ" name="extension_Participant" type="_2w-zYJpPEeOk3ovACNQDQQ" aggregation="composite" association="_7h49oJpPEeOk3ovACNQDQQ">

+      <eAnnotations xmi:id="_FTLRiJpQEeOk3ovACNQDQQ" source="uml2.extensions">

+        <details xmi:id="_FTLRiZpQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+      </eAnnotations>

+    </ownedEnd>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_97pqUJpPEeOk3ovACNQDQQ" name="Stereotype1">

+    <eAnnotations xmi:id="_FTLRippQEeOk3ovACNQDQQ" source="uml2.extensions">

+      <details xmi:id="_FTLRi5pQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+    </eAnnotations>

+    <ownedAttribute xmi:id="_BRlrYppQEeOk3ovACNQDQQ" name="base_Port" association="_BRlrYJpQEeOk3ovACNQDQQ">

+      <eAnnotations xmi:id="_FTLRjJpQEeOk3ovACNQDQQ" source="uml2.extensions">

+        <details xmi:id="_FTLRjZpQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+      </eAnnotations>

+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_-TEr0JpPEeOk3ovACNQDQQ" name="Stereotype2">

+    <eAnnotations xmi:id="_FTLRjppQEeOk3ovACNQDQQ" source="uml2.extensions">

+      <details xmi:id="_FTLRj5pQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+    </eAnnotations>

+    <ownedAttribute xmi:id="_AUaRcZpQEeOk3ovACNQDQQ" name="base_Port" association="_AUZqYJpQEeOk3ovACNQDQQ">

+      <eAnnotations xmi:id="_FTLRkJpQEeOk3ovACNQDQQ" source="uml2.extensions">

+        <details xmi:id="_FTLRkZpQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+      </eAnnotations>

+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>

+    </ownedAttribute>

+    <ownedAttribute xmi:id="_ISrvkJpQEeOk3ovACNQDQQ" name="TESt" visibility="public">

+      <eAnnotations xmi:id="_P78nAJpQEeOk3ovACNQDQQ" source="uml2.extensions">

+        <details xmi:id="_P78nAZpQEeOk3ovACNQDQQ" key="addedInVersion" value="2"/>

+      </eAnnotations>

+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_-pIbYJpPEeOk3ovACNQDQQ" name="Stereotype3">

+    <eAnnotations xmi:id="_FTL4kJpQEeOk3ovACNQDQQ" source="uml2.extensions">

+      <details xmi:id="_FTL4kZpQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+    </eAnnotations>

+    <ownedAttribute xmi:id="__x1v4ZpPEeOk3ovACNQDQQ" name="base_Port" association="__x1I0JpPEeOk3ovACNQDQQ">

+      <eAnnotations xmi:id="_FTL4kppQEeOk3ovACNQDQQ" source="uml2.extensions">

+        <details xmi:id="_FTL4k5pQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+      </eAnnotations>

+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Extension" xmi:id="__x1I0JpPEeOk3ovACNQDQQ" name="Port_Stereotype3" memberEnd="__x1v4JpPEeOk3ovACNQDQQ __x1v4ZpPEeOk3ovACNQDQQ">

+    <eAnnotations xmi:id="_FTL4lJpQEeOk3ovACNQDQQ" source="uml2.extensions">

+      <details xmi:id="_FTL4lZpQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+    </eAnnotations>

+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="__x1v4JpPEeOk3ovACNQDQQ" name="extension_Stereotype3" type="_-pIbYJpPEeOk3ovACNQDQQ" aggregation="composite" association="__x1I0JpPEeOk3ovACNQDQQ">

+      <eAnnotations xmi:id="_FTL4lppQEeOk3ovACNQDQQ" source="uml2.extensions">

+        <details xmi:id="_FTL4l5pQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+      </eAnnotations>

+    </ownedEnd>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Extension" xmi:id="_AUZqYJpQEeOk3ovACNQDQQ" name="Port_Stereotype2" memberEnd="_AUaRcJpQEeOk3ovACNQDQQ _AUaRcZpQEeOk3ovACNQDQQ">

+    <eAnnotations xmi:id="_FTL4mJpQEeOk3ovACNQDQQ" source="uml2.extensions">

+      <details xmi:id="_FTL4mZpQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+    </eAnnotations>

+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_AUaRcJpQEeOk3ovACNQDQQ" name="extension_Stereotype2" type="_-TEr0JpPEeOk3ovACNQDQQ" aggregation="composite" association="_AUZqYJpQEeOk3ovACNQDQQ">

+      <eAnnotations xmi:id="_FTL4mppQEeOk3ovACNQDQQ" source="uml2.extensions">

+        <details xmi:id="_FTL4m5pQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+      </eAnnotations>

+    </ownedEnd>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Extension" xmi:id="_BRlrYJpQEeOk3ovACNQDQQ" name="Port_Stereotype1" memberEnd="_BRlrYZpQEeOk3ovACNQDQQ _BRlrYppQEeOk3ovACNQDQQ">

+    <eAnnotations xmi:id="_FTL4nJpQEeOk3ovACNQDQQ" source="uml2.extensions">

+      <details xmi:id="_FTL4nZpQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+    </eAnnotations>

+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_BRlrYZpQEeOk3ovACNQDQQ" name="extension_Stereotype1" type="_97pqUJpPEeOk3ovACNQDQQ" aggregation="composite" association="_BRlrYJpQEeOk3ovACNQDQQ">

+      <eAnnotations xmi:id="_FTL4nppQEeOk3ovACNQDQQ" source="uml2.extensions">

+        <details xmi:id="_FTL4n5pQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+      </eAnnotations>

+    </ownedEnd>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_D_RZoJpQEeOk3ovACNQDQQ" name="Stereotype4">

+    <eAnnotations xmi:id="_FTL4oJpQEeOk3ovACNQDQQ" source="uml2.extensions">

+      <details xmi:id="_FTL4oZpQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+    </eAnnotations>

+    <ownedAttribute xmi:id="_EXwyIZpQEeOk3ovACNQDQQ" name="base_Interface" association="_EXwLEJpQEeOk3ovACNQDQQ">

+      <eAnnotations xmi:id="_FTMfoJpQEeOk3ovACNQDQQ" source="uml2.extensions">

+        <details xmi:id="_FTMfoZpQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+      </eAnnotations>

+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/>

+    </ownedAttribute>

+    <ownedAttribute xmi:id="_E3W4MZpQEeOk3ovACNQDQQ" name="base_Class" association="_E3WRIJpQEeOk3ovACNQDQQ">

+      <eAnnotations xmi:id="_FTMfoppQEeOk3ovACNQDQQ" source="uml2.extensions">

+        <details xmi:id="_FTMfo5pQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+      </eAnnotations>

+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Extension" xmi:id="_EXwLEJpQEeOk3ovACNQDQQ" name="Interface_Stereotype4" memberEnd="_EXwyIJpQEeOk3ovACNQDQQ _EXwyIZpQEeOk3ovACNQDQQ">

+    <eAnnotations xmi:id="_FTMfpJpQEeOk3ovACNQDQQ" source="uml2.extensions">

+      <details xmi:id="_FTMfpZpQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+    </eAnnotations>

+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_EXwyIJpQEeOk3ovACNQDQQ" name="extension_Stereotype4" type="_D_RZoJpQEeOk3ovACNQDQQ" aggregation="composite" association="_EXwLEJpQEeOk3ovACNQDQQ">

+      <eAnnotations xmi:id="_FTMfpppQEeOk3ovACNQDQQ" source="uml2.extensions">

+        <details xmi:id="_FTMfp5pQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+      </eAnnotations>

+    </ownedEnd>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Extension" xmi:id="_E3WRIJpQEeOk3ovACNQDQQ" name="Class_Stereotype4" memberEnd="_E3W4MJpQEeOk3ovACNQDQQ _E3W4MZpQEeOk3ovACNQDQQ">

+    <eAnnotations xmi:id="_FTMfqJpQEeOk3ovACNQDQQ" source="uml2.extensions">

+      <details xmi:id="_FTMfqZpQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+    </eAnnotations>

+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_E3W4MJpQEeOk3ovACNQDQQ" name="extension_Stereotype4" type="_D_RZoJpQEeOk3ovACNQDQQ" aggregation="composite" association="_E3WRIJpQEeOk3ovACNQDQQ">

+      <eAnnotations xmi:id="_FTMfqppQEeOk3ovACNQDQQ" source="uml2.extensions">

+        <details xmi:id="_FTMfq5pQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+      </eAnnotations>

+    </ownedEnd>

+  </packagedElement>

+  <profileApplication xmi:id="_S0joUJpPEeOk3ovACNQDQQ">

+    <eAnnotations xmi:id="_S0joUZpPEeOk3ovACNQDQQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

+      <references xmi:type="ecore:EPackage" href="pathmap://UML2_MSL_PROFILES/ProfileBase.epx#_IfFYQMmBEdqBcN1R6EvWUw?ProfileBase/ProfileBase?"/>

+    </eAnnotations>

+    <eAnnotations xmi:id="_FTMfrJpQEeOk3ovACNQDQQ" source="uml2.extensions">

+      <details xmi:id="_FTMfrZpQEeOk3ovACNQDQQ" key="addedInVersion" value="1"/>

+    </eAnnotations>

+    <appliedProfile href="pathmap://UML2_MSL_PROFILES/ProfileBase.epx#_bFUAMdWLEdiy4IqP8whjFA?ProfileBase?"/>

+  </profileApplication>

+</uml:Profile>

diff --git a/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/Activator.java b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/Activator.java
new file mode 100644
index 00000000000..4bb4da9f3f4
--- /dev/null
+++ b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/Activator.java
@@ -0,0 +1,68 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ * 	Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com - Initial API and implementation

+ * 	Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.tests;

+

+import org.eclipse.papyrus.infra.core.log.LogHelper;

+import org.eclipse.ui.plugin.AbstractUIPlugin;

+import org.osgi.framework.BundleContext;

+

+public class Activator extends AbstractUIPlugin {

+

+	// The plug-in ID

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.migration.rsa.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)

+	 */

+	@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/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/AllTests.java b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/AllTests.java
new file mode 100644
index 00000000000..3384279b571
--- /dev/null
+++ b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/AllTests.java
@@ -0,0 +1,26 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms 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

+ * 	Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.tests;

+

+import org.eclipse.papyrus.migration.rsa.tests.qvt.ImportDiagramTest;

+import org.junit.runner.RunWith;

+import org.junit.runners.Suite;

+import org.junit.runners.Suite.SuiteClasses;

+

+

+

+@RunWith(Suite.class)

+@SuiteClasses({ ImportDiagramTest.class })

+public class AllTests {

+	//Test suite

+}

diff --git a/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/qvt/ImportDiagramTest.java b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/qvt/ImportDiagramTest.java
new file mode 100644
index 00000000000..019e88f61dd
--- /dev/null
+++ b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/qvt/ImportDiagramTest.java
@@ -0,0 +1,304 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms 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

+ * 	Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

+ *****************************************************************************/

+package org.eclipse.papyrus.migration.rsa.tests.qvt;

+

+import java.net.URL;

+import java.util.Iterator;

+import java.util.List;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.resources.ResourcesPlugin;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.emf.common.command.Command;

+import org.eclipse.emf.common.util.EList;

+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.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.papyrus.commands.OpenDiagramCommand;

+import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

+import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;

+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;

+import org.eclipse.papyrus.infra.core.resource.ModelSet;

+import org.eclipse.papyrus.infra.core.resource.ModelsReader;

+import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;

+import org.eclipse.papyrus.infra.core.services.ServiceException;

+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;

+import org.eclipse.papyrus.junit.utils.EditorUtils;

+import org.eclipse.papyrus.junit.utils.FilesUtils;

+import org.eclipse.papyrus.junit.utils.ProjectUtils;

+import org.eclipse.papyrus.migration.rsa.tests.Activator;

+import org.eclipse.papyrus.migration.rsa.transformation.ImportTransformation;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.commands.ApplyProfileCommand;

+import org.eclipse.papyrus.uml.tools.model.UmlUtils;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.IWorkbench;

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Profile;

+import org.eclipse.uml2.uml.UMLPackage;

+import org.eclipse.uml2.uml.resource.UMLResource;

+import org.junit.AfterClass;

+import org.junit.Assert;

+import org.junit.BeforeClass;

+import org.junit.Test;

+

+public class ImportDiagramTest {

+

+	private static IProject targetProject;

+

+	protected static IMultiDiagramEditor editor;

+

+	protected static URI fileDiagram, fileProfile;

+

+

+	@AfterClass

+	public static void dispose() throws Exception {

+

+		IWorkbench wb = PlatformUI.getWorkbench();

+		IWorkbenchPage page = wb.getActiveWorkbenchWindow().getActivePage();

+		page.closeAllEditors(false);

+		targetProject.delete(true, new NullProgressMonitor());

+	}

+

+

+	@BeforeClass

+	public static void init() throws Exception {

+		targetProject = ProjectUtils.createProject(Activator.PLUGIN_ID + ".testProject");

+		URI rsaDiagramModelUri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/ModelTestClass.emx", true);

+		URI rsaProfileModelUri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/Profile.epx", true);

+

+		FilesUtils.copyFiles(targetProject, "ModelTestClass.emx", new URL(rsaDiagramModelUri.toString()));

+		FilesUtils.copyFiles(targetProject, "Profile.epx", new URL(rsaProfileModelUri.toString()));

+

+		fileDiagram = URI.createPlatformResourceURI(Activator.PLUGIN_ID + ".testProject" + "/ModelTestClass.emx", true);

+

+		ImportTransformation transfoDiagram = new ImportTransformation(fileDiagram) {

+

+			/**

+			 * @see org.eclipse.papyrus.migration.rsa.transformation.ImportTransformation#run()

+			 *

+			 */

+

+			@Override

+			public void run() {

+				this.run(new NullProgressMonitor());

+			}

+		};

+		fileProfile = URI.createPlatformResourceURI(Activator.PLUGIN_ID + ".testProject" + "/Profile.epx", true);

+		ImportTransformation transfoProfile = new ImportTransformation(fileProfile) {

+

+			/**

+			 * @see org.eclipse.papyrus.migration.rsa.transformation.ImportTransformation#run()

+			 *

+			 */

+

+			@Override

+			public void run() {

+				this.run(new NullProgressMonitor());

+			}

+		};

+

+		transfoDiagram.run();

+		transfoProfile.run();

+	}

+

+

+

+	// Test should be more generic

+

+	@Test

+	public void openModelTest() throws Exception {

+		ModelSet modelSet = new ModelSet();

+		ModelsReader reader = new ModelsReader();

+		reader.readModel(modelSet);

+		try {

+			modelSet.loadModels(fileDiagram.trimFileExtension().appendFileExtension("di"));

+		} catch (ModelMultiException e) {

+			e.printStackTrace();

+		}

+		final ServicesRegistry registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);

+		try {

+			registry.add(ModelSet.class, Integer.MAX_VALUE, modelSet);

+			registry.startRegistry();

+		} catch (ServiceException ex) {

+			// Ignored: we don't need all services

+		}

+

+

+

+		TransactionalEditingDomain editingDomain = modelSet.getTransactionalEditingDomain();

+		Resource umlResource = UmlUtils.getUmlResource(modelSet);

+

+		// Profile should be applied during the transformation

+

+		if (umlResource instanceof UMLResource) {

+			EList<EObject> umlresourceContent = umlResource.getContents();

+			Iterator<EObject> umlite = umlresourceContent.iterator();

+			while (umlite.hasNext()) {

+				Object currentobject = umlite.next();

+				if (currentobject instanceof org.eclipse.uml2.uml.Package) {

+					URI uri = URI.createURI(UMLResource.STANDARD_PROFILE_URI, true);

+					Resource resource = modelSet.getResource(uri, true);

+					Profile profile = (Profile) EcoreUtil.getObjectByType(resource.getContents(), UMLPackage.Literals.PROFILE);

+					Command command = new ApplyProfileCommand((org.eclipse.uml2.uml.Package) currentobject, profile, editingDomain);

+					try {

+						editingDomain.getCommandStack().execute(command);

+					} catch (Exception ex) {

+						ex.printStackTrace();

+					}

+

+				}

+			}

+		}

+

+		Display.getDefault().syncExec(new Runnable() {

+

+			public void run() {

+				try {

+					IFile fileToOpen = (IFile) ResourcesPlugin.getWorkspace().getRoot().findMember(fileDiagram.trimFileExtension().appendFileExtension("di").toPlatformString(true));

+					editor = EditorUtils.openPapyrusEditor(fileToOpen);

+				} catch (Exception ex) {

+					Activator.log.error(ex);

+					Assert.fail(ex.getMessage());

+				}

+			}

+		});

+		Assert.assertNotNull("Cannot open the Papyrus editor", editor);

+

+		Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();

+		List<EObject> listcontent = notationResource.getContents();

+		

+		// Expected is 7 valid migrated diagrams.

+		// FIXME: Sequence Diagram import is currently disabled, so 6 is the new expected number

+		Assert.assertEquals(6, listcontent.size()); // Expected is 7 valid migrated diagrams

+		

+		for (EObject cont : listcontent) {

+			Assert.assertTrue(cont instanceof Diagram);

+

+			Diagram currentDia = (Diagram) cont;

+			editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, currentDia)));

+			IEditorPart currentEditor = editor.getActiveEditor();

+			Assert.assertNotNull("could not open the  diagram editor", currentEditor);

+			Assert.assertTrue("The active editor should be a GMF Diagram Editor", editor.getActiveEditor() instanceof IDiagramWorkbenchPart);

+			Object temp = currentEditor.getAdapter(EditPart.class);

+			Assert.assertNotNull(temp);

+			EditPart editPart = (EditPart) temp;

+			List<IGraphicalEditPart> listEditPart = DiagramEditPartsUtil.getAllEditParts(editPart);

+			for (EditPart currentEditPart : listEditPart) {

+				Assert.assertNotNull("should not be invalid view", currentEditPart);

+			}

+		}

+

+		try {

+			registry.disposeRegistry();

+		} catch (ServiceException ex) {

+			// Ignore

+		}

+	}

+

+	@Test

+	public void openProfileTest() throws Exception {

+		ModelSet modelSet = new ModelSet();

+		ModelsReader reader = new ModelsReader();

+		reader.readModel(modelSet);

+		try {

+			modelSet.loadModels(fileProfile.trimFileExtension().appendFileExtension("profile.di"));

+		} catch (ModelMultiException e) {

+			e.printStackTrace();

+		}

+		final ServicesRegistry registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);

+		try {

+			registry.add(ModelSet.class, Integer.MAX_VALUE, modelSet);

+			registry.startRegistry();

+		} catch (ServiceException ex) {

+			// Ignored: we don't need all services

+		}

+

+		TransactionalEditingDomain editingDomain = modelSet.getTransactionalEditingDomain();

+		Resource umlResource = UmlUtils.getUmlResource(modelSet);

+

+		// Profile should be applied during the transformation

+

+		if (umlResource instanceof UMLResource) {

+			EList<EObject> umlresourceContent = umlResource.getContents();

+			Iterator<EObject> umlite = umlresourceContent.iterator();

+			while (umlite.hasNext()) {

+				Object currentobject = umlite.next();

+				if (currentobject instanceof org.eclipse.uml2.uml.Package) {

+					URI uri = URI.createURI(UMLResource.STANDARD_PROFILE_URI, true);

+					Resource resource = modelSet.getResource(uri, true);

+					Profile profile = (Profile) EcoreUtil.getObjectByType(resource.getContents(), UMLPackage.Literals.PROFILE);

+					Command command = new ApplyProfileCommand((org.eclipse.uml2.uml.Package) currentobject, profile, editingDomain);

+					try {

+						editingDomain.getCommandStack().execute(command);

+					} catch (Exception ex) {

+						ex.printStackTrace();

+					}

+

+				}

+			}

+		}

+

+		Display.getDefault().syncExec(new Runnable() {

+

+			public void run() {

+				try {

+					IFile fileToOpen = (IFile) ResourcesPlugin.getWorkspace().getRoot().findMember(fileProfile.trimFileExtension().appendFileExtension("profile.di").toPlatformString(true));

+					editor = EditorUtils.openPapyrusEditor(fileToOpen);

+				} catch (PartInitException ex) {

+					Activator.log.error(ex);

+					Assert.fail(ex.getMessage());

+				}

+			}

+		});

+		Assert.assertNotNull("Cannot open the Papyrus editor", editor);

+

+		Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();

+		List<EObject> listcontent = notationResource.getContents();

+		Assert.assertEquals(1, listcontent.size());

+		for (EObject cont : listcontent) {

+			Assert.assertTrue(cont instanceof Diagram);

+

+			Diagram currentDia = (Diagram) cont;

+			editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, currentDia)));

+			IEditorPart currentEditor = editor.getActiveEditor();

+			Assert.assertNotNull("could not open the  diagram editor", currentEditor);

+			Assert.assertTrue("The active editor should be a GMF Diagram Editor", editor.getActiveEditor() instanceof IDiagramWorkbenchPart);

+			Object temp = currentEditor.getAdapter(EditPart.class);

+			Assert.assertNotNull(temp);

+			EditPart editPart = (EditPart) temp;

+			List<IGraphicalEditPart> listEditPart = DiagramEditPartsUtil.getAllEditParts(editPart);

+			for (EditPart currentEditPart : listEditPart) {

+				Assert.assertNotNull("should not be invalid view", currentEditPart);

+			}

+		}

+

+		try {

+			registry.disposeRegistry();

+		} catch (ServiceException ex) {

+			// Ignore

+		}

+	}

+

+}

diff --git a/tests/junit/extraplugins/moka/org.eclipse.papyrus.moka.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/moka/org.eclipse.papyrus.moka.tests/META-INF/MANIFEST.MF
index 5524fc17896..7c291355b25 100644
--- a/tests/junit/extraplugins/moka/org.eclipse.papyrus.moka.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/moka/org.eclipse.papyrus.moka.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.junit.framework;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

  org.junit;bundle-version="4.11.0",

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

  org.eclipse.ui.navigator;bundle-version="3.5.400",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.8.0",

- org.eclipse.papyrus.moka;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.moka;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.debug.core,

  org.eclipse.emf.ecore,

- org.eclipse.papyrus.moka.composites;bundle-version="1.0.1",

- org.eclipse.papyrus.moka.async.fuml;bundle-version="1.0.1",

- org.eclipse.papyrus.moka.fuml;bundle-version="1.0.1",

- org.eclipse.papyrus.moka.fuml.assertionlibrary;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.moka.composites.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.moka.composites;bundle-version="1.1.0",

+ org.eclipse.papyrus.moka.async.fuml;bundle-version="1.1.0",

+ org.eclipse.papyrus.moka.fuml;bundle-version="1.1.0",

+ org.eclipse.papyrus.moka.fuml.assertionlibrary;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.moka.composites.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.moka.tests

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Moka Tests (Incubation)

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.moka.tests.Activator

diff --git a/tests/junit/extraplugins/moka/org.eclipse.papyrus.moka.tests/pom.xml b/tests/junit/extraplugins/moka/org.eclipse.papyrus.moka.tests/pom.xml
index f35c4b455e8..5c87a7d8d15 100644
--- a/tests/junit/extraplugins/moka/org.eclipse.papyrus.moka.tests/pom.xml
+++ b/tests/junit/extraplugins/moka/org.eclipse.papyrus.moka.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-extra-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.moka.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/META-INF/MANIFEST.MF b/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/META-INF/MANIFEST.MF
index 894e60e6c49..5ec81d67bec 100644
--- a/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/META-INF/MANIFEST.MF
@@ -1,19 +1,20 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.bundles.tests;bundle-version="1.0.1",

+ org.eclipse.papyrus.bundles.tests;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.cdo.core.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.cdo.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.cdo.ui.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.cdo.uml.ui.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.cdo.validation.problems.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.cpp.codegen.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.moka.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.umlrt.validation.tests;bundle-version="1.0.1"

+ org.eclipse.papyrus.cdo.core.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.ui.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.uml.ui.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.cdo.validation.problems.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.cpp.codegen.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.moka.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.umlrt.validation.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.migration.rsa.tests;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Extra plugins Tests (Incubation)

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.tests.extra.Activator

diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/pom.xml b/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/pom.xml
index 449d3799953..377fae150d1 100644
--- a/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/pom.xml
+++ b/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../releng/top-pom-extra-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.tests.extra</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/src/org/eclipse/papyrus/tests/extra/AllTests.java b/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/src/org/eclipse/papyrus/tests/extra/AllTests.java
index 332e051bdbc..8b098f59f38 100644
--- a/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/src/org/eclipse/papyrus/tests/extra/AllTests.java
+++ b/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/src/org/eclipse/papyrus/tests/extra/AllTests.java
@@ -44,6 +44,9 @@ public class AllTests {
 		/* UmlRT tests */

 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.umlrt.validation.tests.AllTests.class));

 

+		/* Migration tests */

+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.migration.rsa.tests.AllTests.class));

+

 		/* UML Compare tests */

 		/**

 		 * UML Compare tests have been temporarily disabled. See:

@@ -51,9 +54,9 @@ public class AllTests {
 		 * 389811: [Papyrus Compare] The Papyrus Compare feature is not compatible with Kepler

 		 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=389811

 		 */

-		//		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.compare.tests.AllTests.class));

-		//		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.compare.file.tests.AllTests.class));

-		//		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.compare.diff.tests.AllTests.class));

+		// suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.compare.tests.AllTests.class));

+		// suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.compare.file.tests.AllTests.class));

+		// suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.compare.diff.tests.AllTests.class));

 

 		/* **************** plugins *********************** */

 	}

@@ -67,9 +70,9 @@ public class AllTests {
 		 * Constructor.

 		 *

 		 * @param clazz

-		 *        the suite class � AllTests2

+		 *            the suite class � AllTests2

 		 * @throws InitializationError

-		 *         if there's a problem

+		 *             if there's a problem

 		 * @throws org.junit.runners.model.InitializationError

 		 */

 		public AllTestsRunner(final Class<?> clazz) throws InitializationError {

@@ -85,14 +88,14 @@ public class AllTests {
 	private static Class<?>[] getSuites() {

 		// retrieve all test suites.

 		Collection<Class<?>> suites = new ArrayList<Class<?>>();

-		for(ITestSuiteClass testSuiteClass : suiteClasses) {

+		for (ITestSuiteClass testSuiteClass : suiteClasses) {

 			Class<?> class_ = testSuiteClass.getMainTestSuiteClass();

-			if(class_ != null) {

+			if (class_ != null) {

 				suites.add(class_);

 			} else {

 				System.err.println(testSuiteClass + " does not give a correct test suite class");

 			}

 		}

-		return suites.toArray(new Class<?>[]{});

+		return suites.toArray(new Class<?>[] {});

 	}

 }

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/META-INF/MANIFEST.MF
index 87a603783cf..6a1d15debe2 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",

  org.eclipse.core.resources,

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.emf.compare.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.compare.instance;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.compare.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.compare;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.compare.file;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.compare.diff;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf.compare.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.compare.instance;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.compare.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.compare;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.compare.file;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.compare.diff;bundle-version="1.1.0",

  org.eclipse.emf.compare.match;bundle-version="1.3.1",

  org.eclipse.emf.compare.diff;bundle-version="1.3.1",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.emf.compare.uml2;bundle-version="1.3.1",

  org.eclipse.emf.compare,

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.compare.diff;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.compare.diff;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.emf.edit.ui;bundle-version="2.8.0"

 Export-Package: org.eclipse.papyrus.uml.compare.diff.tests

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Tests Papyrus UML Merger (Incubation)

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.compare.diff.tests.Activator

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/META-INF/MANIFEST.MF
index 4ffbbdc638c..b769e464368 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.8.0",

  org.eclipse.jdt.ui;bundle-version="3.8.0",

- org.eclipse.papyrus.uml.compare.file;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.compare.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.compare.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.compare.file;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.compare.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.compare.ui;bundle-version="1.1.0",

  org.eclipse.compare;bundle-version="3.5.300",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0"

 Export-Package: org.eclipse.papyrus.uml.compare.file.tests

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.compare.file.tests.Activator

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/META-INF/MANIFEST.MF
index d6f5b543a46..d6a2a55e9db 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/META-INF/MANIFEST.MF
@@ -1,24 +1,24 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",

  org.eclipse.core.resources,

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.uml.compare;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.compare.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.compare.ui;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.compare;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.compare.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.compare.ui;bundle-version="1.1.0",

  org.eclipse.compare;bundle-version="3.5.300",

- org.eclipse.papyrus.uml.compare;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.compare;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0"

 Export-Package: org.eclipse.papyrus.uml.compare.tests

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.compare.tests.Activator

diff --git a/tests/junit/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation.tests/META-INF/MANIFEST.MF
index 3e571a957d8..5ee981273e5 100644
--- a/tests/junit/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation.tests/META-INF/MANIFEST.MF
@@ -1,24 +1,24 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",

  org.junit,

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.6.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.validation;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.validation;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.validation;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.validation;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="5.0.0",

  org.eclipse.ui.navigator;bundle-version="3.5.400",

  org.eclipse.ui.ide;bundle-version="3.10.0",

  org.eclipse.ui,

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

  org.eclipse.emf.workspace;bundle-version="1.5.1",

  org.eclipse.emf.validation,

  org.eclipse.emf.transaction;bundle-version="1.8.0",

@@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",
 Export-Package: org.eclipse.papyrus.umlrt.validation.tests

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: UML-RT Validation Tests

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.umlrt.validation.tests.Activator

diff --git a/tests/junit/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation.tests/pom.xml b/tests/junit/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation.tests/pom.xml
index 410147a1fb5..423928cad37 100644
--- a/tests/junit/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation.tests/pom.xml
+++ b/tests/junit/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-extra-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.umlrt.validation.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation.tests/resources/IsActiveEntityRule.uml b/tests/junit/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation.tests/resources/IsActiveEntityRule.uml
index 5d98b22cc9e..2fe21d7aa74 100644
--- a/tests/junit/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation.tests/resources/IsActiveEntityRule.uml
+++ b/tests/junit/extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation.tests/resources/IsActiveEntityRule.uml
@@ -1,13 +1,13 @@
 <?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:UMLRealTime="http:///schemas/UMLRealTime/_lVqk0BMpEeSz2qq_H0HScA/27" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/UMLRealTime/_lVqk0BMpEeSz2qq_H0HScA/27 pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_lVrL4BMpEeSz2qq_H0HScA">

+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:UMLRealTime="http://www.eclipse.org/papyrus/umlrt" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">

   <uml:Model xmi:id="_Z4oo4B5CEeSsWuEOO_jVsA" name="UML RealTime Model">

     <packagedElement xmi:type="uml:Class" xmi:id="_aP5SUB5CEeSsWuEOO_jVsA" name="Capsule1"/>

     <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_gDJDUB5CEeSsWuEOO_jVsA">

       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gD4qMB5CEeSsWuEOO_jVsA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_lVrL4BMpEeSz2qq_H0HScA"/>

+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/umlrt#/"/>

       </eAnnotations>

       <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_1h74oEeVEeO0lv5O1DTHOQ"/>

     </profileApplication>

   </uml:Model>

-  <UMLRealTime:Capsule xmi:id="_dJzTIB5MEeSTSfKeKUiyVA" base_Class="_aP5SUB5CEeSsWuEOO_jVsA"/>

+  <UMLRealTime:Capsule xmi:id="_5f4f0DmTEeS6VfUSHwiIDg" base_Class="_aP5SUB5CEeSsWuEOO_jVsA"/>

 </xmi:XMI>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
index 65e88f1fe15..31fea950b99 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
@@ -1,42 +1,42 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.timing;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.timing;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.9.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.7.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.7.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

  org.eclipse.ui.navigator;bundle-version="3.5.0",

- org.eclipse.papyrus.infra.services.validation;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.validation;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.validation;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.validation;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.sequence;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.sequence;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.editor.integration.tests,

  org.eclipse.papyrus.editor.integration.tests.tests

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Papyrus Editor Integration Tests

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.editor.integration.tests.Activat

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/pom.xml b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/pom.xml
index 9e5537a1340..c1f966d1a08 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/pom.xml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.editor.integration.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF
index ce0c2c79d2a..e53469cd4b0 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0

 Require-Bundle: org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.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,

@@ -8,7 +8,7 @@ Export-Package: org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider,
 Bundle-Vendor: %Bundle-Vendor

 Fragment-Host: org.eclipse.papyrus.infra.core.sasheditor.di;bundle-ver

  sion="0.10.0"

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.di.test

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/pom.xml b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/pom.xml
index 13603ecf9ff..ecb56880398 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/pom.xml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.core.sasheditor.di.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF
index 297ae3167ec..6709526f209 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Require-Bundle: org.eclipse.ui.editors;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="1.0.1",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.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"

@@ -22,7 +22,7 @@ Export-Package: org.eclipse.papyrus.infra.core.sasheditor.contentprovider,
 Bundle-Vendor: %providerName

 Fragment-Host: org.eclipse.papyrus.infra.core.sasheditor;bundle-versio

  n="1.0.0"

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: fragment

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/pom.xml b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/pom.xml
index 5ab566b2962..3b06f85c422 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/pom.xml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.core.sasheditor.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF
index 0acec0ed360..d2ea9abc80e 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.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.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.core.lifecycleevents,

  org.eclipse.papyrus.infra.core.resource,

  org.eclipse.papyrus.infra.core.services,

  org.eclipse.papyrus.infra.core.tests

 Bundle-Vendor: %providerName

 Fragment-Host: org.eclipse.papyrus.infra.core;bundle-version="1.0.0"

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: fragment

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/pom.xml b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/pom.xml
index ebb525a3f93..98aeb9f099e 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/pom.xml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.core.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/META-INF/MANIFEST.MF
index beb5e7fdf81..c444a23cd8e 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/META-INF/MANIFEST.MF
@@ -1,24 +1,24 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.newchild;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.newchild;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.emf.core;bundle-version="1.7.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.extendedtypes.tests

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %fragmentName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/pom.xml b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/pom.xml
index f7ec11403a6..afe7ac7c747 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/pom.xml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.extendedtypes.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
index 1282f1e38c4..c8befe8748b 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
@@ -1,68 +1,68 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.clazz.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.bundles.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.activity.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.deployment.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.component.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.usecase.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.statemachine.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.communication.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.dnd.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.diagram.blockdefinition;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.diagram.internalblock;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.diagram.requirement.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.modelexplorer;bundle-version="1.0.1",

- org.eclipse.papyrus.customization.properties.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.timing.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.editor.integration.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.search.tests;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.clazz.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.bundles.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.activity.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.deployment.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.component.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.usecase.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.statemachine.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.communication.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.dnd.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.diagram.blockdefinition;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.diagram.internalblock;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.diagram.requirement.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.modelexplorer;bundle-version="1.1.0",

+ org.eclipse.papyrus.customization.properties.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.timing.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor.integration.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.search.tests;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.uml.tools.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.nattable.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.model.editor.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.sequence.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.interactionoverview.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.composite.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.extendedtypes.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.wizards.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.modelrepair;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.profile.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.controlmode.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.nattable.allocation.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.views.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.nattable.generic.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.modelexplorer.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.modelexplorer.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.nattable.requirement.tests;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.tools.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.nattable.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model.editor.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.sequence.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.interactionoverview.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.composite.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.extendedtypes.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.wizards.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.modelrepair;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.profile.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.controlmode.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.nattable.allocation.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.views.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.nattable.generic.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.modelexplorer.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.modelexplorer.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.nattable.requirement.tests;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/pom.xml b/tests/junit/plugins/core/org.eclipse.papyrus.tests/pom.xml
index 69b863f5bfe..828946c08c0 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/pom.xml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/META-INF/MANIFEST.MF
index 150deb9c60c..c14c84f0a4c 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.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.customization.properties.model.xwt;bundle-version="1.0.1",

- org.eclipse.papyrus.customization.properties.generation;bundle-version="1.0.1",

+ org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="1.1.0",

+ org.eclipse.papyrus.customization.properties.generation;bundle-version="1.1.0",

  org.eclipse.emf.ecore;bundle-version="2.8.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.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="4.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.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.customization.properties.tests,

  org.eclipse.papyrus.customization.properties.tests.qvt

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Properties view customization Tests

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.customization.properties.tests.A

diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/pom.xml b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/pom.xml
index 96f421e83e1..8f4b5322c74 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/pom.xml
+++ b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.customization.properties.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </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 b9d28e7473a..e01efa9ebb2 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
@@ -7,11 +7,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.pde.core,

  org.eclipse.update.configurator,

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.bundles.tests

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.bundles.tests.Activator

diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/pom.xml b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/pom.xml
index a01495357e9..c9d8bd1d6d8 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/pom.xml
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.bundles.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java
index 1e4ae79f92f..6d42c1a3b91 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java
@@ -16,7 +16,7 @@ import org.osgi.framework.BundleContext;
 public class BundleTestsUtils {

 

 	// This version number should be changed at each release

-	public static final String PAPYRUS_VERSION = "1.0.1"; //$NON-NLS-1$

+	public static final String PAPYRUS_VERSION = "1.1.0"; //$NON-NLS-1$

 

 	public static final String INCUBATION = "(Incubation)"; //$NON-NLS-1$

 

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 a72cd10d3d9..ab8a126b8ac 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
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.10.0",

  org.eclipse.uml2.uml;bundle-version="5.0.0",

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.7.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.emf.readonly,

  org.eclipse.papyrus.infra.emf.readonly.tests

 Bundle-Vendor: %providerName

 Fragment-Host: org.eclipse.papyrus.infra.emf.readonly;bundle-version="

  1.0.0"

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: fragment

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/pom.xml b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/pom.xml
index bb0be999a12..902fd00cef7 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/pom.xml
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.emf.readonly.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 e937424eb33..bc238a57750 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
@@ -5,11 +5,11 @@ Export-Package: org.eclipse.papyrus.infra.emf.advice,
 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.0.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Fragment-Host: org.eclipse.papyrus.infra.emf;bundle-version="1.0.0"

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/pom.xml b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/pom.xml
index 108d416cb42..897f372a7fd 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/pom.xml
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.emf.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 14d3b397eda..24609527084 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,13 +1,13 @@
 Manifest-Version: 1.0

 Require-Bundle: org.junit;bundle-version="4.10.0",

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.gmfdiag.commands.tests

 Bundle-Vendor: %providerName

 Fragment-Host: org.eclipse.papyrus.infra.gmfdiag.commands;bundle-versi

  on="1.0.0"

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: fragment

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/pom.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/pom.xml
index 378d4d32270..36cdb3b375a 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/pom.xml
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.gmfdiag.commands.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF
index fd498a03eee..11ac88dcbd1 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0

 Require-Bundle: org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.tests,

  org.eclipse.papyrus.infra.gmfdiag.common.utils

 Bundle-Vendor: %providerName

 Fragment-Host: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version

  ="1.0.0"

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: fragment

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/pom.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/pom.xml
index 0d70eac72c2..b8a50bae3c8 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/pom.xml
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.gmfdiag.common.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 0191c2c52ad..0650c2472fd 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,30 +1,30 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.css.xtext;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.css.xtext;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.core.resources;bundle-version="3.8.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.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.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: CSS Tests

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.tests.Activato

diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/pom.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/pom.xml
index ac05e24dd3b..4092a5abb93 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/pom.xml
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.gmfdiag.css.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 e884bb671bf..e4598cb97f2 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,17 +1,17 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.model.editor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model.editor;bundle-version="1.1.0",

  org.junit;bundle-version="4.11.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

  org.eclipse.emf.transaction,

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.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.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.editor.test

diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/pom.xml b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/pom.xml
index 1b71f4a88a1..5cbf306f9ef 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/pom.xml
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.nattable.model.editor.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF
index 268f0e1ccac..e0643f5b39a 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.junit,

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

  org.eclipse.emf.ecore,

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

  org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.nattable.tests.tests

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.infra.nattable.tests.Activator

diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/pom.xml b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/pom.xml
index bff19f32cc7..6ba3078eb09 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/pom.xml
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.nattable.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF
index b798debb2a6..98a11e9e8cf 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF
@@ -1,30 +1,30 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",

  org.junit,

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.8.0",

  org.eclipse.gmf.runtime.notation.edit,

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0",

- org.eclipse.papyrus.editor.integration.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"

+ org.eclipse.papyrus.editor.integration.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.nattable.views.tests,

  org.eclipse.papyrus.infra.nattable.views.tests.tests

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.infra.nattable.views.tests.Activ

diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/pom.xml b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/pom.xml
index b5df7188bff..cbfefafbd28 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/pom.xml
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.nattable.views.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 b2f40a539b9..a1ac50f1990 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.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.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",

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.tools.databinding,

  org.eclipse.papyrus.infra.tools.tests,

  org.eclipse.papyrus.infra.tools.util

 Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Papyrus Infrastructure Tools Tests

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.tools.tests;singleton:=

diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml
index ea6903917af..bb7c1cba2f8 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.tools.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 656d96bfec7..702a6564696 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,23 +1,23 @@
 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.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="5.0.0",

  org.eclipse.swtbot.eclipse.finder;bundle-version="2.2.1",

  org.eclipse.swtbot.junit4_x;bundle-version="2.2.1",

  org.eclipse.emf.transaction,

- org.eclipse.papyrus.infra.services.resourceloading.preferences;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.services.resourceloading.preferences;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.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.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.tests

diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/pom.xml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/pom.xml
index adb1e11b7cb..ba1f5312163 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/pom.xml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.services.controlmode.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 3adb7bf75d5..fe0120bbe9a 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,12 +1,12 @@
 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.0.1",

- org.eclipse.papyrus.infra.services.validation;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.validation;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="5.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.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,

@@ -18,7 +18,7 @@ Export-Package: org.eclipse.papyrus.infra.services.edit.tests,
 Bundle-Vendor: %providerName

 Fragment-Host: org.eclipse.papyrus.infra.services.edit;bundle-version=

  "0.10.0"

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/pom.xml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/pom.xml
index 1553fc46204..a840665b23e 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/pom.xml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.services.edit.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 616f7a895fe..6797c84beef 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,22 +1,22 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

  org.eclipse.emf.ecore;bundle-version="2.8.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.services.labelprovider.tests

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: LabelProvider Service Tests

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.infra.services.labelprovider.tes

diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/pom.xml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/pom.xml
index c8fb7f1d793..aa86eeedf9f 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/pom.xml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.services.labelprovider.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 503b40c826a..622718f7ed3 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,17 +1,17 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.papyrus.infra.services.resourceloading.preferences;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.resourceloading.profile;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.resourceloading.preferences;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.resourceloading.profile;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.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

 Fragment-Host: org.eclipse.papyrus.infra.services.resourceloading;bund

  le-version="0.10.0"

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %fragmentName

 Bundle-Localization: fragment

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/pom.xml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/pom.xml
index 69457ccb78f..0c595316703 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/pom.xml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.services.resourceloading.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 73f8e609f79..31c43c5ac6d 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
@@ -3,13 +3,13 @@ Export-Package: org.eclipse.papyrus.junit.framework.classification,
  org.eclipse.papyrus.junit.framework.classification.rules,

  org.eclipse.papyrus.junit.framework.classification.tests

 Require-Bundle: org.junit;bundle-version="4.11.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

  org.eclipse.emf.edit;bundle-version="2.10.0",

  org.eclipse.ui;bundle-version="3.106.0",

  com.google.guava;bundle-version="11.0.0",

  org.eclipse.core.runtime;bundle-version="3.10.0"

 Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Conditional Junit Annotations

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.junit.framework

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 c8aca2f233c..76f4bd9db0d 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
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.junit.framework</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
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 6eb1c7cca93..687f52dd874 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
@@ -3,26 +3,26 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

  org.eclipse.core.resources;bundle-version="3.8.0",

  org.eclipse.jdt.ui,

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

  org.eclipse.ui.navigator,

  org.eclipse.ui.views.properties.tabbed,

  org.eclipse.ui.ide;bundle-version="3.8.0",

  org.eclipse.emf.edit;bundle-version="2.8.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

  org.eclipse.e4.ui.workbench;bundle-version="1.1.0",

  org.eclipse.e4.ui.model.workbench;bundle-version="1.1.0",

  org.eclipse.e4.core.contexts;bundle-version="1.3.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.junit.matchers,

  org.eclipse.papyrus.junit.utils,

  org.eclipse.papyrus.junit.utils.resources,

@@ -30,7 +30,7 @@ Export-Package: org.eclipse.papyrus.junit.matchers,
  org.eclipse.papyrus.junit.utils.tests

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.junit.utils.Activator

diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/pom.xml b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/pom.xml
index cdd3e86fb61..19f8c23fc24 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/pom.xml
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.junit.utils</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/META-INF/MANIFEST.MF
index 6dd81faaf54..5478dbbba5b 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.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.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.sysml.diagram.blockdefinition.test

  s.suites

 Bundle-Vendor: %providerName

 Fragment-Host: org.eclipse.papyrus.sysml.diagram.blockdefinition;bundl

  e-version="0.10.0"

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/pom.xml b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/pom.xml
index de885049d4a..fb90b172282 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/pom.xml
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.sysml.diagram.blockdefinition.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF
index b6c478a00c3..e886af9fe89 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.sysml.diagram.internalblock.tests.

  suites

 Bundle-Vendor: %providerName

 Fragment-Host: org.eclipse.papyrus.sysml.diagram.internalblock;bundle-

  version="1.0.0"

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/pom.xml b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/pom.xml
index 200a6d4f533..83c7c080c09 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/pom.xml
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.sysml.diagram.internalblock.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/META-INF/MANIFEST.MF
index f917380a340..df3540db67b 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.sysml.diagram.parametric.tests.sui

  tes

 Bundle-Vendor: %providerName

 Fragment-Host: org.eclipse.papyrus.sysml.diagram.parametric;bundle-ver

  sion="0.10.1"

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/pom.xml b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/pom.xml
index f225fac218e..cf2cc6c0572 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/pom.xml
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.sysml.diagram.parametric.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/META-INF/MANIFEST.MF
index 03cf71cf3b1..34b47b47a96 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/META-INF/MANIFEST.MF
@@ -1,30 +1,30 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.sysml.diagram.requirement;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml.diagram.requirement;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime;bundle-version="3.2.0",

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.sysml.diagram.requirement.test,

  org.eclipse.papyrus.sysml.diagram.requirement.test.canonical,

  org.eclipse.papyrus.sysml.diagram.requirement.test.load

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: SysML Requirements Diagram Tests

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.sysml.diagram.requirement.test.A

diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/pom.xml b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/pom.xml
index 4b29b9609f2..1f4021ae451 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/pom.xml
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.sysml.diagram.requirement.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF
index cc71393e5b8..11c4b19023a 100755
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.11.0",

  org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.8.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.sysml.nattable.allocation.tests,

  org.eclipse.papyrus.sysml.nattable.allocation.tests.tests

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/pom.xml b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/pom.xml
index aaaa84f910b..f1c82e515f7 100644
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/pom.xml
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.sysml.nattable.allocation.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF
index cab7d35d2f4..3011c2d8154 100644
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.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.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.junit,

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

  org.eclipse.emf.transaction,

- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.nattable.requirement;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.nattable.requirement.config;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.nattable.requirement;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.nattable.requirement.config;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.emf.core;bundle-version="1.7.0",

  org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.editor.integration.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor.integration.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.sysml.nattable.requirement.tests,

  org.eclipse.papyrus.sysml.nattable.requirement.tests.tests

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/pom.xml b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/pom.xml
index d2001bd9288..a873d647d68 100644
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/pom.xml
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.sysml.nattable.requirement.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/META-INF/MANIFEST.MF
index a638ccb6780..74692a46632 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/META-INF/MANIFEST.MF
@@ -5,21 +5,21 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.ide;bundle-version="3.8.0",

  org.eclipse.core.expressions;bundle-version="3.4.300",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="5.0.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.modelexplorer;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.modelexplorer;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.service.types;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.sysml.modelexplorer.tests,

  org.eclipse.papyrus.sysml.modelexplorer.tests.common,

  org.eclipse.papyrus.sysml.modelexplorer.tests.copypaste,

@@ -28,7 +28,7 @@ Export-Package: org.eclipse.papyrus.sysml.modelexplorer.tests,
  org.eclipse.papyrus.sysml.modelexplorer.tests.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/pom.xml b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/pom.xml
index 482db1605e4..541f454f426 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/pom.xml
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.sysml.modelexplorer.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF
index f13e14e22ec..2d0e89e61e3 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0

 Require-Bundle: org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.sysml.service.types.tests.suites

 Bundle-Vendor: %providerName

 Fragment-Host: org.eclipse.papyrus.sysml.service.types;bundle-version=

  "1.0.0"

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/pom.xml b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/pom.xml
index 1d27790f211..f0dc0c9b2bb 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/pom.xml
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.sysml.service.types.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/META-INF/MANIFEST.MF
index 1dce67060a6..1db17f873ad 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/META-INF/MANIFEST.MF
@@ -6,18 +6,18 @@ Export-Package: org.eclipse.papyrus.sysml.allocations.tests,
  org.eclipse.papyrus.sysml.tests,

  org.eclipse.papyrus.sysml.utils

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.sysml;bundle-version="1.0.1",

+ org.eclipse.papyrus.sysml;bundle-version="1.1.0",

  org.eclipse.emf.ecore,

  org.eclipse.uml2.uml,

  org.eclipse.emf.ecore.xmi,

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/pom.xml b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/pom.xml
index 03a8f72ac0a..8e2a25c83d1 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/pom.xml
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.sysml.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 50870692d90..94c8b3f53ae 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,27 +1,27 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime,

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

  org.eclipse.uml2.uml.editor,

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.activity.tests

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/pom.xml
index 14d0547e210..6d7225e42ee 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.activity.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 8991c541710..e9d34866f20 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
@@ -25,7 +25,8 @@ import org.junit.runners.Suite.SuiteClasses;
 TestActivityDiagramChildNode.class, 

 // TestActivityDiagramChildWithOtherCreationNode.class, 

 TestActivityChildNodeInStructuredActivity.class,

-TestActivityGroup.class

+TestActivityGroup.class,

+TestDropObjects.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/TestDropObjects.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestDropObjects.java
new file mode 100644
index 00000000000..398e1ace59c
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestDropObjects.java
@@ -0,0 +1,193 @@
+package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.requests.GroupRequest;
+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.tooling.runtime.update.DiagramUpdater;
+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.edit.parts.ExpansionNodeAsInEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ExpansionRegionEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ExpansionRegionStructuredActivityNodeContentCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants;
+import org.junit.Test;
+
+/**
+ * Testing drop action.
+ */
+public class TestDropObjects extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IActivityDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IActivityDiagramTestsConstants.FILE_NAME;
+	}
+
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.TYPED_INSTANCE;
+	}
+
+	/**
+	 * create childNodeEditPart in parentEditPart
+	 */
+	protected IGraphicalEditPart createChild(int childVID, IGraphicalEditPart container) {
+		final IElementType childType = UMLElementTypes.getElementType(childVID);
+		final CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(childType, container.getDiagramPreferencesHint());
+		requestcreation.setSize(new Dimension(1, 1));
+		requestcreation.setLocation(new Point(10, 10));
+		Command cmd = container.getCommand(requestcreation);
+		executeOnUIThread(cmd);
+		return findChildBySemanticHint(container, childVID);
+	}
+
+	private IGraphicalEditPart findChildBySemanticHint(IGraphicalEditPart parent, int vid) {
+		IGraphicalEditPart childEP = parent.getChildBySemanticHint(Integer.toString(vid));
+		assertNotNull("Parent " + parent + ", type " + parent.getNotationView() + " looking for: " + vid, childEP);
+		return childEP;
+	}
+
+	protected IGraphicalEditPart getActivityCompartmentEditPart() {
+		IGraphicalEditPart activityEP = findChildBySemanticHint(getDiagramEditPart(), ActivityEditPart.VISUAL_ID);
+		return findChildBySemanticHint(activityEP, ActivityActivityContentCompartmentEditPart.VISUAL_ID);
+	}
+	
+	@Test
+	public void testExpansionNodeInExpansionRegionCompartment() throws Exception {
+		IGraphicalEditPart regionEP = createChild(ExpansionRegionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		IGraphicalEditPart regionCompartmentEP = findChildBySemanticHint(regionEP, ExpansionRegionStructuredActivityNodeContentCompartmentEditPart.VISUAL_ID);
+		IGraphicalEditPart expansionNode = createChild(ExpansionNodeAsInEditPart.VISUAL_ID, regionEP);
+	
+		DropObjectSequence dropSeq = new DropObjectSequence(expansionNode, regionEP, regionCompartmentEP);
+		dropSeq.doSequence();
+	}
+	
+	/**
+	 * Sequence for manage and testing drop object action
+	 *
+	 */
+	public class DropObjectSequence {
+		
+		private final IGraphicalEditPart myChild;
+		
+		private final IGraphicalEditPart myParent;
+		
+		private final IGraphicalEditPart myDropParent;
+		
+		public DropObjectSequence(IGraphicalEditPart childEP, IGraphicalEditPart parentEP, IGraphicalEditPart dropParent) {
+			assertNotNull(childEP);
+			assertNotNull(parentEP);
+			assertNotNull(dropParent);
+			
+			myChild = childEP;
+			myParent = parentEP;
+			myDropParent = dropParent;
+			
+			assertNotEquals(myChild, myParent);
+			assertNotEquals(myChild, myDropParent);
+		}
+		
+		public void doSequence() {
+			testBeforeRemoveView();
+			EObject objectToDrop = doHideChild();
+			testHide();
+			IGraphicalEditPart newGrapticalChild = doDrop(objectToDrop);
+			testDrop(newGrapticalChild);
+		}
+		
+		protected void testBeforeRemoveView() {
+			testGraphicalEditParts((IGraphicalEditPart)getChildEP().getParent(), getParentEP());
+			
+			EObject childObject = getChildEP().resolveSemanticElement();
+			EObject parentObject = getParentEP().resolveSemanticElement();
+			
+			testSemantic(parentObject, childObject.eContainer());
+		}
+		
+		protected EObject doHideChild() {
+			EObject result = getChildEP().resolveSemanticElement();
+			Command deleteChild = getChildEP().getCommand(new GroupRequest(RequestConstants.REQ_DELETE));
+			assertTrue(deleteChild.canExecute());
+			executeOnUIThread(deleteChild);
+			return result;
+		}
+		
+		protected void testHide() {
+			List<?> childrenAfterHide = getParentEP().getChildren();
+			for (Object child : childrenAfterHide) {
+				assertNotEquals(child, getChildEP());
+			}
+		}
+		
+		private int getChildVID() {
+			return UMLVisualIDRegistry.getVisualID(getChildEP().getNotationView());
+		}
+		
+		protected IGraphicalEditPart doDrop(EObject objectToDrop) {
+			DropObjectsRequest req = createRequest(objectToDrop);
+			Command dropCommand = myDropParent.getCommand(req);
+			assertTrue(dropCommand.canExecute());
+			executeOnUIThread(dropCommand);
+			return findChildBySemanticHint(getParentEP(), getChildVID());
+		}
+		
+		private DropObjectsRequest createRequest(EObject objectToDrop) {
+			DropObjectsRequest result = new DropObjectsRequest();
+			result.setObjects(Arrays.asList(objectToDrop));
+			result.setType(org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants.REQ_DROP_OBJECTS);
+			result.setLocation(new Point(1, 1));
+			return result;
+		}
+		
+		protected void testDrop(IGraphicalEditPart childEP) {
+			testGraphicalEditParts((IGraphicalEditPart)childEP.getParent(), getParentEP());
+			
+			EObject childObject = childEP.resolveSemanticElement();
+			EObject parentObject = getParentEP().resolveSemanticElement();
+			
+			testSemantic(parentObject, childObject.eContainer());
+		}
+		
+		public final IGraphicalEditPart getChildEP() {
+			return myChild;
+		}
+		
+		public final IGraphicalEditPart getParentEP() {
+			return myParent;
+		}
+		
+		public final IGraphicalEditPart getDropParentEP() {
+			return myDropParent;
+		}
+		
+		protected void testSemantic(EObject parent, EObject expected) {
+			assertEquals(parent, expected);
+		}
+		
+		protected void testGraphicalEditParts(IGraphicalEditPart parent, IGraphicalEditPart expected) {
+			assertEquals(parent, expected);
+		}
+	}
+}
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 73cc49306e5..5b36dc60a6b 100644
--- 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,31 +1,31 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime,

  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="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.diagram.clazz.test.createFromPalette,

  org.eclipse.papyrus.uml.diagram.clazz.test,

  org.eclipse.papyrus.uml.diagram.clazz.test.canonical,

  org.eclipse.papyrus.uml.diagram.clazz.test.load

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/pom.xml
index ba275d0fdc8..cc5bba06570 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.clazz.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 caf1d69bdef..98bc603c03a 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
@@ -4,24 +4,24 @@ Require-Bundle: org.eclipse.ui,
  org.junit,

  org.eclipse.emf.transaction,

  org.eclipse.ui.ide,

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation.edit,

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.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.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.tests.Activat

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/pom.xml
index 374779af7f5..2ad1330f511 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.common.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 493ea5f1a07..68e24c2517b 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,26 +1,26 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime,

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.communication.tests,

  org.eclipse.papyrus.uml.diagram.communication.tests.canonical

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/pom.xml
index 4ddc5e0f1ae..ab477222030 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.communication.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 7df25fe3271..f7da0373cd8 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,27 +1,27 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.uml.diagram.component;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.component;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime,

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.component.test,

  org.eclipse.papyrus.uml.diagram.component.test.canonical,

  org.eclipse.papyrus.uml.diagram.component.test.load

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/pom.xml
index de58ab6c13e..f52982947b8 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.component.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 3f013619993..8f4561b94eb 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,26 +1,26 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime,

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.composite.test,

  org.eclipse.papyrus.uml.diagram.composite.test.canonical

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/pom.xml
index b918528873a..6f60d1e3e55 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.composite.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 2aab6971123..f621b8d3b70 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,27 +1,27 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.uml.diagram.deployment;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.deployment;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime,

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.deployment.test,

  org.eclipse.papyrus.uml.diagram.deployment.test.canonical,

  org.eclipse.papyrus.uml.diagram.deployment.test.load

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/pom.xml
index ad940120431..af4d671e54e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.deployment.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 41579608e8a..1768e73d1f6 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,27 +1,27 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.ui,

  org.eclipse.emf.ecore;bundle-version="2.8.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.dnd;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.dnd;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.dnd.tests.tests

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: DND Tests

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.dnd.tests.Activator

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/pom.xml
index ed90c50bcfc..5c1c73ed5e4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.dnd.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 3c9269f6050..cff9a9910ac 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,25 +1,25 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.diagram.interactionoverview;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.timing;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.interactionoverview;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.timing;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.2",

  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.0.1",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime,

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.interactionoverview.te

  sts

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: IODiagram Tests

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.interactionoverview.

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/pom.xml
index 2fb4501cd3c..a380b01172a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.interactionoverview.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF
index dcc57c606b2..bb2cc4e1a0b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF
@@ -1,23 +1,23 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.profile;bundle-version="1.0.1",

+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.profile;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime,

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.profile.tests

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Profile Diagram Tests

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.profile.tests.Activa

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/pom.xml
index ca6b0df3c3e..aa2281fb034 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.profile.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF
index 8da42f8bb61..2a3caa7714a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.junit;bundle-version="4.11.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.7.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.sequence;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.sequence;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.9.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.views.properties;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.sequence.tests

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.tests.Activ

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/pom.xml
index c2949900e98..fc09ac72925 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.sequence.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 84e335e8d1b..bd8f2f30168 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,26 +1,26 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime,

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.statemachine.tests,

  org.eclipse.papyrus.uml.diagram.statemachine.tests.canonical

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/pom.xml
index dd03a8e5a93..f18083adbef 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.statemachine.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 ba540b5d453..593004408bc 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,30 +1,30 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.stereotypeproperty

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/pom.xml
index d8fb97f9190..8503bb8ee32 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview.test/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview.test/META-INF/MANIFEST.MF
index a53e9bd51e4..d0bcb193259 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview.test/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

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 04d3f377579..71b0f1db975 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,35 +1,35 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.common.core,

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.profile;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.profile;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime,

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.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.edition

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/pom.xml
index 812facbf39b..6760aa2a03b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 7e28f48f0b1..1ce54a0efec 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,25 +1,25 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.timing;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.timing;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.4.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.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="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.timing.tests

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Papyrus Timing Diagram Tests

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.timing.tests.Activat

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/pom.xml
index c17dfa80fb4..bc972a515c3 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.timing.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 e1543c40cd4..080d0e2d885 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
@@ -74,6 +74,7 @@ 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;

@@ -82,7 +83,6 @@ 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.command.wrappers.GEFtoEMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand;

 import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;

 import org.eclipse.swt.SWT;

@@ -142,7 +142,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 

 			@Override

 			public void historyNotification(final OperationHistoryEvent event) {

-				if(event.getEventType() == OperationHistoryEvent.OPERATION_NOT_OK) {

+				if (event.getEventType() == OperationHistoryEvent.OPERATION_NOT_OK) {

 					AbstractPapyrusTestCase.this.operationFailed = true;

 				}

 			}

@@ -172,9 +172,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	}

 

 	/**

-	 * Asserts that no Command executed on the {@link IOperationHistory} since the last call to

-	 * {@link AbstractPapyrusTestCase#resetLastOperationFailedState resetLastOperationFailedState} returned

-	 * {@link OperationHistoryEvent#OPERATION_NOT_OK}.

+	 * 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() {

@@ -186,7 +184,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	}

 

 	protected Element getRootSemanticModel() {

-		return (Element)getRootView().getElement();

+		return (Element) getRootView().getElement();

 	}

 

 	protected UmlGmfDiagramEditor getDiagramEditor() {

@@ -202,9 +200,9 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	}

 

 	protected DiagramEditPart getDiagramEditPart() {

-		if(this.diagramEditPart == null) {

-			this.diagramEditor = (UmlGmfDiagramEditor)this.papyrusEditor.getActiveEditor();

-			this.diagramEditPart = (DiagramEditPart)this.papyrusEditor.getAdapter(DiagramEditPart.class);

+		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);

@@ -221,11 +219,11 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 		this.diResourceSet = new DiResourceSet();

 

 		// at this point, no resources have been created

-		if(this.file.exists()) {

+		if (this.file.exists()) {

 			this.file.delete(true, new NullProgressMonitor());

 		}

 

-		if(!this.file.exists()) {

+		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);

@@ -234,10 +232,10 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 			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.add(ModelSet.class, Integer.MAX_VALUE, diResourceSet); // High priority to override all contributions

 				registry.startRegistry();

 			} catch (ServiceException ex) {

-				//Ignore exceptions

+				// Ignore exceptions

 			}

 			// diResourceSet.createsModels(file);

 			final ICreationCommand command = getDiagramCommandCreation();

@@ -247,26 +245,26 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 		}

 		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);

+		this.papyrusEditor = ((PapyrusMultiDiagramEditor) _editor);

 		flushEventLoop();

 	}

 

 	protected static void maximize() {

-		//		PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell().setMaximized(true);

+		// 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);

-		//			}

-		//		}

+		// 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);

+		// }

+		// }

 	}

 

 	/**

@@ -279,9 +277,9 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * </ul>

 	 *

 	 * @param elementType

-	 *        the type for which to create a view (and possibly a model element)

+	 *            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

+	 *            the edit part to which the creation request must be sent

 	 * @return the created View

 	 */

 	protected View createView(final IElementType elementType, final EditPart parentEditPart) {

@@ -298,13 +296,13 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * </ul>

 	 *

 	 * @param elementType

-	 *        the type for which to create a view (and possibly a model element)

+	 *            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>)

+	 *            the position of the new view (may be <code>null</code>)

 	 * @param size

-	 *        the size of the new view (may be <code>null</code>)

+	 *            the size of the new view (may be <code>null</code>)

 	 * @param parentEditPart

-	 *        the edit part to which the creation request must be sent

+	 *            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) {

@@ -314,10 +312,10 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 			@Override

 			public void run() {

 				final CreateViewRequest createRequest = CreateViewRequestFactory.getCreateShapeRequest(elementType, getDiagramEditPart().getDiagramPreferencesHint());

-				if(size != null) {

+				if (size != null) {

 					createRequest.setSize(size);

 				}

-				if(location != null) {

+				if (location != null) {

 					createRequest.setLocation(location);

 				}

 				final Command command = parentEditPart.getCommand(createRequest);

@@ -335,10 +333,10 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 		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) {

+		if (returnValue instanceof IAdaptable) {

+			final IAdaptable adaptableResult = (IAdaptable) returnValue;

+			final View view = (View) adaptableResult.getAdapter(View.class);

+			if (view != null) {

 				return view;

 			}

 		}

@@ -347,37 +345,37 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	}

 

 	private static void findNestedCreateCommands(final Command gefCommand, final List<CreateCommand> createCommands) {

-		if(gefCommand instanceof CompoundCommand) {

-			final CompoundCommand compoundCommand = (CompoundCommand)gefCommand;

+		if (gefCommand instanceof CompoundCommand) {

+			final CompoundCommand compoundCommand = (CompoundCommand) gefCommand;

 			@SuppressWarnings("unchecked")

 			final List<Command> commands = compoundCommand.getCommands();

-			for(final Command childCommand : commands) {

+			for (final Command childCommand : commands) {

 				findNestedCreateCommands(childCommand, createCommands);

 			}

-		} else if(gefCommand instanceof ICommandProxy) {

-			final ICommandProxy commandProxy = (ICommandProxy)gefCommand;

+		} 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;

+		if (gmfCommand instanceof CompositeCommand) {

+			final CompositeCommand compositeCommand = (CompositeCommand) gmfCommand;

 			final Iterator<?> iterator = compositeCommand.iterator();

-			while(iterator.hasNext()) {

+			while (iterator.hasNext()) {

 				final Object element = iterator.next();

-				if(element instanceof ICommand) {

-					final ICommand subCommand = (ICommand)element;

+				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;

+		} else if (gmfCommand instanceof CreateCommand) {

+			createCommands.add((CreateCommand) gmfCommand);

+		} else if (gmfCommand instanceof CommandProxy) {

+			final CommandProxy commandProxy = (CommandProxy) gmfCommand;

 			findNestedCreateCommands(commandProxy.getCommand(), createCommands);

 		}

 	}

@@ -389,7 +387,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	protected void testHide(final GraphicalEditPart editPart) {

 		final EditPart parent = editPart.getParent();

 		final int sizeBefore = parent.getChildren().size();

-		final EObject semanticElement = ((View)editPart.getModel()).getElement();

+		final EObject semanticElement = ((View) editPart.getModel()).getElement();

 		assertTrue("The semantic element should be in a Model", isInModel(semanticElement));

 

 		executeHideCommand(editPart);

@@ -407,7 +405,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Send the given EditPart a "delete" request (which only deletes the View), and execute the returned command.

 	 *

 	 * @param editPart

-	 *        the EditPart to hide

+	 *            the EditPart to hide

 	 */

 	protected void executeHideCommand(final GraphicalEditPart editPart) {

 		final GroupRequest deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

@@ -421,7 +419,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	protected void testDelete(final GraphicalEditPart editPart) {

 		final EditPart parent = editPart.getParent();

 		final int sizeBefore = parent.getChildren().size();

-		final EObject semanticElement = ((View)editPart.getModel()).getElement();

+		final EObject semanticElement = ((View) editPart.getModel()).getElement();

 		assertTrue("The semantic element should be in a Model", isInModel(semanticElement));

 

 		executeDestroyCommand(editPart);

@@ -439,7 +437,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Send the given EditPart a {@link DestroyElementRequest}, and execute the returned command.

 	 *

 	 * @param editPart

-	 *        the EditPart to destroy

+	 *            the EditPart to destroy

 	 */

 	protected void executeDestroyCommand(final GraphicalEditPart editPart) {

 		final Request destroyElementRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));

@@ -450,12 +448,12 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 

 	/**

 	 * @param targetEditPart

-	 *        the EditPart on top of which the drop will happen. This will determine the coordinates of the drop.

+	 *            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.

+	 *            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

+	 *            the element to drop

 	 */

 	public void testDrop(final GraphicalEditPart targetEditPart, final GraphicalEditPart parentEditPart, final EObject droppedElement) {

 		final int sizeBefore = parentEditPart.getChildren().size();

@@ -483,8 +481,8 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 */

 	protected static boolean isInModel(final EObject semanticElement) {

 		EObject parent = semanticElement.eContainer();

-		while(parent != null) {

-			if(parent instanceof Model) {

+		while (parent != null) {

+			if (parent instanceof Model) {

 				return true;

 			}

 			parent = parent.eContainer();

@@ -636,9 +634,9 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * accept the changes.

 	 *

 	 * @param editPart

-	 *        the edit part on which to perform the DirectEditRequest.

+	 *            the edit part on which to perform the DirectEditRequest.

 	 * @param newName

-	 *        the name to set

+	 *            the name to set

 	 */

 	protected void setNameWithDirectEditRequest(final GraphicalEditPart editPart, final String newName) {

 		final IFigure nameFigure = editPart.getFigure();

@@ -686,9 +684,9 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * 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

+	 *            the id of the tool to click

 	 * @param target

-	 *        what to click

+	 *            what to click

 	 */

 	protected void clickTool(final String toolId, final GraphicalEditPart target) {

 		final Point point = getCenterPoint(target);

@@ -699,9 +697,9 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Click the palette tool with the given id at the given location.

 	 *

 	 * @param toolId

-	 *        the id of the tool to click

+	 *            the id of the tool to click

 	 * @param point

-	 *        where to click

+	 *            where to click

 	 */

 	protected void clickTool(final String toolId, final Point point) {

 		final Tool tool = createTool(toolId);

@@ -737,7 +735,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	}

 

 	private Tool createTool(final String toolId) {

-		final PaletteViewer paletteViewer = ((EditDomain)this.diagramEditor.getDiagramEditDomain()).getPaletteViewer();

+		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();

@@ -754,30 +752,30 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 

 	protected void initializeTool(final Tool tool) {

 		tool.setViewer(this.diagramEditor.getDiagramGraphicalViewer());

-		tool.setEditDomain((EditDomain)this.diagramEditor.getDiagramEditDomain());

+		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

+	 *            the id of the tool to return

 	 * @param paletteContainer

-	 *        the palette root

+	 *            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;

+		for (final Object child : children) {

+			if (child instanceof PaletteContainer) {

+				final PaletteContainer childContainer = (PaletteContainer) child;

 				final ToolEntry subresult = findToolEntry(toolId, childContainer);

-				if(subresult != null) {

+				if (subresult != null) {

 					return subresult;

 				}

-			} else if(child instanceof ToolEntry) {

-				final ToolEntry toolEntry = (ToolEntry)child;

-				if(toolId.equals(toolEntry.getId())) {

+			} else if (child instanceof ToolEntry) {

+				final ToolEntry toolEntry = (ToolEntry) child;

+				if (toolId.equals(toolEntry.getId())) {

 					return toolEntry;

 				}

 			}

@@ -823,7 +821,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 

 			@Override

 			public void run() {

-				final Composite composite = (Composite)getDiagramEditor().getDiagramGraphicalViewer().getControl();

+				final Composite composite = (Composite) getDiagramEditor().getDiagramGraphicalViewer().getControl();

 				result[0] = findVisibleTextWidget(composite);

 			}

 		});

@@ -833,16 +831,16 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	/** 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()) {

+		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;

+			} else if (child instanceof Composite) {

+				final Composite childComposite = (Composite) child;

 				final Text subresult = findVisibleTextWidget(childComposite);

-				if(subresult != null) {

+				if (subresult != null) {

 					return subresult;

 				}

 			}

@@ -855,13 +853,13 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * in the viewer's visual part map.

 	 *

 	 * @param view

-	 *        the view for which to find a corresponding EditPart

+	 *            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;

+		return (EditPart) result;

 	}

 

 	/** Processes all events waiting in the Display's event loop and then returns. */

@@ -872,11 +870,11 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 			@Override

 			public void run() {

 				try {

-					while(display.readAndDispatch()) {

+					while (display.readAndDispatch()) {

 						// nothing

 					}

 				} catch (Exception ex) {

-					//Do not fail the test for invalid runnables

+					// Do not fail the test for invalid runnables

 				}

 			}

 		});

@@ -886,11 +884,11 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Move the given EditPart in its parent.

 	 *

 	 * @param editPartToMove

-	 *        the EditPart to move

+	 *            the EditPart to move

 	 * @param parentEditPart

-	 *        the parent

+	 *            the parent

 	 * @param moveDelta

-	 *        the offset

+	 *            the offset

 	 */

 	protected void moveEditPart(final GraphicalEditPart editPartToMove, final GraphicalEditPart parentEditPart, final Point moveDelta) {

 		moveEditParts(Collections.singletonList(editPartToMove), parentEditPart, moveDelta);

@@ -900,13 +898,13 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Resize the given EditPart in its parent.

 	 *

 	 * @param editPartToResize

-	 *        the EditPart to resize

+	 *            the EditPart to resize

 	 * @param parentEditPart

-	 *        the parent

+	 *            the parent

 	 * @param resizeDelta

-	 *        the size offset

+	 *            the size offset

 	 * @param direction

-	 *        the direction to resize (cf {@link PositionConstants})

+	 *            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);

@@ -916,14 +914,14 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Move the given EditParts in their parent.

 	 *

 	 * @param editPartsToMove

-	 *        the EditParts to move

+	 *            the EditParts to move

 	 * @param parentEditPart

-	 *        the parent

+	 *            the parent

 	 * @param moveDelta

-	 *        the location offset

+	 *            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) {

+		if (editPartsToMove.size() < 1 || parentEditPart == null || moveDelta == null) {

 			throw new IllegalArgumentException();

 		}

 		final ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest();

@@ -942,16 +940,16 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Resize the given EditParts in their parent.

 	 *

 	 * @param editPartsToMove

-	 *        the EditParts to resize

+	 *            the EditParts to resize

 	 * @param parentEditPart

-	 *        the parent

+	 *            the parent

 	 * @param resizeDelta

-	 *        the size offset

+	 *            the size offset

 	 * @param direction

-	 *        the direction to resize (cf {@link PositionConstants})

+	 *            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) {

+		if (editPartsToResize.size() < 1 || parentEditPart == null || resizeDelta == null) {

 			throw new IllegalArgumentException();

 		}

 		final ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest();

@@ -972,9 +970,9 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * given translation vector.

 	 *

 	 * @param graphicalEditPart

-	 *        the EditPart being dragged

+	 *            the EditPart being dragged

 	 * @param moveDelta

-	 *        the offset (the translation vector)

+	 *            the offset (the translation vector)

 	 * @return the target Location

 	 */

 	private static Point computeLocationWithDelta(final GraphicalEditPart graphicalEditPart, final Point moveDelta) {

@@ -1004,9 +1002,9 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * moved/resized before calling this method).

 	 *

 	 * @param editPart

-	 *        an EditPart that was just moved/resized

+	 *            an EditPart that was just moved/resized

 	 * @param boundsBefore

-	 *        the bounds of this EditPart before it was moved/resized

+	 *            the bounds of this EditPart before it was moved/resized

 	 */

 	protected void testUndoRedoChangeBoundsEditPart(final GraphicalEditPart editPart, final Rectangle boundsBefore) {

 		final Rectangle boundsAfter = getBounds(editPart);

@@ -1028,19 +1026,19 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Check the bounds of the given GraphicalEditPart's Figure

 	 *

 	 * @param graphicalEditPart

-	 *        The EditPart whose Figure's bounds to check

+	 *            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)

+	 *            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)

+	 *            the expected size (-1 for any of the coordinates means not to check this coordinate)

 	 * @param xErrorMargin

-	 *        an error margin for the horizontal position

+	 *            an error margin for the horizontal position

 	 * @param yErrorMargin

-	 *        an error margin for the vertical position

+	 *            an error margin for the vertical position

 	 * @param widthErrorMargin

-	 *        an error margin for the width

+	 *            an error margin for the width

 	 * @param heightErrorMargin

-	 *        an error margin for the height

+	 *            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);

@@ -1050,32 +1048,32 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Check the bounds of the given GraphicalEditPart's Figure

 	 *

 	 * @param graphicalEditPart

-	 *        The EditPart whose Figure's bounds to check

+	 *            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)

+	 *            the expected bounds (-1 for any of the coordinates means not to check this coordinate)

 	 * @param xErrorMargin

-	 *        an error margin for the horizontal position

+	 *            an error margin for the horizontal position

 	 * @param yErrorMargin

-	 *        an error margin for the vertical position

+	 *            an error margin for the vertical position

 	 * @param widthErrorMargin

-	 *        an error margin for the width

+	 *            an error margin for the width

 	 * @param heightErrorMargin

-	 *        an error margin for the height

+	 *            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) {

+		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) {

+		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) {

+		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) {

+		if (expectedBounds.y != -1) {

 			assertTrue("The element should have a vertical position at about " + expectedBounds.y + " pixels", Math.abs(bounds.y - expectedBounds.y) <= yErrorMargin);

 		}

 	}

@@ -1084,17 +1082,17 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * 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

+	 *            the EditPart in which the EditPart we are looking for should be found

 	 * @param view

-	 *        the View corresponding to the searched EditPart

+	 *            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()) {

+		for (final EditPart editPart : children) {

+			if (view == editPart.getModel()) {

 				result = editPart;

 			}

 		}

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 5e340135882..d921a6b17cf 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
@@ -3,26 +3,26 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

  org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.editor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.editor;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.usecase;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.usecase;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

  org.eclipse.gmf.tooling.runtime

 Export-Package: org.eclipse.papyrus.uml.diagram.usecase.tests

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/pom.xml
index 69e34307bc2..d7d212680b2 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.usecase.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 13a0ed404d3..ea6915851c2 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,20 +1,20 @@
 Manifest-Version: 1.0

 Require-Bundle: org.junit;bundle-version="4.8.1",

  org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.diagram.profile;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.diagram.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.diagram.profile;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.diagram.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.1.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="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.wizards

 Bundle-Vendor: %providerName

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/pom.xml
index 528a878aed4..a267ac3ca96 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.wizards.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 160059970f9..fb5cd50b6c3 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,30 +1,30 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.emf.ecore,

  org.eclipse.uml2.uml;bundle-version="4.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="1.0.1",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.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.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation.edit,

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.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.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/pom.xml b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/pom.xml
index 88894018a61..3ecc1bc1bf9 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/pom.xml
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.modelexplorer.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF
index a5501283844..08e0c266f25 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.11.0",

  org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",

  org.eclipse.emf.ecore,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui,

  org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

  org.eclipse.emf.common,

- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"

+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.nattable.generic.tests.tests

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml
index dc8a3b1c6b3..68298009939 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.nattable.generic.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF
index 9bb88f01a8e..3530cdc8a3f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF
@@ -3,19 +3,19 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

  org.junit;bundle-version="4.11.0",

  org.eclipse.uml2.uml,

- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.nattable;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.nattable;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.nattable.tests,

  org.eclipse.papyrus.uml.nattable.tests.tests

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.nattable.tests.Activator

diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/pom.xml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/pom.xml
index dc19dffc366..62340cea640 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/pom.xml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.nattable.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/META-INF/MANIFEST.MF
index ae20df172dd..33575dd7c63 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="3.8.0",
 Export-Package: org.eclipse.papyrus.search.tests.suites

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/pom.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/pom.xml
index c1a303737c4..5885b806c34 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/pom.xml
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.search.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 5fd82ef164f..317d5219906 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,13 +1,13 @@
 Manifest-Version: 1.0

 Require-Bundle: org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.modelrepair.internal.stereotypes,

  org.eclipse.papyrus.uml.modelrepair.tests

 Bundle-Vendor: %providerName

 Fragment-Host: org.eclipse.papyrus.uml.modelrepair;bundle-version="1.0

  .0"

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: fragment

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/pom.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/pom.xml
index d9f86ffdc03..4925aa202d8 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/pom.xml
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.modelrepair.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model-with-stylesheet.di b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model-with-stylesheet.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model-with-stylesheet.di
@@ -0,0 +1,2 @@
+<?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.modelrepair.tests/resources/regression/bug436666/model-with-stylesheet.notation b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model-with-stylesheet.notation
new file mode 100644
index 00000000000..571dd203d43
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model-with-stylesheet.notation
@@ -0,0 +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="_eU4Q8Tg8EeSUs8U9fXt57A" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_fkUfkDg8EeSUs8U9fXt57A" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_fkUfkjg8EeSUs8U9fXt57A" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_fkUfkzg8EeSUs8U9fXt57A" type="7017">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_fkUflDg8EeSUs8U9fXt57A"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_fkUflTg8EeSUs8U9fXt57A"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_fkUfljg8EeSUs8U9fXt57A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fkUflzg8EeSUs8U9fXt57A"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_fkUfmDg8EeSUs8U9fXt57A" type="7018">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_fkUfmTg8EeSUs8U9fXt57A"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_fkUfmjg8EeSUs8U9fXt57A"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_fkUfmzg8EeSUs8U9fXt57A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fkUfnDg8EeSUs8U9fXt57A"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_fkUfnTg8EeSUs8U9fXt57A" type="7019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_fkUfnjg8EeSUs8U9fXt57A"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_fkUfnzg8EeSUs8U9fXt57A"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_fkUfoDg8EeSUs8U9fXt57A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fkUfoTg8EeSUs8U9fXt57A"/>
+    </children>
+    <element xmi:type="uml:Class" href="model-with-stylesheet.uml#_fkKukDg8EeSUs8U9fXt57A"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fkUfkTg8EeSUs8U9fXt57A" x="450" y="229"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_eU4Q8jg8EeSUs8U9fXt57A" name="diagram_compatibility_version" stringValue="1.0.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_eU4Q8zg8EeSUs8U9fXt57A"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_eU4Q9Dg8EeSUs8U9fXt57A">
+    <owner xmi:type="uml:Model" href="model-with-stylesheet.uml#_eU4Q8Dg8EeSUs8U9fXt57A"/>
+  </styles>
+  <element xmi:type="uml:Model" href="model-with-stylesheet.uml#_eU4Q8Dg8EeSUs8U9fXt57A"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model-with-stylesheet.uml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model-with-stylesheet.uml
new file mode 100644
index 00000000000..f9d80141fe5
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model-with-stylesheet.uml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <uml:Model xmi:id="_eU4Q8Dg8EeSUs8U9fXt57A" name="model">
+    <packagedElement xmi:type="uml:Class" xmi:id="_fkKukDg8EeSUs8U9fXt57A" name="Class1"/>
+  </uml:Model>
+  <css:ModelStyleSheets xmi:id="_gHbzsDg8EeSUs8U9fXt57A">
+    <stylesheets xmi:type="css:EmbeddedStyleSheet" xmi:id="_ix7EADg8EeSUs8U9fXt57A" label="Embedded" content="* {&#xD;&#xA;&#x9;bold: true;&#xD;&#xA;}"/>
+  </css:ModelStyleSheets>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model.profile.di b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model.profile.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model.profile.di
@@ -0,0 +1,2 @@
+<?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.modelrepair.tests/resources/regression/bug436666/model.profile.notation b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model.profile.notation
new file mode 100644
index 00000000000..99927e00f11
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model.profile.notation
@@ -0,0 +1,231 @@
+<?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="_iGBGQDf6EeS08JDbYjJccA" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_oQr4wDf6EeS08JDbYjJccA" type="1030">
+    <children xmi:type="notation:DecorationNode" xmi:id="_oQtG4Df6EeS08JDbYjJccA" type="1047"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_oQtG4Tf6EeS08JDbYjJccA" type="1042">
+      <children xmi:type="notation:Shape" xmi:id="_pb6VwDf6EeS08JDbYjJccA" type="1023">
+        <children xmi:type="notation:DecorationNode" xmi:id="_pb680Df6EeS08JDbYjJccA" type="1046"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_pb680Tf6EeS08JDbYjJccA" type="1052">
+          <children xmi:type="notation:Node" xmi:id="_S7WmMDg3EeS5ZcmG-RC5ow" type="3002">
+            <element xmi:type="uml:Property" href="model.profile.uml#_S6Py8Dg3EeS5ZcmG-RC5ow"/>
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_S7WmMTg3EeS5ZcmG-RC5ow"/>
+          </children>
+          <styles xmi:type="notation:TitleStyle" xmi:id="_pb680jf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_pb680zf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_pb681Df6EeS08JDbYjJccA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pb681Tf6EeS08JDbYjJccA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_pb681jf6EeS08JDbYjJccA" type="1053">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_pb681zf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_pb682Df6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_pb682Tf6EeS08JDbYjJccA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pb682jf6EeS08JDbYjJccA"/>
+        </children>
+        <element xmi:type="uml:Stereotype" href="model.profile.uml#_pb35gDf6EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pb6VwTf6EeS08JDbYjJccA" x="83" y="38"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_phGXwDf6EeS08JDbYjJccA" type="1023">
+        <children xmi:type="notation:DecorationNode" xmi:id="_phG-0Df6EeS08JDbYjJccA" type="1046"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_phG-0Tf6EeS08JDbYjJccA" type="1052">
+          <children xmi:type="notation:Node" xmi:id="_gKlnoDg3EeS5ZcmG-RC5ow" type="3002">
+            <element xmi:type="uml:Property" href="model.profile.uml#_gKkZgDg3EeS5ZcmG-RC5ow"/>
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_gKlnoTg3EeS5ZcmG-RC5ow"/>
+          </children>
+          <styles xmi:type="notation:TitleStyle" xmi:id="_phG-0jf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_phG-0zf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_phG-1Df6EeS08JDbYjJccA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_phG-1Tf6EeS08JDbYjJccA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_phHl4Df6EeS08JDbYjJccA" type="1053">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_phHl4Tf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_phHl4jf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_phHl4zf6EeS08JDbYjJccA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_phHl5Df6EeS08JDbYjJccA"/>
+        </children>
+        <element xmi:type="uml:Stereotype" href="model.profile.uml#_phD7gDf6EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_phGXwTf6EeS08JDbYjJccA" x="355" y="38"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_oQtG4jf6EeS08JDbYjJccA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oQtG4zf6EeS08JDbYjJccA"/>
+    </children>
+    <element xmi:type="uml:Profile" href="model.profile.uml#_oQSQIDf6EeS08JDbYjJccA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oQr4wTf6EeS08JDbYjJccA" x="753" y="267" width="551" height="248"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_ovG6IDf6EeS08JDbYjJccA" type="2007">
+    <children xmi:type="notation:DecorationNode" xmi:id="_ovHhMDf6EeS08JDbYjJccA" type="5026"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_ovHhMTf6EeS08JDbYjJccA" type="1005">
+      <children xmi:type="notation:Shape" xmi:id="_pMNs4Df6EeS08JDbYjJccA" type="1023">
+        <children xmi:type="notation:DecorationNode" xmi:id="_pMOT8Df6EeS08JDbYjJccA" type="1046"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_pMQwMDf6EeS08JDbYjJccA" type="1052">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_pMQwMTf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_pMQwMjf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_pMQwMzf6EeS08JDbYjJccA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pMQwNDf6EeS08JDbYjJccA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_pMQwNTf6EeS08JDbYjJccA" type="1053">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_pMQwNjf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_pMQwNzf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_pMQwODf6EeS08JDbYjJccA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pMQwOTf6EeS08JDbYjJccA"/>
+        </children>
+        <element xmi:type="uml:Stereotype" href="model.profile.uml#_pMKpkDf6EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pMNs4Tf6EeS08JDbYjJccA" x="51" y="40"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_pV7pkDf6EeS08JDbYjJccA" type="1023">
+        <children xmi:type="notation:DecorationNode" xmi:id="_pV7pkjf6EeS08JDbYjJccA" type="1046"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_pV8QoDf6EeS08JDbYjJccA" type="1052">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_pV8QoTf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_pV8Qojf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_pV8Qozf6EeS08JDbYjJccA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pV8QpDf6EeS08JDbYjJccA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_pV8QpTf6EeS08JDbYjJccA" type="1053">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_pV8Qpjf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_pV8Qpzf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_pV8QqDf6EeS08JDbYjJccA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pV8QqTf6EeS08JDbYjJccA"/>
+        </children>
+        <element xmi:type="uml:Stereotype" href="model.profile.uml#_pV5NUDf6EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pV7pkTf6EeS08JDbYjJccA" x="257" y="53"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ovHhMjf6EeS08JDbYjJccA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ovHhMzf6EeS08JDbYjJccA"/>
+    </children>
+    <element xmi:type="uml:Package" href="model.profile.uml#_ouPXcDf6EeS08JDbYjJccA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ovG6ITf6EeS08JDbYjJccA" x="145" y="228" width="443" height="251"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_t8jPYDf6EeS08JDbYjJccA" type="1031">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t8lroDf6EeS08JDbYjJccA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8lroTf6EeS08JDbYjJccA" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8mSsDf6EeS08JDbYjJccA" key="StereotypeList" value="StandardProfile::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8mSsTf6EeS08JDbYjJccA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8mSsjf6EeS08JDbYjJccA" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8m5wDf6EeS08JDbYjJccA" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_t8j2cDf6EeS08JDbYjJccA" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8j2cTf6EeS08JDbYjJccA" x="1137" y="113"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_t8ng0Df6EeS08JDbYjJccA" type="1031">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t8ou8Df6EeS08JDbYjJccA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8pWADf6EeS08JDbYjJccA" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8pWATf6EeS08JDbYjJccA" key="StereotypeList" value="StandardProfile::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8p9EDf6EeS08JDbYjJccA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8p9ETf6EeS08JDbYjJccA" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8p9Ejf6EeS08JDbYjJccA" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_t8oH4Df6EeS08JDbYjJccA" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8oH4Tf6EeS08JDbYjJccA" x="1137" y="193"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_yIfrYjf6EeS08JDbYjJccA" type="1031">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yIpcYDf6EeS08JDbYjJccA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcYTf6EeS08JDbYjJccA" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcYjf6EeS08JDbYjJccA" key="StereotypeList" value="StandardProfile::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcYzf6EeS08JDbYjJccA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcZDf6EeS08JDbYjJccA" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcZTf6EeS08JDbYjJccA" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_yIfrZDf6EeS08JDbYjJccA" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Artifact"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yIfrZTf6EeS08JDbYjJccA" x="736" y="84"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_yIpcZjf6EeS08JDbYjJccA" type="1031">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yIpcajf6EeS08JDbYjJccA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcazf6EeS08JDbYjJccA" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcbDf6EeS08JDbYjJccA" key="StereotypeList" value="StandardProfile::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcbTf6EeS08JDbYjJccA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcbjf6EeS08JDbYjJccA" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcbzf6EeS08JDbYjJccA" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_yIpcaDf6EeS08JDbYjJccA" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#StructuredClassifier"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yIpcaTf6EeS08JDbYjJccA" x="736" y="164"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_iGBGQTf6EeS08JDbYjJccA" name="diagram_compatibility_version" stringValue="1.0.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_iGBGQjf6EeS08JDbYjJccA"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_iGBGQzf6EeS08JDbYjJccA">
+    <owner xmi:type="uml:Profile" href="model.profile.uml#_h-wAoDf6EeS08JDbYjJccA"/>
+  </styles>
+  <element xmi:type="uml:Profile" href="model.profile.uml#_h-wAoDf6EeS08JDbYjJccA"/>
+  <edges xmi:type="notation:Connector" xmi:id="_qg19gDf6EeS08JDbYjJccA" type="4002" source="_phGXwDf6EeS08JDbYjJccA" target="_pb6VwDf6EeS08JDbYjJccA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_qg2kkDf6EeS08JDbYjJccA" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_qg3LoDf6EeS08JDbYjJccA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_qg19gTf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Generalization" href="model.profile.uml#_qeqMMDf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qg19gjf6EeS08JDbYjJccA" points="[-50, -8, 225, 5]$[-325, -8, -50, 5]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_zgxs8Df6EeS08JDbYjJccA" type="1013" source="_pb6VwDf6EeS08JDbYjJccA" target="_t8ng0Df6EeS08JDbYjJccA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_zg7d8Df6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_zgeyATf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zg7d8Tf6EeS08JDbYjJccA" points="[50, -29, -246, 151]$[298, -155, 2, 25]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_z2W7Yzf6EeS08JDbYjJccA" type="1013" source="_phGXwDf6EeS08JDbYjJccA" target="_t8jPYDf6EeS08JDbYjJccA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_z2W7ZDf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_z2W7YTf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_z2W7ZTf6EeS08JDbYjJccA" points="[50, -20, 40, 258]$[300, -120, 290, 158]$[74, -244, 64, 34]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z2gsYDf6EeS08JDbYjJccA" id="(0.36,0.14)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_0ZNJwDf6EeS08JDbYjJccA" type="1013" source="_pb6VwDf6EeS08JDbYjJccA" target="_t8jPYDf6EeS08JDbYjJccA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_0ZNJwTf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_0ZDYwTf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0ZNJwjf6EeS08JDbYjJccA" points="[37, -28, -294, 210]$[323, -263, -8, -25]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0ZNJwzf6EeS08JDbYjJccA" id="(0.15,0.28)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_06tUUTf6EeS08JDbYjJccA" type="4002" source="_pMNs4Df6EeS08JDbYjJccA" target="_pb6VwDf6EeS08JDbYjJccA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_06tUVDf6EeS08JDbYjJccA" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_06tUVTf6EeS08JDbYjJccA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_06tUUjf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Generalization" href="model.profile.uml#_06tUUDf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_06tUUzf6EeS08JDbYjJccA" points="[19, 10, -602, -26]$[178, 101, -443, 65]$[559, 45, -62, 9]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d0lZkDg3EeS5ZcmG-RC5ow" id="(0.81,0.63)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_1IsF8Df6EeS08JDbYjJccA" type="4002" source="_pV7pkDf6EeS08JDbYjJccA" target="_phGXwDf6EeS08JDbYjJccA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_1IsF8zf6EeS08JDbYjJccA" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_1IsF9Df6EeS08JDbYjJccA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_1IsF8Tf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Generalization" href="model.profile.uml#_1IiU8Df6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1IsF8jf6EeS08JDbYjJccA" points="[45, 24, -691, -25]$[559, 293, -177, 244]$[725, 64, -11, 15]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1IsF9Tf6EeS08JDbYjJccA" id="(0.15,0.76)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1IsF9jf6EeS08JDbYjJccA" id="(0.45,0.85)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_10lioTf6EeS08JDbYjJccA" type="4002" source="_pMNs4Df6EeS08JDbYjJccA" target="_pV7pkDf6EeS08JDbYjJccA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_10vToDf6EeS08JDbYjJccA" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_10vToTf6EeS08JDbYjJccA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_10liojf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Generalization" href="model.profile.uml#_10lioDf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_10liozf6EeS08JDbYjJccA" points="[50, 3, -194, -16]$[256, 20, 12, 1]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_10vTojf6EeS08JDbYjJccA" id="(0.88,0.56)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_2US9czf6EeS08JDbYjJccA" type="1013" source="_pMNs4Df6EeS08JDbYjJccA" target="_yIfrYjf6EeS08JDbYjJccA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_2US9dDf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_2US9cTf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2US9dTf6EeS08JDbYjJccA" points="[86, -35, -489, 186]$[525, -227, -50, -6]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2UcHYDf6EeS08JDbYjJccA" id="(0.1,0.35)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_2hY-Qzf6EeS08JDbYjJccA" type="1013" source="_pMNs4Df6EeS08JDbYjJccA" target="_yIpcZjf6EeS08JDbYjJccA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_2hY-RDf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_2hY-QTf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2hY-RTf6EeS08JDbYjJccA" points="[50, -14, -520, 141]$[590, -155, 20, 0]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2hiIMDf6EeS08JDbYjJccA" id="(0.8095238095238095,0.52)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_2x5fcDf6EeS08JDbYjJccA" type="1013" source="_pMNs4Df6EeS08JDbYjJccA" target="_t8jPYDf6EeS08JDbYjJccA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_2x5fcTf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_2xwVgTf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2x5fcjf6EeS08JDbYjJccA" points="[50, -12, -886, 195]$[886, -213, -50, -6]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_3AU9ADf6EeS08JDbYjJccA" type="1013" source="_pV7pkDf6EeS08JDbYjJccA" target="_t8jPYDf6EeS08JDbYjJccA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_3AU9ATf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_3ALzETf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3AU9Ajf6EeS08JDbYjJccA" points="[50, -16, -680, 204]$[734, -245, 4, -25]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_3PNGgzf6EeS08JDbYjJccA" type="1013" source="_pV7pkDf6EeS08JDbYjJccA" target="_t8ng0Df6EeS08JDbYjJccA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_3PNGhDf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_3PNGgTf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3PNGhTf6EeS08JDbYjJccA" points="[50, -9, -680, 131]$[780, -133, 50, 7]"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model.profile.uml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model.profile.uml
new file mode 100644
index 00000000000..61091e9e9c9
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model.profile.uml
@@ -0,0 +1,184 @@
+<?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="_h-wAoDf6EeS08JDbYjJccA" name="Profile" metaclassReference="_t8flADf6EeS08JDbYjJccA _t8gMEDf6EeS08JDbYjJccA _yIfrYDf6EeS08JDbYjJccA _yIfrYTf6EeS08JDbYjJccA" metamodelReference="_h-wnsDf6EeS08JDbYjJccA">
+  <eAnnotations xmi:id="__4KgYTf6EeS08JDbYjJccA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_0ChbYDg3EeS5ZcmG-RC5ow" name="Profile" nsURI="http:///schemas/Profile/_0Cg0UDg3EeS5ZcmG-RC5ow/1" nsPrefix="Profile">
+      <eAnnotations xmi:id="_0ChbYTg3EeS5ZcmG-RC5ow" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_oQSQIDf6EeS08JDbYjJccA"/>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_0ChbYjg3EeS5ZcmG-RC5ow" name="Profile_Profile1_Stereotype2" eSuperTypes="_0Chbazg3EeS5ZcmG-RC5ow">
+        <eAnnotations xmi:id="_0ChbYzg3EeS5ZcmG-RC5ow" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_phD7gDf6EeS08JDbYjJccA"/>
+        <eAnnotations xmi:id="_0ChbZDg3EeS5ZcmG-RC5ow" source="duplicates">
+          <contents xmi:type="ecore:EReference" xmi:id="_0ChbZTg3EeS5ZcmG-RC5ow" name="base_Class" ordered="false" lowerBound="1">
+            <eAnnotations xmi:id="_0ChbZjg3EeS5ZcmG-RC5ow" source="redefines" references="_0Chbbzg3EeS5ZcmG-RC5ow"/>
+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+          </contents>
+        </eAnnotations>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_0ChbaDg3EeS5ZcmG-RC5ow" name="tag2" ordered="false" defaultValueLiteral="false">
+          <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="_0Chbazg3EeS5ZcmG-RC5ow" name="Profile_Profile1_Stereotype1">
+        <eAnnotations xmi:id="_0ChbbDg3EeS5ZcmG-RC5ow" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_pb35gDf6EeS08JDbYjJccA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0ChbbTg3EeS5ZcmG-RC5ow" 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="_0Chbbzg3EeS5ZcmG-RC5ow" 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="_0ChbcTg3EeS5ZcmG-RC5ow" name="tag1" ordered="false">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eSubpackages xmi:id="_0Chbczg3EeS5ZcmG-RC5ow" name="Package1" nsURI="http:///Profile/Package1.ecore" nsPrefix="Profile.Package1">
+        <eAnnotations xmi:id="_0ChbdDg3EeS5ZcmG-RC5ow" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_ouPXcDf6EeS08JDbYjJccA"/>
+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_0ChbdTg3EeS5ZcmG-RC5ow" name="Stereotype1" eSuperTypes="_0ChbgDg3EeS5ZcmG-RC5ow">
+          <eAnnotations xmi:id="_0Chbdjg3EeS5ZcmG-RC5ow" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_pMKpkDf6EeS08JDbYjJccA"/>
+          <eAnnotations xmi:id="_0Chbdzg3EeS5ZcmG-RC5ow" source="duplicates">
+            <contents xmi:type="ecore:EReference" xmi:id="_0ChbeDg3EeS5ZcmG-RC5ow" name="base_Class" ordered="false" lowerBound="1">
+              <eAnnotations xmi:id="_0ChbeTg3EeS5ZcmG-RC5ow" source="redefines" references="_0Chbbzg3EeS5ZcmG-RC5ow _0ChbZTg3EeS5ZcmG-RC5ow _0Chbgzg3EeS5ZcmG-RC5ow"/>
+              <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+            </contents>
+          </eAnnotations>
+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0Chbezg3EeS5ZcmG-RC5ow" name="base_Artifact" ordered="false" lowerBound="1">
+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Artifact"/>
+          </eStructuralFeatures>
+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0ChbfTg3EeS5ZcmG-RC5ow" name="base_StructuredClassifier" ordered="false" lowerBound="1">
+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier"/>
+          </eStructuralFeatures>
+        </eClassifiers>
+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_0ChbgDg3EeS5ZcmG-RC5ow" name="Stereotype2" eSuperTypes="_0ChbYjg3EeS5ZcmG-RC5ow">
+          <eAnnotations xmi:id="_0ChbgTg3EeS5ZcmG-RC5ow" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_pV5NUDf6EeS08JDbYjJccA"/>
+          <eAnnotations xmi:id="_0Chbgjg3EeS5ZcmG-RC5ow" source="duplicates">
+            <contents xmi:type="ecore:EReference" xmi:id="_0Chbgzg3EeS5ZcmG-RC5ow" name="base_Class" ordered="false" lowerBound="1">
+              <eAnnotations xmi:id="_0ChbhDg3EeS5ZcmG-RC5ow" source="redefines" references="_0Chbbzg3EeS5ZcmG-RC5ow _0ChbZTg3EeS5ZcmG-RC5ow"/>
+              <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+            </contents>
+            <contents xmi:type="ecore:EReference" xmi:id="_0Chbhjg3EeS5ZcmG-RC5ow" name="base_Element" ordered="false" lowerBound="1">
+              <eAnnotations xmi:id="_0Chbhzg3EeS5ZcmG-RC5ow" source="redefines" references="_0ChbbTg3EeS5ZcmG-RC5ow"/>
+              <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+            </contents>
+          </eAnnotations>
+        </eClassifiers>
+      </eSubpackages>
+    </contents>
+  </eAnnotations>
+  <elementImport xmi:id="_t8flADf6EeS08JDbYjJccA" alias="Class">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+  </elementImport>
+  <elementImport xmi:id="_t8gMEDf6EeS08JDbYjJccA" alias="Element">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+  </elementImport>
+  <elementImport xmi:id="_yIfrYDf6EeS08JDbYjJccA" alias="Artifact">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Artifact"/>
+  </elementImport>
+  <elementImport xmi:id="_yIfrYTf6EeS08JDbYjJccA" alias="StructuredClassifier">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#StructuredClassifier"/>
+  </elementImport>
+  <packageImport xmi:id="_h-wnsDf6EeS08JDbYjJccA">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>
+  </packageImport>
+  <packageImport xmi:id="_h-wnsTf6EeS08JDbYjJccA">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Profile" xmi:id="_oQSQIDf6EeS08JDbYjJccA" name="Profile1">
+    <eAnnotations xmi:id="_9DhOgTf6EeS08JDbYjJccA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+      <contents xmi:type="ecore:EPackage" xmi:id="_wQvL0Dg3EeS5ZcmG-RC5ow" name="Profile1" nsURI="http://Profile/schemas/Profile1/_wQukwDg3EeS5ZcmG-RC5ow/1" nsPrefix="Profile1">
+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_wQvL0Tg3EeS5ZcmG-RC5ow" name="Stereotype1">
+          <eAnnotations xmi:id="_wQvL0jg3EeS5ZcmG-RC5ow" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_pb35gDf6EeS08JDbYjJccA"/>
+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_wQvL0zg3EeS5ZcmG-RC5ow" 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="_wQvL1Tg3EeS5ZcmG-RC5ow" 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="_wQvL1zg3EeS5ZcmG-RC5ow" name="tag1" ordered="false">
+            <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="_wQvL2Tg3EeS5ZcmG-RC5ow" name="Stereotype2" eSuperTypes="_wQvL0Tg3EeS5ZcmG-RC5ow">
+          <eAnnotations xmi:id="_wQvL2jg3EeS5ZcmG-RC5ow" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_phD7gDf6EeS08JDbYjJccA"/>
+          <eAnnotations xmi:id="_wQvL2zg3EeS5ZcmG-RC5ow" source="duplicates">
+            <contents xmi:type="ecore:EReference" xmi:id="_wQvL3Dg3EeS5ZcmG-RC5ow" name="base_Class" ordered="false" lowerBound="1">
+              <eAnnotations xmi:id="_wQvL3Tg3EeS5ZcmG-RC5ow" source="redefines" references="_wQvL1Tg3EeS5ZcmG-RC5ow"/>
+              <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+            </contents>
+          </eAnnotations>
+          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_wQvL3zg3EeS5ZcmG-RC5ow" name="tag2" ordered="false" defaultValueLiteral="false">
+            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+          </eStructuralFeatures>
+        </eClassifiers>
+      </contents>
+    </eAnnotations>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_pb35gDf6EeS08JDbYjJccA" name="Stereotype1">
+      <ownedAttribute xmi:id="_zgeyADf6EeS08JDbYjJccA" name="base_Element" association="_zgeyATf6EeS08JDbYjJccA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_0ZDYwDf6EeS08JDbYjJccA" name="base_Class" association="_0ZDYwTf6EeS08JDbYjJccA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_S6Py8Dg3EeS5ZcmG-RC5ow" name="tag1" visibility="public">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Wr6GsDg3EeS5ZcmG-RC5ow"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Wr-YIDg3EeS5ZcmG-RC5ow" value="1"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_phD7gDf6EeS08JDbYjJccA" name="Stereotype2">
+      <generalization xmi:id="_qeqMMDf6EeS08JDbYjJccA" general="_pb35gDf6EeS08JDbYjJccA"/>
+      <ownedAttribute xmi:id="_z2W7YDf6EeS08JDbYjJccA" name="base_Class" association="_z2W7YTf6EeS08JDbYjJccA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_gKkZgDg3EeS5ZcmG-RC5ow" name="tag2" visibility="public">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_i3kyUDg3EeS5ZcmG-RC5ow"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_i3mAcDg3EeS5ZcmG-RC5ow" value="1"/>
+        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_mSBf8Dg3EeS5ZcmG-RC5ow"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_zgeyATf6EeS08JDbYjJccA" name="E_Stereotype1_Element1" memberEnd="_zgeyAjf6EeS08JDbYjJccA _zgeyADf6EeS08JDbYjJccA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_zgeyAjf6EeS08JDbYjJccA" name="extension_Stereotype1" type="_pb35gDf6EeS08JDbYjJccA" aggregation="composite" association="_zgeyATf6EeS08JDbYjJccA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_z2W7YTf6EeS08JDbYjJccA" name="E_Stereotype2_Class1" memberEnd="_z2W7Yjf6EeS08JDbYjJccA _z2W7YDf6EeS08JDbYjJccA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_z2W7Yjf6EeS08JDbYjJccA" name="extension_Stereotype2" type="_phD7gDf6EeS08JDbYjJccA" aggregation="composite" association="_z2W7YTf6EeS08JDbYjJccA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_0ZDYwTf6EeS08JDbYjJccA" name="E_Stereotype1_Class1" memberEnd="_0ZDYwjf6EeS08JDbYjJccA _0ZDYwDf6EeS08JDbYjJccA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_0ZDYwjf6EeS08JDbYjJccA" name="extension_Stereotype1" type="_pb35gDf6EeS08JDbYjJccA" aggregation="composite" association="_0ZDYwTf6EeS08JDbYjJccA"/>
+    </packagedElement>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Package" xmi:id="_ouPXcDf6EeS08JDbYjJccA" name="Package1">
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_pMKpkDf6EeS08JDbYjJccA" name="Stereotype1">
+      <generalization xmi:id="_10lioDf6EeS08JDbYjJccA" general="_pV5NUDf6EeS08JDbYjJccA"/>
+      <generalization xmi:id="_06tUUDf6EeS08JDbYjJccA" general="_pb35gDf6EeS08JDbYjJccA"/>
+      <ownedAttribute xmi:id="_2US9cDf6EeS08JDbYjJccA" name="base_Artifact" association="_2US9cTf6EeS08JDbYjJccA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Artifact"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_2hY-QDf6EeS08JDbYjJccA" name="base_StructuredClassifier" association="_2hY-QTf6EeS08JDbYjJccA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#StructuredClassifier"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_2xwVgDf6EeS08JDbYjJccA" name="base_Class" association="_2xwVgTf6EeS08JDbYjJccA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_pV5NUDf6EeS08JDbYjJccA" name="Stereotype2">
+      <generalization xmi:id="_1IiU8Df6EeS08JDbYjJccA" general="_phD7gDf6EeS08JDbYjJccA"/>
+      <ownedAttribute xmi:id="_3ALzEDf6EeS08JDbYjJccA" name="base_Class" association="_3ALzETf6EeS08JDbYjJccA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_3PNGgDf6EeS08JDbYjJccA" name="base_Element" association="_3PNGgTf6EeS08JDbYjJccA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_2US9cTf6EeS08JDbYjJccA" name="E_Stereotype1_Artifact1" memberEnd="_2US9cjf6EeS08JDbYjJccA _2US9cDf6EeS08JDbYjJccA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_2US9cjf6EeS08JDbYjJccA" name="extension_Stereotype1" type="_pMKpkDf6EeS08JDbYjJccA" aggregation="composite" association="_2US9cTf6EeS08JDbYjJccA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_2hY-QTf6EeS08JDbYjJccA" name="E_Stereotype1_StructuredClassifier1" memberEnd="_2hY-Qjf6EeS08JDbYjJccA _2hY-QDf6EeS08JDbYjJccA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_2hY-Qjf6EeS08JDbYjJccA" name="extension_Stereotype1" type="_pMKpkDf6EeS08JDbYjJccA" aggregation="composite" association="_2hY-QTf6EeS08JDbYjJccA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_2xwVgTf6EeS08JDbYjJccA" name="E_Stereotype1_Class1" memberEnd="_2xwVgjf6EeS08JDbYjJccA _2xwVgDf6EeS08JDbYjJccA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_2xwVgjf6EeS08JDbYjJccA" name="extension_Stereotype1" type="_pMKpkDf6EeS08JDbYjJccA" aggregation="composite" association="_2xwVgTf6EeS08JDbYjJccA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_3ALzETf6EeS08JDbYjJccA" name="E_Stereotype2_Class1" memberEnd="_3ALzEjf6EeS08JDbYjJccA _3ALzEDf6EeS08JDbYjJccA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_3ALzEjf6EeS08JDbYjJccA" name="extension_Stereotype2" type="_pV5NUDf6EeS08JDbYjJccA" aggregation="composite" association="_3ALzETf6EeS08JDbYjJccA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_3PNGgTf6EeS08JDbYjJccA" name="E_Stereotype2_Element1" memberEnd="_3PNGgjf6EeS08JDbYjJccA _3PNGgDf6EeS08JDbYjJccA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_3PNGgjf6EeS08JDbYjJccA" name="extension_Stereotype2" type="_pV5NUDf6EeS08JDbYjJccA" aggregation="composite" association="_3PNGgTf6EeS08JDbYjJccA"/>
+    </packagedElement>
+  </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2-missing-schemalocation.di b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2-missing-schemalocation.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2-missing-schemalocation.di
@@ -0,0 +1,2 @@
+<?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.modelrepair.tests/resources/regression/bug436666/model2-missing-schemalocation.notation b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2-missing-schemalocation.notation
new file mode 100644
index 00000000000..189bc5d64fd
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2-missing-schemalocation.notation
@@ -0,0 +1,42 @@
+<?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: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="_C0NawDf7EeS08JDbYjJccA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_DO2IUDf7EeS08JDbYjJccA" type="2008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FmJ98Df7EeS08JDbYjJccA" source="Stereotype_Annotation">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLsDf7EeS08JDbYjJccA" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLsTf7EeS08JDbYjJccA" key="StereotypeList" value="Profile::Profile1::Stereotype1,Profile::Package1::Stereotype1,Profile::Profile1::Stereotype2,Profile::Package1::Stereotype2"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLsjf7EeS08JDbYjJccA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLszf7EeS08JDbYjJccA" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLtDf7EeS08JDbYjJccA" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DO2IUjf7EeS08JDbYjJccA" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DO2IUzf7EeS08JDbYjJccA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DO2IVDf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_DO2IVTf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_DO2IVjf7EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DO2IVzf7EeS08JDbYjJccA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DO2IWDf7EeS08JDbYjJccA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DO2IWTf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_DO2IWjf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_DO2IWzf7EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DO2IXDf7EeS08JDbYjJccA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DO2IXTf7EeS08JDbYjJccA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DO2IXjf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_DO2IXzf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_DO2IYDf7EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DO2IYTf7EeS08JDbYjJccA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model2-missing-schemalocation.uml#_DOjNYDf7EeS08JDbYjJccA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DO2IUTf7EeS08JDbYjJccA" x="416" y="305"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_C0NawTf7EeS08JDbYjJccA" name="diagram_compatibility_version" stringValue="1.0.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_C0Nawjf7EeS08JDbYjJccA"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_C0Nawzf7EeS08JDbYjJccA">
+      <owner xmi:type="uml:Model" href="model2-missing-schemalocation.uml#_C0EQ0Df7EeS08JDbYjJccA"/>
+    </styles>
+    <element xmi:type="uml:Model" href="model2-missing-schemalocation.uml#_C0EQ0Df7EeS08JDbYjJccA"/>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_vlOj8DgnEeS1PIjgbD2xEA"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2-missing-schemalocation.uml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2-missing-schemalocation.uml
new file mode 100644
index 00000000000..98c3c87e9fc
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2-missing-schemalocation.uml
@@ -0,0 +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:Profile.Package1="http:///Profile/Package1.ecore" xmlns:Profile1="http://Profile/schemas/Profile1/_wQukwDg3EeS5ZcmG-RC5ow/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://Profile/schemas/Profile1/_wQukwDg3EeS5ZcmG-RC5ow/1 model.profile.uml#_wQvL0Dg3EeS5ZcmG-RC5ow">
+  <uml:Model xmi:id="_C0EQ0Df7EeS08JDbYjJccA" name="model">
+    <packagedElement xmi:type="uml:Class" xmi:id="_DOjNYDf7EeS08JDbYjJccA" name="Class1"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_E5XwcDf7EeS08JDbYjJccA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_E6HXUDf7EeS08JDbYjJccA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="model.profile.uml#_0ChbYDg3EeS5ZcmG-RC5ow"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_h-wAoDf6EeS08JDbYjJccA"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_E6HXUTf7EeS08JDbYjJccA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_E62-MDf7EeS08JDbYjJccA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="model.profile.uml#_wQvL0Dg3EeS5ZcmG-RC5ow"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_oQSQIDf6EeS08JDbYjJccA"/>
+    </profileApplication>
+  </uml:Model>
+  <Profile1:Stereotype1 xmi:id="_FmAM8Df7EeS08JDbYjJccA" base_Element="_DOjNYDf7EeS08JDbYjJccA" base_Class="_DOjNYDf7EeS08JDbYjJccA" tag1="value of tag1 from nested profile"/>
+  <Profile1:Stereotype2 xmi:id="_Fmvz0Df7EeS08JDbYjJccA" base_Element="_DOjNYDf7EeS08JDbYjJccA" base_Class="_DOjNYDf7EeS08JDbYjJccA"/>
+  <Profile.Package1:Stereotype1 xmi:id="_FmTu8Df7EeS08JDbYjJccA" base_Element="_DOjNYDf7EeS08JDbYjJccA" base_Class="_DOjNYDf7EeS08JDbYjJccA" tag1="value for tag1 from nested package" base_StructuredClassifier="_DOjNYDf7EeS08JDbYjJccA"/>
+  <Profile.Package1:Stereotype2 xmi:id="_FnWQwDf7EeS08JDbYjJccA" base_Element="_DOjNYDf7EeS08JDbYjJccA" base_Class="_DOjNYDf7EeS08JDbYjJccA" tag2="true"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2.di b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2.di
@@ -0,0 +1,2 @@
+<?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.modelrepair.tests/resources/regression/bug436666/model2.notation b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2.notation
new file mode 100644
index 00000000000..e6c9caaf2e9
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2.notation
@@ -0,0 +1,42 @@
+<?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: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="_C0NawDf7EeS08JDbYjJccA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_DO2IUDf7EeS08JDbYjJccA" type="2008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FmJ98Df7EeS08JDbYjJccA" source="Stereotype_Annotation">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLsDf7EeS08JDbYjJccA" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLsTf7EeS08JDbYjJccA" key="StereotypeList" value="Profile::Profile1::Stereotype1,Profile::Package1::Stereotype1,Profile::Profile1::Stereotype2,Profile::Package1::Stereotype2"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLsjf7EeS08JDbYjJccA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLszf7EeS08JDbYjJccA" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLtDf7EeS08JDbYjJccA" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DO2IUjf7EeS08JDbYjJccA" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DO2IUzf7EeS08JDbYjJccA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DO2IVDf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_DO2IVTf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_DO2IVjf7EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DO2IVzf7EeS08JDbYjJccA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DO2IWDf7EeS08JDbYjJccA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DO2IWTf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_DO2IWjf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_DO2IWzf7EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DO2IXDf7EeS08JDbYjJccA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DO2IXTf7EeS08JDbYjJccA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DO2IXjf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_DO2IXzf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_DO2IYDf7EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DO2IYTf7EeS08JDbYjJccA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model2.uml#_DOjNYDf7EeS08JDbYjJccA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DO2IUTf7EeS08JDbYjJccA" x="416" y="305"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_C0NawTf7EeS08JDbYjJccA" name="diagram_compatibility_version" stringValue="1.0.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_C0Nawjf7EeS08JDbYjJccA"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_C0Nawzf7EeS08JDbYjJccA">
+      <owner xmi:type="uml:Model" href="model2.uml#_C0EQ0Df7EeS08JDbYjJccA"/>
+    </styles>
+    <element xmi:type="uml:Model" href="model2.uml#_C0EQ0Df7EeS08JDbYjJccA"/>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_vlOj8DgnEeS1PIjgbD2xEA"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2.uml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2.uml
new file mode 100644
index 00000000000..0807144c542
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2.uml
@@ -0,0 +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:Profile.Package1="http:///Profile/Package1.ecore" xmlns:Profile1="http://Profile/schemas/Profile1/_wQukwDg3EeS5ZcmG-RC5ow/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///Profile/Package1.ecore model.profile.uml#_0Chbczg3EeS5ZcmG-RC5ow http://Profile/schemas/Profile1/_wQukwDg3EeS5ZcmG-RC5ow/1 model.profile.uml#_wQvL0Dg3EeS5ZcmG-RC5ow">
+  <uml:Model xmi:id="_C0EQ0Df7EeS08JDbYjJccA" name="model">
+    <packagedElement xmi:type="uml:Class" xmi:id="_DOjNYDf7EeS08JDbYjJccA" name="Class1"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_E5XwcDf7EeS08JDbYjJccA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_E6HXUDf7EeS08JDbYjJccA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="model.profile.uml#_0ChbYDg3EeS5ZcmG-RC5ow"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_h-wAoDf6EeS08JDbYjJccA"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_E6HXUTf7EeS08JDbYjJccA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_E62-MDf7EeS08JDbYjJccA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="model.profile.uml#_wQvL0Dg3EeS5ZcmG-RC5ow"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_oQSQIDf6EeS08JDbYjJccA"/>
+    </profileApplication>
+  </uml:Model>
+  <Profile1:Stereotype1 xmi:id="_FmAM8Df7EeS08JDbYjJccA" base_Element="_DOjNYDf7EeS08JDbYjJccA" base_Class="_DOjNYDf7EeS08JDbYjJccA" tag1="value of tag1 from nested profile"/>
+  <Profile1:Stereotype2 xmi:id="_Fmvz0Df7EeS08JDbYjJccA" base_Element="_DOjNYDf7EeS08JDbYjJccA" base_Class="_DOjNYDf7EeS08JDbYjJccA"/>
+  <Profile.Package1:Stereotype1 xmi:id="_FmTu8Df7EeS08JDbYjJccA" base_Element="_DOjNYDf7EeS08JDbYjJccA" base_Class="_DOjNYDf7EeS08JDbYjJccA" tag1="value for tag1 from nested package" base_StructuredClassifier="_DOjNYDf7EeS08JDbYjJccA"/>
+  <Profile.Package1:Stereotype2 xmi:id="_FnWQwDf7EeS08JDbYjJccA" base_Element="_DOjNYDf7EeS08JDbYjJccA" base_Class="_DOjNYDf7EeS08JDbYjJccA" tag2="true"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/src/org/eclipse/papyrus/uml/modelrepair/internal/stereotypes/StereotypeRepairRegressionTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/src/org/eclipse/papyrus/uml/modelrepair/internal/stereotypes/StereotypeRepairRegressionTest.java
index 4b95ba8554c..9ff8491945b 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/src/org/eclipse/papyrus/uml/modelrepair/internal/stereotypes/StereotypeRepairRegressionTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/src/org/eclipse/papyrus/uml/modelrepair/internal/stereotypes/StereotypeRepairRegressionTest.java
@@ -36,6 +36,7 @@ import org.junit.Rule;
 import org.junit.Test;
 
 import com.google.common.base.Function;
+import com.google.common.base.Functions;
 
 
 /**
@@ -95,9 +96,9 @@ public class StereotypeRepairRegressionTest extends AbstractPapyrusTest {
 
 		// Verify the stereotype instance that was migrated
 		Stereotype stereo = profile.getOwnedStereotype("Stereo2");
-		Class class2 = (Class)nested.getOwnedType("Class2");
+		Class class2 = (Class) nested.getOwnedType("Class2");
 		Property class1 = class2.getAttribute("class1", null);
-		assertThat(class1.getValue(stereo, "weight"), is((Object)15));
+		assertThat(class1.getValue(stereo, "weight"), is((Object) 15));
 	}
 
 	/**
@@ -124,9 +125,9 @@ public class StereotypeRepairRegressionTest extends AbstractPapyrusTest {
 
 		// Verify the stereotype instance that was migrated
 		Stereotype stereo = profile.getOwnedStereotype("Stereo1");
-		Class class1 = (Class)nested.getOwnedType("Class1");
-		assertThat(class1.getValue(stereo, "tag"), is((Object)"new version"));
-		assertThat(class1.getValue(stereo, "reportable"), is((Object)true));
+		Class class1 = (Class) nested.getOwnedType("Class1");
+		assertThat(class1.getValue(stereo, "tag"), is((Object) "new version"));
+		assertThat(class1.getValue(stereo, "reportable"), is((Object) true));
 
 		nested = model.getNestedPackage("Package3");
 		profile = nested.getAppliedProfile("Profile::Nested1");
@@ -135,9 +136,61 @@ public class StereotypeRepairRegressionTest extends AbstractPapyrusTest {
 
 		// Verify the stereotype instance that was migrated
 		stereo = profile.getOwnedStereotype("Stereo1");
-		Class class4 = (Class)nested.getNestedPackage("p1").getOwnedType("Class4");
-		assertThat(class4.getValue(stereo, "tag"), is((Object)"deeply nested"));
-		assertThat(class4.getValue(stereo, "reportable"), is((Object)true));
+		Class class4 = (Class) nested.getNestedPackage("p1").getOwnedType("Class4");
+		assertThat(class4.getValue(stereo, "tag"), is((Object) "deeply nested"));
+		assertThat(class4.getValue(stereo, "reportable"), is((Object) true));
+	}
+
+	/**
+	 * Tests that a scenario involving well-formed stereotypes contained in a simple package nested in a profile
+	 * does not trigger the repair function.
+	 * 
+	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=436666
+	 */
+	@Test
+	@PluginResource("/resources/regression/bug436666/model2.uml")
+	public void nestedPackageInProfileIsOK_bug436666() {
+		assertThat("Should not have found zombie stereotypes", zombies, nullValue());
+	}
+
+	/**
+	 * Tests that a scenario involving stereotypes from a nested EPackage gone AWOL, which EPackage is defined by a nested
+	 * simple package in the UML profile, is correctly repaired.
+	 * 
+	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=436666
+	 */
+	@Test
+	@PluginResource("/resources/regression/bug436666/model2-missing-schemalocation.uml")
+	public void nestedPackageSchemaMissing_bug436666() {
+		EPackage schema = getOnlyZombieSchema();
+		IRepairAction action = zombies.getSuggestedRepairAction(schema);
+		assertThat("Wrong suggested repair action", action.kind(), is(IRepairAction.Kind.APPLY_LATEST_PROFILE_DEFINITION));
+
+		repair(schema, action);
+
+		Profile profile = model.getAppliedProfile("Profile");
+		Package nested = profile.getNestedPackage("Package1");
+
+		// Verify the stereotype instances that were repaired
+		Class class1 = (Class) model.getOwnedType("Class1");
+		Stereotype stereo1 = nested.getOwnedStereotype("Stereotype1");
+		Stereotype stereo2 = nested.getOwnedStereotype("Stereotype2");
+		assertThat(class1.isStereotypeApplied(stereo1), is(true));
+		assertThat(class1.getValue(stereo1, "tag1"), is((Object) "value for tag1 from nested package"));
+		assertThat(class1.isStereotypeApplied(stereo2), is(true));
+		assertThat(class1.getValue(stereo2, "tag2"), is((Object) true));
+	}
+
+	/**
+	 * Tests that a scenario involving non-UML root elements that are recognizably not stereotype
+	 * applications do not trigger the repair function.
+	 * 
+	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=436666
+	 */
+	@Test
+	@PluginResource("/resources/regression/bug436666/model-with-stylesheet.uml")
+	public void nonStereotypeApplicationsAreOK_bug436666() {
+		assertThat("Should not have found zombie stereotypes", zombies, nullValue());
 	}
 
 	//
@@ -148,6 +201,19 @@ public class StereotypeRepairRegressionTest extends AbstractPapyrusTest {
 	public void createFixture() throws Exception {
 		model = modelSet.getModel();
 
+		if (modelSet.getModelResourceURI().toString().contains("model-with-stylesheet")) {
+			createSimpleFixture();
+		} else if (modelSet.getModelResourceURI().toString().contains("bug436666")) {
+			createBug436666Fixture();
+		} else {
+			createDefaultFixture();
+		}
+
+		fixture.start(modelSet.getResourceSet());
+		houseKeeper.setField("zombies", fixture.getZombieStereotypes(modelSet.getModelResource(), modelSet.getModel()));
+	}
+
+	protected void createDefaultFixture() {
 		final Profile rootProfile = model.getAppliedProfile("Profile");
 		final Profile nested1 = model.getNestedPackage("Package1").getAppliedProfile("Profile::Nested1");
 		final Profile nested2 = model.getNestedPackage("Package2").getAppliedProfile("Profile::Nested2");
@@ -159,21 +225,43 @@ public class StereotypeRepairRegressionTest extends AbstractPapyrusTest {
 				Profile result = null;
 
 				// Check starts-with to account for _1, _2, etc. suffixes
-				if(input.getNsPrefix().startsWith("Nested2")) {
+				if (input.getNsPrefix().startsWith("Nested2")) {
 					result = nested2;
-				} else if(input.getNsPrefix().startsWith("Nested1")) {
+				} else if (input.getNsPrefix().startsWith("Nested1")) {
 					result = nested1;
+				} else if (input.getNsPrefix().startsWith("Profile")) {
+					result = rootProfile;
 				}
-				if(input.getNsPrefix().startsWith("Profile")) {
+
+				return result;
+			}
+		}), "dispose", modelSet.getResourceSet());
+	}
+
+	protected void createBug436666Fixture() {
+		final Profile rootProfile = model.getAppliedProfile("Profile");
+		final Profile nestedProfile = model.getAppliedProfile("Profile::Profile1");
+
+		fixture = houseKeeper.cleanUpLater(new StereotypeApplicationRepairSnippet(new Function<EPackage, Profile>() {
+
+			@Override
+			public Profile apply(EPackage input) {
+				Profile result = null;
+
+				// Check starts-with to account for _1, _2, etc. suffixes
+				if (input.getNsPrefix().startsWith("Profile1")) {
+					result = nestedProfile;
+				} else if (input.getNsPrefix().startsWith("Profile")) {
 					result = rootProfile;
 				}
 
 				return result;
 			}
 		}), "dispose", modelSet.getResourceSet());
+	}
 
-		fixture.start(modelSet.getResourceSet());
-		houseKeeper.setField("zombies", fixture.getZombieStereotypes(modelSet.getModelResource(), modelSet.getModel()));
+	protected void createSimpleFixture() {
+		fixture = houseKeeper.cleanUpLater(new StereotypeApplicationRepairSnippet(Functions.constant((Profile) null)), "dispose", modelSet.getResourceSet());
 	}
 
 	void repair(final EPackage schema, final IRepairAction action) {
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 3330da34318..40de5d04a32 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,7 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.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,

@@ -9,7 +9,7 @@ Export-Package: org.eclipse.papyrus.uml.service.types.tests.creation,
 Bundle-Vendor: %providerName

 Fragment-Host: org.eclipse.papyrus.uml.service.types;bundle-version="1

  .0.0"

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/pom.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/pom.xml
index d54c280818a..bef9f01d6d1 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/pom.xml
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.service.types.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 9329dda7362..4023d43b30a 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,24 +1,24 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

  org.eclipse.emf.ecore;bundle-version="2.8.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.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: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: UML Tools Tests

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.tools.tests.Activator

diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/pom.xml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/pom.xml
index 239e2109db9..0feac070d2e 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/pom.xml
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.tools.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 c13a461d9b7..3925358a073 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,18 +1,18 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.uml.tools.utils.tests,

  org.eclipse.papyrus.uml.tools.utils.tests.tests

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/pom.xml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/pom.xml
index 6d748ddec6d..18fed788d69 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/pom.xml
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.tools.utils.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/resources/substereotypes.uml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/resources/substereotypes.uml
new file mode 100644
index 00000000000..caa87d4166e
--- /dev/null
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/resources/substereotypes.uml
@@ -0,0 +1,81 @@
+<?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:Blocks="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks" xmlns:Constraints="http://www.eclipse.org/papyrus/0.7.0/SysML/Constraints" 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/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks http://www.eclipse.org/papyrus/0.7.0/SysML/Constraints http://www.eclipse.org/papyrus/0.7.0/SysML#//constraints http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements">
+  <uml:Model xmi:id="_AoJTMDzaEeSHN-lZqG0I4Q" name="SysMLmodel">
+    <packagedElement xmi:type="uml:Class" xmi:id="_DFCMYDzaEeSHN-lZqG0I4Q" name="Block1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_DvCLoDzaEeSHN-lZqG0I4Q" name="Block2" visibility="protected" isLeaf="true"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_oDYugDzaEeSHN-lZqG0I4Q" name="Requirement1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_ohXD8DzaEeSHN-lZqG0I4Q" name="Requirement2" isAbstract="true"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="__vZEQDzvEeS4QYEJWAn0aQ" name="ConstraintBlock1"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_A43PwDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A466IDzaEeSHN-lZqG0I4Q" 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="_A4-kgDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A4-kgTzaEeSHN-lZqG0I4Q" 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="_A5EEEDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A5EEETzaEeSHN-lZqG0I4Q" 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="_A5ErIDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A5FSMDzaEeSHN-lZqG0I4Q" 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="_A5F5QDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A5F5QTzaEeSHN-lZqG0I4Q" 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="_A5GgUDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A5GgUTzaEeSHN-lZqG0I4Q" 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="_A5HHYDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A5HucDzaEeSHN-lZqG0I4Q" 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="_A5IVgDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A5I8kDzaEeSHN-lZqG0I4Q" 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="_A5JjoDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A5JjoTzaEeSHN-lZqG0I4Q" 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="_A5KKsDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A5KKsTzaEeSHN-lZqG0I4Q" 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="_A5KxwDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A5LY0DzaEeSHN-lZqG0I4Q" 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>
+  <Blocks:Block xmi:id="_DFITADzaEeSHN-lZqG0I4Q" isEncapsulated="true" base_Class="_DFCMYDzaEeSHN-lZqG0I4Q"/>
+  <Blocks:Block xmi:id="_DvDZwDzaEeSHN-lZqG0I4Q" base_Class="_DvCLoDzaEeSHN-lZqG0I4Q"/>
+  <Requirements:Requirement xmi:id="_oESGYDzaEeSHN-lZqG0I4Q" text="This is required" id="r1" base_Class="_oDYugDzaEeSHN-lZqG0I4Q"/>
+  <Requirements:Requirement xmi:id="_ohpX0DzaEeSHN-lZqG0I4Q" text="that is required" id="r2" base_Class="_ohXD8DzaEeSHN-lZqG0I4Q"/>
+  <Constraints:ConstraintBlock xmi:id="__vmfoDzvEeS4QYEJWAn0aQ" isEncapsulated="true" base_Class="__vZEQDzvEeS4QYEJWAn0aQ"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/src/org/eclipse/papyrus/uml/tools/utils/tests/tests/AllTests.java b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/src/org/eclipse/papyrus/uml/tools/utils/tests/tests/AllTests.java
index 6c993ee5752..2d6b9f10444 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/src/org/eclipse/papyrus/uml/tools/utils/tests/tests/AllTests.java
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/src/org/eclipse/papyrus/uml/tools/utils/tests/tests/AllTests.java
@@ -9,6 +9,7 @@
  * Contributors:
  *  Benoit Maggi  benoit.maggi@cea.fr - Initial API and implementation
  *  Christian W. Damus (CEA) - bug 440263
+ *  Christian W. Damus (CEA) - bug 444092
  *
  *****************************************************************************/
 package org.eclipse.papyrus.uml.tools.utils.tests.tests;
@@ -19,9 +20,9 @@ import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
-@SuiteClasses({ NameResolutionHelperTest.class, NamedElementUtilTest.class
+@SuiteClasses({ NameResolutionHelperTest.class, NamedElementUtilTest.class, UMLUtilTest.class
 
 })
 public class AllTests {
-	//Test suite
+	// Test suite
 }
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/src/org/eclipse/papyrus/uml/tools/utils/tests/tests/UMLUtilTest.java b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/src/org/eclipse/papyrus/uml/tools/utils/tests/tests/UMLUtilTest.java
new file mode 100644
index 00000000000..9b40a311a9a
--- /dev/null
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/src/org/eclipse/papyrus/uml/tools/utils/tests/tests/UMLUtilTest.java
@@ -0,0 +1,123 @@
+/*****************************************************************************
+ * 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.tools.utils.tests.tests;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.papyrus.junit.utils.rules.ResourceSetFixture;
+import org.eclipse.papyrus.uml.tools.utils.UMLUtil;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Stereotype;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * Test cases for the {@link UMLUtil} class.
+ */
+public class UMLUtilTest extends AbstractPapyrusTest {
+	static final String BLOCK = "SysML::Blocks::Block";
+	static final String CONSTRAINT_BLOCK = "SysML::Constraints::ConstraintBlock";
+
+	@Rule
+	public final HouseKeeper houseKeeper = new HouseKeeper();
+
+	@Rule
+	public final ResourceSetFixture model = new ResourceSetFixture();
+
+	private Class block1;
+
+	private Class block2;
+
+	private Class constraintblock1;
+
+	private Stereotype block;
+
+	private Stereotype constraintBlock;
+
+	public UMLUtilTest() {
+		super();
+	}
+
+	@Test
+	@PluginResource("/resources/substereotypes.uml")
+	public void testGetApplicableStereotype_strict_notApplicable() {
+		assertThat(UMLUtil.getApplicableStereotype(model.getModel(), BLOCK, true), nullValue());
+	}
+
+	@Test
+	@PluginResource("/resources/substereotypes.uml")
+	public void testGetApplicableStereotype_strict_applicable() {
+		assertThat(UMLUtil.getApplicableStereotype(block1, BLOCK, true), is(block));
+		assertThat(UMLUtil.getApplicableStereotype(constraintblock1, CONSTRAINT_BLOCK, true), is(constraintBlock));
+	}
+
+	@Test
+	@PluginResource("/resources/substereotypes.uml")
+	public void testGetApplicableStereotype_notStrict_notApplicable() {
+		assertThat(UMLUtil.getApplicableStereotype(model.getModel(), BLOCK, false), nullValue());
+	}
+
+	@Test
+	@PluginResource("/resources/substereotypes.uml")
+	public void testGetApplicableStereotype_notStrict_applicable() {
+		assertThat(UMLUtil.getApplicableStereotype(block1, BLOCK, false), is(block));
+		assertThat(UMLUtil.getApplicableStereotype(block1, CONSTRAINT_BLOCK, false), is(constraintBlock));
+		assertThat(UMLUtil.getApplicableStereotype(constraintblock1, BLOCK, false), is(block));
+		assertThat(UMLUtil.getApplicableStereotype(constraintblock1, CONSTRAINT_BLOCK, false), is(constraintBlock));
+	}
+
+	@Test
+	@PluginResource("/resources/substereotypes.uml")
+	public void testGetAppliedSubstereotype_notApplied() {
+		assertThat(UMLUtil.getAppliedSubstereotype(model.getModel(), block), nullValue());
+		assertThat(UMLUtil.getAppliedSubstereotype(block2, constraintBlock), nullValue());
+	}
+
+	@Test
+	@PluginResource("/resources/substereotypes.uml")
+	public void testGetAppliedSubstereotype_applied() {
+		assertThat(UMLUtil.getAppliedSubstereotype(block2, block), is(block));
+		assertThat(UMLUtil.getAppliedSubstereotype(constraintblock1, constraintBlock), is(constraintBlock));
+		assertThat(UMLUtil.getAppliedSubstereotype(constraintblock1, block), is(constraintBlock));
+	}
+
+	@Test
+	@PluginResource("/resources/substereotypes.uml")
+	public void testGetAppliedSuperstereotype() {
+		assertThat(UMLUtil.getAppliedSuperstereotype(block2, BLOCK), is(block));
+		assertThat(UMLUtil.getAppliedSuperstereotype(block2, CONSTRAINT_BLOCK), nullValue());
+		assertThat(UMLUtil.getAppliedSuperstereotype(constraintblock1, BLOCK), is(block));
+		assertThat(UMLUtil.getAppliedSuperstereotype(constraintblock1, CONSTRAINT_BLOCK), is(constraintBlock));
+	}
+
+	//
+	// Test framework
+	//
+
+	@Before
+	public void setupModel() {
+		block1 = (Class) model.getModel().getOwnedType("Block1");
+		block2 = (Class) model.getModel().getOwnedType("Block2");
+		constraintblock1 = (Class) model.getModel().getOwnedType("ConstraintBlock1");
+
+		block = model.getModel().getAppliedProfile("SysML::Blocks").getOwnedStereotype("Block");
+		constraintBlock = model.getModel().getAppliedProfile("SysML::Constraints").getOwnedStereotype("ConstraintBlock");
+	}
+}
diff --git a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF
index 5a21b4f4c7a..8c2a7c30795 100644
--- a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF
@@ -6,26 +6,26 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.navigator,

  org.eclipse.uml2.uml;bundle-version="4.0.0",

  org.eclipse.gmf.runtime.notation,

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.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="1.0.1",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"

+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.views.modelexplorer.tests

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.1.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

diff --git a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/pom.xml b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/pom.xml
index e397722f9a0..45289a0aa3c 100644
--- a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/pom.xml
+++ b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.views.modelexplorer.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/recipes/extraplugins/team/collaborative/org.eclipse.papyrus.team.collaborative.recipetest/META-INF/MANIFEST.MF b/tests/recipes/extraplugins/team/collaborative/org.eclipse.papyrus.team.collaborative.recipetest/META-INF/MANIFEST.MF
index 84c648732a6..aa4bc4bd5e3 100644
--- a/tests/recipes/extraplugins/team/collaborative/org.eclipse.papyrus.team.collaborative.recipetest/META-INF/MANIFEST.MF
+++ b/tests/recipes/extraplugins/team/collaborative/org.eclipse.papyrus.team.collaborative.recipetest/META-INF/MANIFEST.MF
@@ -3,11 +3,12 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.0.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.team.collaborative.recipetest.Activator

+Bundle-Activator: org.eclipse.papyrus.team.collaborative.recipetest.Ac

+ tivator

 Bundle-SymbolicName: org.eclipse.papyrus.team.collaborative.recipetest

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/META-INF/MANIFEST.MF b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/META-INF/MANIFEST.MF
index f2acbc6618e..82ffc486560 100644
--- a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/META-INF/MANIFEST.MF
+++ b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/META-INF/MANIFEST.MF
@@ -1,12 +1,14 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: NewChildTest (Incubation)
-Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.test;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.infra.newchild.test.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.newchild;bundle-version="1.0.0"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: Eclipse Modeling Project
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.ui,

+ org.eclipse.core.runtime,

+ org.eclipse.papyrus.infra.newchild;bundle-version="1.1.0"

+Bundle-Vendor: Eclipse Modeling Project

+Bundle-ActivationPolicy: lazy

+Bundle-Version: 1.1.0.qualifier

+Bundle-Name: NewChildTest (Incubation)

+Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.infra.newchild.test.Activator

+Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.test;singleton

+ :=true

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

+

diff --git a/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.appliedstereotypecommend.recipetest/META-INF/MANIFEST.MF b/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.appliedstereotypecommend.recipetest/META-INF/MANIFEST.MF
index 674585da023..aaa64a04162 100644
--- a/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.appliedstereotypecommend.recipetest/META-INF/MANIFEST.MF
+++ b/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.appliedstereotypecommend.recipetest/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.diagram.stereotypeproperty.tests;bundle-version="1.0.0"

+ org.eclipse.papyrus.diagram.stereotypeproperty.tests;bundle-version="1.1.0"

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.0.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: Recipetest

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.appliedstereotypecommend.rec

diff --git a/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.modelexplorer.recipetest/META-INF/MANIFEST.MF b/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.modelexplorer.recipetest/META-INF/MANIFEST.MF
index 82a2690a085..3fcb8844801 100644
--- a/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.modelexplorer.recipetest/META-INF/MANIFEST.MF
+++ b/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.modelexplorer.recipetest/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.facet.infra.common.core,

  org.eclipse.emf.facet.infra.query.core,

- org.eclipse.papyrus.uml.diagram.icons;bundle-version="1.0.0",

+ org.eclipse.papyrus.uml.diagram.icons;bundle-version="1.1.0",

  org.eclipse.uml2.uml;bundle-version="3.1.100"

 Bundle-Vendor: %pluginProvider

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .,

  bin

-Bundle-Version: 1.0.0.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.modelexplorer.recipetest.Act

diff --git a/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/META-INF/MANIFEST.MF b/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/META-INF/MANIFEST.MF
index 388fd60887b..f118cd5f685 100644
--- a/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/META-INF/MANIFEST.MF
+++ b/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.0.qualifier

+Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2